diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml
index 485109b79a..2ddf65e7b4 100644
--- a/com.discord/apktool.yml
+++ b/com.discord/apktool.yml
@@ -1,5 +1,5 @@
!!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-1225.apk
+apkFileName: com.discord-1235.apk
compressionType: false
doNotCompress:
- resources.arsc
@@ -3106,5 +3106,5 @@ usesFramework:
tag: null
version: 2.4.2-83a459-SNAPSHOT
versionInfo:
- versionCode: '1225'
- versionName: '34.7'
+ versionCode: '1235'
+ versionName: '35.0'
diff --git a/com.discord/assets/thz/VAD_weight.thw b/com.discord/assets/thz/VAD_weight.thw
new file mode 100644
index 0000000000..af08d72252
Binary files /dev/null and b/com.discord/assets/thz/VAD_weight.thw differ
diff --git a/com.discord/lib/arm64-v8a/libdiscord.so b/com.discord/lib/arm64-v8a/libdiscord.so
index 111c94a72b..b47a1b23a5 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 13b9944272..932c9487c6 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 cf67436fd4..84f30d8816 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 a861f7beb3..b3e30bdcc8 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 98d5b5a87f..3bf77dda62 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 56233cb40d..b32454f553 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 f943a7fd02..26b159a149 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 b3c5c44507..5b0f580a0d 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 bf96d93666..b22db1584a 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
deleted file mode 100644
index 864aa7665e..0000000000
--- a/com.discord/res/drawable/drawable_voice_user_background_muted.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
\ 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
new file mode 100644
index 0000000000..e154ff160d
--- /dev/null
+++ b/com.discord/res/drawable/ic_alert_circle_16dp.xml
@@ -0,0 +1,5 @@
+
+
+
+
\ 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
new file mode 100644
index 0000000000..9298e92a1d
--- /dev/null
+++ b/com.discord/res/layout-v22/view_chat_upload.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
\ 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
new file mode 100644
index 0000000000..1cb6385108
--- /dev/null
+++ b/com.discord/res/layout-v22/view_upload_progress.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/layout_voice_bottom_sheet_header.xml b/com.discord/res/layout/layout_voice_bottom_sheet_header.xml
index ba0c4bb020..1198275657 100644
--- a/com.discord/res/layout/layout_voice_bottom_sheet_header.xml
+++ b/com.discord/res/layout/layout_voice_bottom_sheet_header.xml
@@ -2,8 +2,9 @@
-
-
+
+
+
diff --git a/com.discord/res/layout/view_chat_upload.xml b/com.discord/res/layout/view_chat_upload.xml
new file mode 100644
index 0000000000..c7a3a43a3f
--- /dev/null
+++ b/com.discord/res/layout/view_chat_upload.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
\ 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
new file mode 100644
index 0000000000..531e5ff85f
--- /dev/null
+++ b/com.discord/res/layout/view_chat_upload_list.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
\ 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 12991ac003..d260cbdea1 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 3a30f67799..853bd19249 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,12 +1,11 @@
-
+
-
-
-
-
-
+
+
+
+
\ 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 c4ecaba7e4..42bcb44124 100644
--- a/com.discord/res/values-bg/strings.xml
+++ b/com.discord/res/values-bg/strings.xml
@@ -1354,7 +1354,6 @@
Само когато се говори
Показване на предупреждение, когато Discord не открива звук от микрофона.
Директно съобщение
- %1$s (директно съобщение)
Намери или започни разговор
%1$s %2$s
Не можеш да изпращаш съобщения до потребител, който си блокирал.
@@ -2664,7 +2663,6 @@ 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
@@ -3805,7 +3803,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
Имаш ли връзка за покана?
Добре дошли в Discord!
Засега само ще разгледам
- Добре дошли в Discord, %1$s
Добре дошли в Discord
Няма звънене или обаждане. Влез в гласов канал и приятелите ти може да се включат да говорят с теб, да използват видео и дори да споделят екрана си.
Гласовите канали са местата, където хората се събират, за да говорят.
@@ -4378,7 +4375,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
Канал за правила
Избери канал за правила
Канал само за модератори
- Избери канал само за модератори
Това съобщение ще бъде изпратено до всички сървъри, следващи този канал. Можеш да редактираш или изтриеш това съобщение по-късно и то ще се актуализира на всеки следващ сървър.
Това съобщение ще бъде изпратено до **%1$s сървъри**, следващи този канал. Можеш да редактираш или изтриеш това съобщение по-късно и то ще се актуализира на всеки следващ сървър.
Виж повече статистики в настройките на сървъра.
diff --git a/com.discord/res/values-cs/strings.xml b/com.discord/res/values-cs/strings.xml
index 588ef7bf6a..d66d0d1d91 100644
--- a/com.discord/res/values-cs/strings.xml
+++ b/com.discord/res/values-cs/strings.xml
@@ -1335,7 +1335,6 @@ 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.
@@ -2646,7 +2645,6 @@ 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
@@ -3785,7 +3783,6 @@ 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í.
@@ -4352,7 +4349,6 @@ 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 4dd3ffca4e..1317a9b0ea 100644
--- a/com.discord/res/values-da/strings.xml
+++ b/com.discord/res/values-da/strings.xml
@@ -1324,7 +1324,6 @@ 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.
@@ -2627,7 +2626,6 @@ 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
@@ -3753,7 +3751,6 @@ 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.
@@ -4321,7 +4318,6 @@ 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 9939740ab9..d70c5ae47e 100644
--- a/com.discord/res/values-de/strings.xml
+++ b/com.discord/res/values-de/strings.xml
@@ -1331,7 +1331,6 @@ 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.
@@ -2636,7 +2635,6 @@ 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
@@ -3764,7 +3762,6 @@ 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.
@@ -4330,7 +4327,6 @@ 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 efc83105b1..a1a8b503bf 100644
--- a/com.discord/res/values-el/strings.xml
+++ b/com.discord/res/values-el/strings.xml
@@ -1353,7 +1353,6 @@ Avatar"
Μόνο όταν μιλάνε
Εμφάνιση ειδοποίησης όταν το Discord δεν ανιχνεύει ήχο από το μικρόφωνο.
Άμεσο μήνυμα
- %1$s (άμεσο μήνυμα)
Βρες ή ξεκίνησε μια συνομιλία
%1$s %2$s
Δεν μπορείς να στείλεις μηνύματα σε έναν χρήστη που έχεις αποκλείσει.
@@ -2660,7 +2659,6 @@ 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
@@ -3797,7 +3795,6 @@ Avatar"
Έχεις σύνδεσμο πρόσκλησης;
Καλώς ήρθες στο Discord!
Για την ώρα, θα ρίξω μια ματιά
- Καλώς όρισες στο Discord, %1$s
Καλώς όρισες στο Discord
Χωρίς κλήσεις. Απλά μπες σε ένα κανάλι ομιλίας όποτε θέλεις και οι φίλοι σου μπορούν να μπουν για να μιλήσουν μαζί σου με βίντεο ή ακόμα και να μοιραστούν την οθόνη τους.
Στα κανάλια ομιλίας συγκεντρώνονται άτομα για να συζητήσουν.
@@ -4369,7 +4366,6 @@ Avatar"
Κανόνες καναλιού
Επίλεξε ένα κανάλι κανόνων
Κανάλι μόνο για συντονιστές
- Επίλεξε ένα κανάλι μόνο για συντονιστές
Αυτό το μήνυμα θα σταλεί σε όλους τους διακομιστές που ακολουθούν αυτό το κανάλι. Μπορείτε να επεξεργαστείτε ή να διαγράψετε αυτό το μήνυμα αργότερα, και θα ενημερωθεί αντίστοιχα ο κάθε διακομιστής που ακολουθεί.
Αυτό το μήνυμα θα σταλεί σε **%1$s διακομιστές** που ακολουθούν αυτό το κανάλι. Μπορείτε να επεξεργαστείτε ή να διαγράψετε αυτό το μήνυμα αργότερα, και θα ενημερωθεί αντίστοιχα ο κάθε διακομιστής που ακολουθεί.
Δείτε περισσότερα στατιστικά στις Ρυθμίσεις διακομιστή.
diff --git a/com.discord/res/values-es-rES/strings.xml b/com.discord/res/values-es-rES/strings.xml
index fba2b8b6fa..98f5fbdc63 100644
--- a/com.discord/res/values-es-rES/strings.xml
+++ b/com.discord/res/values-es-rES/strings.xml
@@ -1314,7 +1314,6 @@ 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.
@@ -2578,7 +2577,6 @@ 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
@@ -3711,7 +3709,6 @@ 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.
@@ -4282,7 +4279,6 @@ 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 ee7d30b717..d9674a730f 100644
--- a/com.discord/res/values-fi/strings.xml
+++ b/com.discord/res/values-fi/strings.xml
@@ -1348,7 +1348,6 @@ 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.
@@ -2666,7 +2665,6 @@ 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
@@ -3808,7 +3806,6 @@ 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.
@@ -4380,7 +4377,6 @@ 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 cb31b9cbe4..db07f2c054 100644
--- a/com.discord/res/values-fr/strings.xml
+++ b/com.discord/res/values-fr/strings.xml
@@ -1357,7 +1357,6 @@ 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é.
@@ -2666,7 +2665,6 @@ 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
@@ -3795,7 +3793,6 @@ 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.
@@ -4364,7 +4361,6 @@ 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 f829e5d57e..f378845fa9 100644
--- a/com.discord/res/values-hr/strings.xml
+++ b/com.discord/res/values-hr/strings.xml
@@ -1305,7 +1305,6 @@ 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.
@@ -2599,7 +2598,6 @@ 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
@@ -3731,7 +3729,6 @@ 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.
@@ -4300,7 +4297,6 @@ 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 fc623ca3b8..6b13e7f565 100644
--- a/com.discord/res/values-hu/strings.xml
+++ b/com.discord/res/values-hu/strings.xml
@@ -1343,7 +1343,6 @@ 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.
@@ -2655,7 +2654,6 @@ 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
@@ -3794,7 +3792,6 @@ 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.
@@ -4369,7 +4366,6 @@ 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 3b8474382d..ded0112e8f 100644
--- a/com.discord/res/values-it/strings.xml
+++ b/com.discord/res/values-it/strings.xml
@@ -1351,7 +1351,6 @@ 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.
@@ -2647,7 +2646,6 @@ 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
@@ -3777,7 +3775,6 @@ 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.
@@ -4350,7 +4347,6 @@ 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 a820be5625..fbc8c2d643 100644
--- a/com.discord/res/values-ja/strings.xml
+++ b/com.discord/res/values-ja/strings.xml
@@ -1382,7 +1382,6 @@ Black Lives Matter(黒人の命を粗末にするな) {fixed}
話している間のみ
Discordがマイクからの音声を検知できない場合に警告を表示する。
ダイレクトメッセージ
- %1$s (ダイレクトメッセージ)
会話に参加または作成する
%1$s %2$s
ブロック済みのユーザーにはメッセージを送信できません。
@@ -2694,7 +2693,6 @@ 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
@@ -3837,7 +3835,6 @@ Discordについて詳しい情報が必要ですか?"
招待リンクをお持ちですか?
DISCORDへようこそ!
今は見るだけで
- %1$s様、Discordへようこそ!
Discordへようこそ
電話を鳴らしたり、通話発信したりする必要はありません。ボイスチャンネルにふらっと足を運ぶだけで、フレンドが立ち寄って会話したり、ビデオを使ったり、または画面を共有したりできます。
ボイスチャンネルは、みんなが集まっておしゃべりできる場所です。
@@ -4410,7 +4407,6 @@ Discordについて詳しい情報が必要ですか?"
ルールチャンネル
ルールチャンネルの選択
モデレーター専用チャンネル
- モデレーター専用チャンネルを選択
このチャンネルをフォローしている全てのサーバーにこのメッセージが送信されます。後でこのメッセージの編集と削除ができ、各サーバーでその部分が更新されます。
このチャンネルをフォローしている**%1$sサーバー**にこのメッセージが送信されます。後でこのメッセージの編集と削除ができ、各サーバーでその部分が更新されます。
サーバー設定でさらに統計を見ることができます。
diff --git a/com.discord/res/values-ko/strings.xml b/com.discord/res/values-ko/strings.xml
index 57722c273d..aa341a1c38 100644
--- a/com.discord/res/values-ko/strings.xml
+++ b/com.discord/res/values-ko/strings.xml
@@ -1375,7 +1375,6 @@ Black Lives Matter 흑인의 생명은 소중하다 {fixed}
말하는 동안만
Discord가 마이크에서 음성을 감지할 수 없을 때 경고 표시하기.
개인 메시지
- %1$s (개인 메시지)
대화 찾기 또는 시작하기
%1$s%2$s
차단한 사용자에게 메시지를 보낼 수 없어요.
@@ -2685,7 +2684,6 @@ 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
@@ -3824,7 +3822,6 @@ Discord에 대해 더 알고 싶으신가요?"
초대 링크를 받았나요?
Discord에 오신 걸 환영합니다!
일단 둘러볼게요.
- Discord에 오신 걸 환영해요, %1$s 님.
Discord에 오신 걸 환영합니다
벨소리도, 통화 대기도 없답니다. 음성 채널에 들어오기만 하면 언제든 친구들과 이야기를 나눌 수 있어요. 동영상은 물론 화면 공유까지 가능하답니다.
음성 채널은 사람들이 모여 이야기를 나누는 곳이에요.
@@ -4397,7 +4394,6 @@ PC 앱을 받아주세요. [다운로드](onDownloadClick)"
규칙 채널
규칙 채널 선택하기
모드 전용 채널
- 모드 전용 채널 선택하기
이 채널을 팔로우하는 모든 서버에 메시지가 전송돼요. 메시지는 나중에 수정하거나 삭제할 수 있고, 팔로우하는 서버에도 마찬가지로 적용될 거예요.
이 채널을 팔로우하는 서버 **%1$s개**에 메시지가 전송돼요. 메시지는 나중에 수정하거나 삭제할 수 있고, 팔로우하는 서버에도 마찬가지로 적용될 거예요.
서버 설정에서 다른 통계도 살펴보세요.
diff --git a/com.discord/res/values-lt/strings.xml b/com.discord/res/values-lt/strings.xml
index c6a20c99c6..27b5ef891f 100644
--- a/com.discord/res/values-lt/strings.xml
+++ b/com.discord/res/values-lt/strings.xml
@@ -1347,7 +1347,6 @@ 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.
@@ -2662,7 +2661,6 @@ 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
@@ -3802,7 +3800,6 @@ 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.
@@ -4381,7 +4378,6 @@ 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 226518ba89..32b2950458 100644
--- a/com.discord/res/values-nl/strings.xml
+++ b/com.discord/res/values-nl/strings.xml
@@ -1333,7 +1333,6 @@ 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.
@@ -2632,7 +2631,6 @@ 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
@@ -3752,7 +3750,6 @@ 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.
@@ -4325,7 +4322,6 @@ 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 c0ee840c40..290a792612 100644
--- a/com.discord/res/values-no/strings.xml
+++ b/com.discord/res/values-no/strings.xml
@@ -1273,7 +1273,6 @@ 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.
@@ -2531,7 +2530,6 @@ 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
@@ -3663,7 +3661,6 @@ 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.
@@ -4232,7 +4229,6 @@ 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 1609c232ce..ddd4cb561e 100644
--- a/com.discord/res/values-pl/strings.xml
+++ b/com.discord/res/values-pl/strings.xml
@@ -1358,7 +1358,6 @@ 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.
@@ -2665,7 +2664,6 @@ 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
@@ -3804,7 +3802,6 @@ 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ć.
@@ -4377,7 +4374,6 @@ 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 cdab252f0b..7d50a6d9ce 100644
--- a/com.discord/res/values-pt-rBR/strings.xml
+++ b/com.discord/res/values-pt-rBR/strings.xml
@@ -1360,7 +1360,6 @@ 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.
@@ -2623,7 +2622,6 @@ 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
@@ -3755,7 +3753,6 @@ 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.
@@ -4328,7 +4325,6 @@ 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 4e3f70cc83..d55526cc67 100644
--- a/com.discord/res/values-ro/strings.xml
+++ b/com.discord/res/values-ro/strings.xml
@@ -1321,7 +1321,6 @@ 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.
@@ -2620,7 +2619,6 @@ 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
@@ -3756,7 +3754,6 @@ 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ă.
@@ -4329,7 +4326,6 @@ 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 41482ee4d9..ff3e43bcf6 100644
--- a/com.discord/res/values-ru/strings.xml
+++ b/com.discord/res/values-ru/strings.xml
@@ -1389,7 +1389,6 @@ Black Lives Matter {fixed}
Только во время разговора
Показывать предупреждение, если Discord не обнаруживает звук из вашего микрофона.
Личное сообщение
- %1$s (личное сообщение)
Найти или начать беседу
%1$s %2$s
Вы не можете отправлять сообщения пользователю, которого вы заблокировали.
@@ -2709,7 +2708,6 @@ 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
@@ -3849,7 +3847,6 @@ Black Lives Matter {fixed}
У Вас есть ссылка-приглашение?
Добро пожаловать в Discord!
Я пока тут осмотрюсь
- Добро пожаловать в Discord, %1$s
Добро пожаловать в Discord
Вам не нужно никому звонить. Просто подключитесь к голосовому каналу, и ваши друзья смогут присоединиться, чтобы поболтать, включить видеочат или даже показать свой экран.
На голосовых каналах пользователи сервера могут пообщаться друг с другом через микрофон.
@@ -4423,7 +4420,6 @@ 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 e210cf72a1..06d603475c 100644
--- a/com.discord/res/values-sv-rSE/strings.xml
+++ b/com.discord/res/values-sv-rSE/strings.xml
@@ -1298,7 +1298,6 @@ 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.
@@ -2557,7 +2556,6 @@ 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
@@ -3688,7 +3686,6 @@ 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.
@@ -4258,7 +4255,6 @@ 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 5b51212225..f5e9ba383a 100644
--- a/com.discord/res/values-th/strings.xml
+++ b/com.discord/res/values-th/strings.xml
@@ -1350,7 +1350,6 @@ URL แบบย่อใช้ได้เฉพาะตัวอักษร
เฉพาะตอนพูด
แสดงการแจ้งเตือนเมื่อ Discord ไม่ตรวจพบเสียงจากไมโครโฟนของคุณ
ข้อความส่วนตัว
- %1$s (ข้อความส่วนตัว)
ค้นหา หรือเริ่มการสนทนา
%1$s %2$s
คุณไม่สามารถส่งข้อความไปยังผู้ใช้ที่คุณบล็อกได้
@@ -2663,7 +2662,6 @@ 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
@@ -3803,7 +3801,6 @@ URL แบบย่อใช้ได้เฉพาะตัวอักษร
คุณมีลิงก์เชิญหรือไม่
ยินดีต้อนรับสู่ Discord!
ตอนนี้ขอนั่งดูไปก่อนแล้วกัน
- ยินดีต้อนรับสู่ Discord, %1$s
ยินดีต้อนรับสู่ Discord
ไม่ต้องรอสายหรือโทรออกอะไรทั้งนั้น เข้าไปในช่องสำหรับพูดแล้วเพื่อนจะได้พูดคุยกับคุณ ใช้วิดีโอ หรือแชร์หน้าจอของตัวเองได้เลย
ช่องสำหรับพูดคุยคือสถานที่สำหรับให้ผู้คนมาพูดคุยกัน
@@ -4375,7 +4372,6 @@ URL แบบย่อใช้ได้เฉพาะตัวอักษร
ช่องกฎระเบียบ
เลือกช่องกฎระเบียบ
ช่องสำหรับผู้ดูแลเท่านั้น
- เลือกช่องสำหรับผู้ดูแลเท่านั้น
ข้อความเหล่านี้จะถูกส่งถึงเซิร์ฟเวอร์ทั้งหมดที่ติดตามช่องนี้ คุณสามารถแก้ไขหรือลบข้อความนี้ภายหลัง และคุณจะอัพเดทแต่ละเซิร์ฟเวอร์ตามลำดับต่อไป
ข้อความเหล่านี้จะถูกส่งถึง **%1$s เซิร์ฟเวอร์** ที่ติดตามช่องนี้ คุณสามารถแก้ไขหรือลบข้อความนี้ภายหลัง และคุณจะอัพเดทแต่ละเซิร์ฟเวอร์ตามลำดับต่อไป
ดูสถิติในตั้งค่าเซิร์ฟเวอร์
diff --git a/com.discord/res/values-tr/strings.xml b/com.discord/res/values-tr/strings.xml
index ef0916a23b..45d9b5950a 100644
--- a/com.discord/res/values-tr/strings.xml
+++ b/com.discord/res/values-tr/strings.xml
@@ -1345,7 +1345,6 @@ 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.
@@ -2654,7 +2653,6 @@ 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
@@ -3795,7 +3793,6 @@ 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.
@@ -4367,7 +4364,6 @@ 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 c561538184..8fef662196 100644
--- a/com.discord/res/values-uk/strings.xml
+++ b/com.discord/res/values-uk/strings.xml
@@ -1359,7 +1359,6 @@
Тільки під час розмови
Показати сповіщення, якщо Discord не виявить сигналу твого мікрофона.
Приватне повідомлення
- %1$s (приватне повідомлення)
Знайди або розпочни бесіду
%1$s %2$s
Ти не можеш надсилати повідомлення користувачу, якого ти заблокував.
@@ -2676,7 +2675,6 @@
Якщо в тебе є доступ до користувачів свого сайту, то ти також можеш динамічно додати &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
@@ -3818,7 +3816,6 @@
У тебе є посилання з запрошенням?
Вітаємо в Discord!
Я поки що пороздивляюся навколо
- Ласкаво просимо у Discord, %1$s
Ласкаво просимо до Discord
Жодних дзвінків або викликів. Заходь до голосового каналу, коли є час, і друзі можуть приєднатися, щоб поговорити з тобою, скористатися відеочатом або навіть продемонструвати свої екрани.
Голосові канали — це місця, де люди збираються, щоб побалакати.
@@ -4393,7 +4390,6 @@
Канал із правилами
Вибрати канал із правилами
Канал тільки для модераторів
- Вибери канал тільки для модераторів
Це повідомлення буде відправлено на всі сервери, які підписані на цей канал. Ти можеш редагувати або видалити це повідомлення пізніше, і такі зміни відобразяться на всіх підписаних серверах.
Це повідомлення буде відправлено на всі сервери (**%1$s), які підписані на цей канал. Ти можеш редагувати або видалити це повідомлення пізніше, і такі зміни відобразяться на всіх підписаних серверах.
Докладнішу статистику дивись у налаштуваннях сервера.
diff --git a/com.discord/res/values-vi/strings.xml b/com.discord/res/values-vi/strings.xml
index 992488bd53..8b0fd8f2d3 100644
--- a/com.discord/res/values-vi/strings.xml
+++ b/com.discord/res/values-vi/strings.xml
@@ -1338,7 +1338,6 @@ 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.
@@ -2643,7 +2642,6 @@ 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
@@ -3772,7 +3770,6 @@ 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.
@@ -4342,7 +4339,6 @@ 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 a07b01f97c..bf8bd10f91 100644
--- a/com.discord/res/values-zh-rCN/strings.xml
+++ b/com.discord/res/values-zh-rCN/strings.xml
@@ -1360,7 +1360,6 @@
只在说话的时候
在当Discord检测不到您的麦克风发出声音时显示警告。
私信
- %1$s (私信)
寻找或开始新的对话
%1$s %2$s
您不能向被您屏蔽的用户发送信息。
@@ -2672,7 +2671,6 @@
如果您拥有网站的用户权限的话,您还可以添加 &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
@@ -3814,7 +3812,6 @@
您有邀请链接吗?
欢迎来到 DISCORD!
我就是随便逛逛
- 欢迎加入 Discord,%1$s
欢迎来到 Discord
没有来电的铃声,也没有拨出的电话。请移步语音频道,与好友语音聊天、视频通话或分享屏幕。
语音频道是人们聚首畅谈的地方。
@@ -4387,7 +4384,6 @@
规则频道
选择一个规则频道
仅限管理员频道
- 选择仅限管理员频道
该消息会发送至所有关注此频道的服务器中。您可以在晚些时候编辑或删除此消息,随后每个关注的服务器中都会进行相应的更新。
该消息会发送至所有关注此频道的 **%1$s 个服务器** 中。您可以在晚些时候编辑或删除此消息,随后每个关注的服务器中都会进行相应的更新。
在服务器设置中查看更多数据。
diff --git a/com.discord/res/values-zh-rTW/strings.xml b/com.discord/res/values-zh-rTW/strings.xml
index 3ddd51fddf..879aa9b358 100644
--- a/com.discord/res/values-zh-rTW/strings.xml
+++ b/com.discord/res/values-zh-rTW/strings.xml
@@ -1360,7 +1360,6 @@
只有在發話中
當 Discord 無法從您的麥克風中偵測到音訊時顯示警告。
私人訊息
- %1$s (私人訊息)
搜尋或開始一個對話
%1$s %2$s
您無法傳送訊息給您已封鎖的使用者。
@@ -2675,7 +2674,6 @@
如果您擁有存取個人網站的權限,您便可以變動增加 &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
@@ -3815,7 +3813,6 @@
您有邀請連結嗎?
歡迎使用 Discord!
我現在只想四處看看
- 歡迎來到 Discord。 %1$s
歡迎來到 Discord
沒有鈴響或來電。加入語音頻道,好友就能隨時透過影片、甚至分享畫面,進來與您聊天。
語音頻道這個地方能讓大家聚在一起交談。
@@ -4387,7 +4384,6 @@
規則頻道
選擇一個規則頻道
版主限定頻道
- 選擇一個版主限定頻道
系統將傳送此訊息至所有追蹤此頻道的伺服器。您之後可以編輯或刪除此訊息,在追蹤的所有伺服器中,訊息也將隨之更新。
系統將傳送此訊息至追蹤此頻道的 **%1$s 個伺服器**。您之後可以編輯或刪除此訊息,在追蹤的所有伺服器中,訊息也將隨之更新。
至伺服器設定查看更多統計資料。
diff --git a/com.discord/res/values/ids.xml b/com.discord/res/values/ids.xml
index 2ead49c227..92fe51794d 100644
--- a/com.discord/res/values/ids.xml
+++ b/com.discord/res/values/ids.xml
@@ -493,9 +493,11 @@
+
+
@@ -563,6 +565,9 @@
+
+
+
@@ -691,6 +696,7 @@
+
@@ -826,6 +832,7 @@
+
@@ -844,6 +851,7 @@
+
@@ -2176,6 +2184,7 @@
+
@@ -2236,6 +2245,7 @@
+
diff --git a/com.discord/res/values/plurals.xml b/com.discord/res/values/plurals.xml
index 3d801e1bdc..8e0a056cfc 100644
--- a/com.discord/res/values/plurals.xml
+++ b/com.discord/res/values/plurals.xml
@@ -576,7 +576,11 @@
- %s Server Boosts
- %s Server Boost
-
+
+ - %s mentions
+ - %s mention
+
+
- %s mentions
- %s mention
@@ -732,9 +736,9 @@
- 1 message
- - %s messages in a thread
- - No messages in a thread
- - 1 message in a thread
+ - %s messages
+ - No messages
+ - 1 message
- %d new notifications
@@ -1033,6 +1037,9 @@
- Uploading %s Files
+
+ - %s Files Uploading Failed
+
- %s:
@@ -1082,5 +1089,5 @@
- %s People
- %s Person
- - false
+ - false
diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml
index 301a41861b..b00290ed16 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,2209 +4719,2219 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -7222,418 +7232,420 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -7814,131 +7826,133 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -11872,5287 +11886,5312 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml
index d63027b6b2..03394e2dcd 100644
--- a/com.discord/res/values/strings.xml
+++ b/com.discord/res/values/strings.xml
@@ -890,6 +890,8 @@
Augment Complete
Burgundy
Call
+ Call Ended
+ %1$s — %2$s
Thanks for the feedback!
Choose your main issue
Audio cut in and out
@@ -1034,6 +1036,7 @@ We’re here to make a good impression."
Participants
Channel has been deleted.
Channel header
+ Show all (%1$s)
Your role does not have permission to access this channel.
Channel Locked
Permissions synced with: **%1$s**
@@ -1125,7 +1128,7 @@ We’re here to make a good impression."
Presets
Select a color
Transparency
- d776b5f7c62544a1babbcb19626828a8
+ 1d9d3aadf02e437a8e41ab7650798d42
Coming Soon
Search Animated GIFs on the Web
Displays text with emphasis.
@@ -1295,6 +1298,7 @@ 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
@@ -1447,6 +1451,8 @@ 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
@@ -1493,7 +1499,6 @@ 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.
@@ -2333,6 +2338,8 @@ 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
@@ -2632,6 +2639,7 @@ 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.
@@ -2870,9 +2878,13 @@ 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 (%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 (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 (voice channel)
%1$s (voice channel), %2$s of %3$s users
%1$s (voice channel), %2$s
@@ -3344,6 +3356,7 @@ 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.
@@ -3490,6 +3503,7 @@ 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
@@ -3603,7 +3617,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
+ thz-2020-04-20-plus-vad
%1$s, %2$s
Language
Language Not Found
@@ -3615,6 +3629,7 @@ Want to know more about Discord?"
Oh no! Your message is over 2000 characters.
more than %1$s ago
last sync: %1$s
+ Last active %1$s
Launch %1$s
Learn More
[Learn More](%1$s)
@@ -3717,9 +3732,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 browsing mode, join this server to talk.
+ You are in preview mode. Join this server to talk.
Join %1$s
- You are currently lurking. Join this Discord to start chatting!
+ You are currently in preview mode. Join this server to start chatting!
"I'm not ready yet"
"You can't chat here yet!"
Join this server
@@ -3818,13 +3833,15 @@ 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
- 50+ messages in a thread
+ 50+ messages
50+ messages
Message Display
edited
+ $[](currentAuthor) $[replied to](replyHook) $[](originalAuthor)
More Options
Message pinned.
Message Preview
@@ -3859,6 +3876,7 @@ 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
@@ -4031,6 +4049,8 @@ 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.
@@ -4104,7 +4124,6 @@ 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
@@ -4185,7 +4204,6 @@ 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.
@@ -4836,7 +4854,6 @@ 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.
@@ -4937,6 +4954,7 @@ The changes to your subscription are reflected below:"
Are you sure you want to permanently remove **%1$s** from your friends?
"Remove '%1$s'"
Remove From Group
+ Remove from thread
Remove Icon
Remove Keybind
Remove Reaction
@@ -4946,6 +4964,8 @@ The changes to your subscription are reflected below:"
Show website preview info from links pasted into chat.
Link Preview
Show emoji reactions on messages.
+ Click to see attachment
+ Replying to $[](userHook)
Report
Report Message Posted by %1$s
Report Message
@@ -5217,6 +5237,8 @@ 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
@@ -5225,6 +5247,8 @@ 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
@@ -5596,6 +5620,7 @@ Would you like to show them?"
Thread was deleted
Join this thread to start chatting and save it to your sidebar!
%1$s
+ Message
Topic
Threads
Active
@@ -5648,6 +5673,8 @@ Would you like to show them?"
You are out of emoji slots.
Your reaction was not added because there are too many reactions on this message.
We appreciate the enthusiasm, but…
+ You are at the %1$s server limit. You must leave a server first to join.
+ Oh no!
You must leave a server first to join.
You are at the 100 server limit.
This option is not available for Community servers.
@@ -5748,9 +5775,6 @@ 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
@@ -5824,6 +5848,7 @@ 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/androidx/activity/R$id.smali b/com.discord/smali/androidx/activity/R$id.smali
index 1e8bef0bc8..98949abe38 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 = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final dialog_button:I = 0x7f0a02c7
+.field public static final dialog_button:I = 0x7f0a02cc
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a095a
+.field public static final tag_accessibility_actions:I = 0x7f0a0963
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
-.field public static final tag_accessibility_heading:I = 0x7f0a095c
+.field public static final tag_accessibility_heading:I = 0x7f0a0965
-.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
-.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
# direct methods
diff --git a/com.discord/smali/androidx/activity/R$string.smali b/com.discord/smali/androidx/activity/R$string.smali
index 167a5d6bdb..f3784f6166 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 = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
# 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 4de6137c29..1abedf9978 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 = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final dialog_button:I = 0x7f0a02c7
+.field public static final dialog_button:I = 0x7f0a02cc
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a095a
+.field public static final tag_accessibility_actions:I = 0x7f0a0963
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
-.field public static final tag_accessibility_heading:I = 0x7f0a095c
+.field public static final tag_accessibility_heading:I = 0x7f0a0965
-.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
-.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
# 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 3c48337328..71753052db 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 = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$id.smali b/com.discord/smali/androidx/appcompat/R$id.smali
index 4461ba2c1a..775cb8bd1f 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 = 0x7f0a025a
+.field public static final checkbox:I = 0x7f0a025f
-.field public static final checked:I = 0x7f0a025c
+.field public static final checked:I = 0x7f0a0261
-.field public static final chronometer:I = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final content:I = 0x7f0a0284
+.field public static final content:I = 0x7f0a0289
-.field public static final contentPanel:I = 0x7f0a0285
+.field public static final contentPanel:I = 0x7f0a028a
-.field public static final custom:I = 0x7f0a02af
+.field public static final custom:I = 0x7f0a02b4
-.field public static final customPanel:I = 0x7f0a02b0
+.field public static final customPanel:I = 0x7f0a02b5
-.field public static final decor_content_parent:I = 0x7f0a02b8
+.field public static final decor_content_parent:I = 0x7f0a02bd
-.field public static final default_activity_button:I = 0x7f0a02b9
+.field public static final default_activity_button:I = 0x7f0a02be
-.field public static final dialog_button:I = 0x7f0a02c7
+.field public static final dialog_button:I = 0x7f0a02cc
-.field public static final edit_query:I = 0x7f0a0317
+.field public static final edit_query:I = 0x7f0a031d
-.field public static final expand_activities_button:I = 0x7f0a0361
+.field public static final expand_activities_button:I = 0x7f0a0367
-.field public static final expanded_menu:I = 0x7f0a0362
+.field public static final expanded_menu:I = 0x7f0a0368
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final group_divider:I = 0x7f0a0409
+.field public static final group_divider:I = 0x7f0a0411
-.field public static final home:I = 0x7f0a04b8
+.field public static final home:I = 0x7f0a04c0
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final image:I = 0x7f0a04d6
+.field public static final image:I = 0x7f0a04de
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final listMode:I = 0x7f0a0580
+.field public static final listMode:I = 0x7f0a0588
-.field public static final list_item:I = 0x7f0a0581
+.field public static final list_item:I = 0x7f0a0589
-.field public static final message:I = 0x7f0a05d4
+.field public static final message:I = 0x7f0a05dc
-.field public static final multiply:I = 0x7f0a05f6
+.field public static final multiply:I = 0x7f0a05fe
-.field public static final none:I = 0x7f0a061d
+.field public static final none:I = 0x7f0a0625
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final off:I = 0x7f0a065e
+.field public static final off:I = 0x7f0a0666
-.field public static final on:I = 0x7f0a0662
+.field public static final on:I = 0x7f0a066a
-.field public static final parentPanel:I = 0x7f0a0677
+.field public static final parentPanel:I = 0x7f0a067f
-.field public static final progress_circular:I = 0x7f0a0722
+.field public static final progress_circular:I = 0x7f0a072a
-.field public static final progress_horizontal:I = 0x7f0a0725
+.field public static final progress_horizontal:I = 0x7f0a072d
-.field public static final radio:I = 0x7f0a0733
+.field public static final radio:I = 0x7f0a073b
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final screen:I = 0x7f0a0787
+.field public static final screen:I = 0x7f0a078f
-.field public static final scrollIndicatorDown:I = 0x7f0a078b
+.field public static final scrollIndicatorDown:I = 0x7f0a0793
-.field public static final scrollIndicatorUp:I = 0x7f0a078c
+.field public static final scrollIndicatorUp:I = 0x7f0a0794
-.field public static final scrollView:I = 0x7f0a078d
+.field public static final scrollView:I = 0x7f0a0795
-.field public static final search_badge:I = 0x7f0a0790
+.field public static final search_badge:I = 0x7f0a0798
-.field public static final search_bar:I = 0x7f0a0791
+.field public static final search_bar:I = 0x7f0a0799
-.field public static final search_button:I = 0x7f0a0792
+.field public static final search_button:I = 0x7f0a079a
-.field public static final search_close_btn:I = 0x7f0a0793
+.field public static final search_close_btn:I = 0x7f0a079b
-.field public static final search_edit_frame:I = 0x7f0a0794
+.field public static final search_edit_frame:I = 0x7f0a079c
-.field public static final search_go_btn:I = 0x7f0a0796
+.field public static final search_go_btn:I = 0x7f0a079e
-.field public static final search_mag_icon:I = 0x7f0a0797
+.field public static final search_mag_icon:I = 0x7f0a079f
-.field public static final search_plate:I = 0x7f0a0798
+.field public static final search_plate:I = 0x7f0a07a0
-.field public static final search_src_text:I = 0x7f0a079b
+.field public static final search_src_text:I = 0x7f0a07a3
-.field public static final search_voice_btn:I = 0x7f0a07a7
+.field public static final search_voice_btn:I = 0x7f0a07af
-.field public static final select_dialog_listview:I = 0x7f0a07aa
+.field public static final select_dialog_listview:I = 0x7f0a07b2
-.field public static final shortcut:I = 0x7f0a0906
+.field public static final shortcut:I = 0x7f0a090e
-.field public static final spacer:I = 0x7f0a0915
+.field public static final spacer:I = 0x7f0a091d
-.field public static final split_action_bar:I = 0x7f0a0919
+.field public static final split_action_bar:I = 0x7f0a0921
-.field public static final src_atop:I = 0x7f0a091d
+.field public static final src_atop:I = 0x7f0a0925
-.field public static final src_in:I = 0x7f0a091e
+.field public static final src_in:I = 0x7f0a0926
-.field public static final src_over:I = 0x7f0a091f
+.field public static final src_over:I = 0x7f0a0927
-.field public static final submenuarrow:I = 0x7f0a093c
+.field public static final submenuarrow:I = 0x7f0a0944
-.field public static final submit_area:I = 0x7f0a093d
+.field public static final submit_area:I = 0x7f0a0945
-.field public static final tabMode:I = 0x7f0a094c
+.field public static final tabMode:I = 0x7f0a0955
-.field public static final tag_accessibility_actions:I = 0x7f0a095a
+.field public static final tag_accessibility_actions:I = 0x7f0a0963
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
-.field public static final tag_accessibility_heading:I = 0x7f0a095c
+.field public static final tag_accessibility_heading:I = 0x7f0a0965
-.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
-.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final textSpacerNoButtons:I = 0x7f0a0970
+.field public static final textSpacerNoButtons:I = 0x7f0a0979
-.field public static final textSpacerNoTitle:I = 0x7f0a0971
+.field public static final textSpacerNoTitle:I = 0x7f0a097a
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
-.field public static final titleDividerNoCustom:I = 0x7f0a0984
+.field public static final titleDividerNoCustom:I = 0x7f0a098d
-.field public static final title_template:I = 0x7f0a0985
+.field public static final title_template:I = 0x7f0a098e
-.field public static final topPanel:I = 0x7f0a098b
+.field public static final topPanel:I = 0x7f0a0995
-.field public static final unchecked:I = 0x7f0a09a1
+.field public static final unchecked:I = 0x7f0a09ab
-.field public static final uniform:I = 0x7f0a09a4
+.field public static final uniform:I = 0x7f0a09ae
-.field public static final up:I = 0x7f0a09a6
+.field public static final up:I = 0x7f0a09b0
-.field public static final wrap_content:I = 0x7f0a0aa5
+.field public static final wrap_content:I = 0x7f0a0aaf
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$string.smali b/com.discord/smali/androidx/appcompat/R$string.smali
index e9a0dc311d..27513bb7c5 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 = 0x7f1213f4
+.field public static final search_menu_title:I = 0x7f121408
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
# 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 23cc0966f6..88dc2be611 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 = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final dialog_button:I = 0x7f0a02c7
+.field public static final dialog_button:I = 0x7f0a02cc
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a095a
+.field public static final tag_accessibility_actions:I = 0x7f0a0963
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
-.field public static final tag_accessibility_heading:I = 0x7f0a095c
+.field public static final tag_accessibility_heading:I = 0x7f0a0965
-.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
-.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
# 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 613c3bda87..d176ee0d57 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 = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
# direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$id.smali b/com.discord/smali/androidx/asynclayoutinflater/R$id.smali
index 06db3bd515..0003725ede 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 = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
# direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$string.smali b/com.discord/smali/androidx/asynclayoutinflater/R$string.smali
index 4837abd0c0..caba7d4653 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 = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
# direct methods
diff --git a/com.discord/smali/androidx/browser/R$id.smali b/com.discord/smali/androidx/browser/R$id.smali
index 3f8bc7b247..2d8f60b91b 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 = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final dialog_button:I = 0x7f0a02c7
+.field public static final dialog_button:I = 0x7f0a02cc
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a095a
+.field public static final tag_accessibility_actions:I = 0x7f0a0963
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
-.field public static final tag_accessibility_heading:I = 0x7f0a095c
+.field public static final tag_accessibility_heading:I = 0x7f0a0965
-.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
-.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
# direct methods
diff --git a/com.discord/smali/androidx/browser/R$string.smali b/com.discord/smali/androidx/browser/R$string.smali
index 0b7b224630..803cb6211b 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 = 0x7f1204d8
+.field public static final copy_toast_msg:I = 0x7f1204db
-.field public static final fallback_menu_item_copy_link:I = 0x7f120695
+.field public static final fallback_menu_item_copy_link:I = 0x7f12069a
-.field public static final fallback_menu_item_open_in_browser:I = 0x7f120696
+.field public static final fallback_menu_item_open_in_browser:I = 0x7f12069b
-.field public static final fallback_menu_item_share_link:I = 0x7f120697
+.field public static final fallback_menu_item_share_link:I = 0x7f12069c
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
# 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 1199aa05f5..136601e009 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 = 0x7f0a0344
+.field public static final end:I = 0x7f0a034a
-.field public static final gone:I = 0x7f0a0407
+.field public static final gone:I = 0x7f0a040f
-.field public static final invisible:I = 0x7f0a0507
+.field public static final invisible:I = 0x7f0a050f
-.field public static final left:I = 0x7f0a057a
+.field public static final left:I = 0x7f0a0582
-.field public static final packed:I = 0x7f0a0673
+.field public static final packed:I = 0x7f0a067b
-.field public static final parent:I = 0x7f0a0676
+.field public static final parent:I = 0x7f0a067e
-.field public static final percent:I = 0x7f0a06a4
+.field public static final percent:I = 0x7f0a06ac
-.field public static final right:I = 0x7f0a0755
+.field public static final right:I = 0x7f0a075d
-.field public static final spread:I = 0x7f0a091a
+.field public static final spread:I = 0x7f0a0922
-.field public static final spread_inside:I = 0x7f0a091b
+.field public static final spread_inside:I = 0x7f0a0923
-.field public static final start:I = 0x7f0a0922
+.field public static final start:I = 0x7f0a092a
-.field public static final top:I = 0x7f0a098a
+.field public static final top:I = 0x7f0a0994
-.field public static final wrap:I = 0x7f0a0aa4
+.field public static final wrap:I = 0x7f0a0aae
# direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$id.smali b/com.discord/smali/androidx/coordinatorlayout/R$id.smali
index 63677107b7..43f90f85dc 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 = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final dialog_button:I = 0x7f0a02c7
+.field public static final dialog_button:I = 0x7f0a02cc
-.field public static final end:I = 0x7f0a0344
+.field public static final end:I = 0x7f0a034a
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final left:I = 0x7f0a057a
+.field public static final left:I = 0x7f0a0582
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final none:I = 0x7f0a061d
+.field public static final none:I = 0x7f0a0625
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right:I = 0x7f0a0755
+.field public static final right:I = 0x7f0a075d
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final start:I = 0x7f0a0922
+.field public static final start:I = 0x7f0a092a
-.field public static final tag_accessibility_actions:I = 0x7f0a095a
+.field public static final tag_accessibility_actions:I = 0x7f0a0963
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
-.field public static final tag_accessibility_heading:I = 0x7f0a095c
+.field public static final tag_accessibility_heading:I = 0x7f0a0965
-.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
-.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
-.field public static final top:I = 0x7f0a098a
+.field public static final top:I = 0x7f0a0994
# direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$string.smali b/com.discord/smali/androidx/coordinatorlayout/R$string.smali
index d5594ad340..a734ceb230 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 = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
# direct methods
diff --git a/com.discord/smali/androidx/core/R$id.smali b/com.discord/smali/androidx/core/R$id.smali
index f5c6b158f0..9d8138ebed 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 = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final dialog_button:I = 0x7f0a02c7
+.field public static final dialog_button:I = 0x7f0a02cc
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a095a
+.field public static final tag_accessibility_actions:I = 0x7f0a0963
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
-.field public static final tag_accessibility_heading:I = 0x7f0a095c
+.field public static final tag_accessibility_heading:I = 0x7f0a0965
-.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
-.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
# direct methods
diff --git a/com.discord/smali/androidx/core/R$string.smali b/com.discord/smali/androidx/core/R$string.smali
index f67d0d09bc..6b7eea0107 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 = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
# 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 d0362c23d5..38fe8f336f 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 = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final dialog_button:I = 0x7f0a02c7
+.field public static final dialog_button:I = 0x7f0a02cc
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a095a
+.field public static final tag_accessibility_actions:I = 0x7f0a0963
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
-.field public static final tag_accessibility_heading:I = 0x7f0a095c
+.field public static final tag_accessibility_heading:I = 0x7f0a0965
-.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
-.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
# 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 8e64ca1763..50acc9c06c 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 = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
# direct methods
diff --git a/com.discord/smali/androidx/customview/R$id.smali b/com.discord/smali/androidx/customview/R$id.smali
index dd51f5a768..acdcd4ebb6 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 = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
# direct methods
diff --git a/com.discord/smali/androidx/customview/R$string.smali b/com.discord/smali/androidx/customview/R$string.smali
index 0149224d2c..4783ea02a6 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 = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
# direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$id.smali b/com.discord/smali/androidx/drawerlayout/R$id.smali
index f36bac01c2..723bba99ea 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 = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
# direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$string.smali b/com.discord/smali/androidx/drawerlayout/R$string.smali
index c6b8e9de8c..447daa487f 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 = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
# direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$id.smali b/com.discord/smali/androidx/dynamicanimation/R$id.smali
index b7f6daf0ed..2cbe981684 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 = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final dialog_button:I = 0x7f0a02c7
+.field public static final dialog_button:I = 0x7f0a02cc
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a095a
+.field public static final tag_accessibility_actions:I = 0x7f0a0963
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
-.field public static final tag_accessibility_heading:I = 0x7f0a095c
+.field public static final tag_accessibility_heading:I = 0x7f0a0965
-.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
-.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
# direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$string.smali b/com.discord/smali/androidx/dynamicanimation/R$string.smali
index 4c61d7a1ff..0be3187ae6 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 = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
# direct methods
diff --git a/com.discord/smali/androidx/fragment/R$id.smali b/com.discord/smali/androidx/fragment/R$id.smali
index 9107b5c50b..f03a7c02e4 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 = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final dialog_button:I = 0x7f0a02c7
+.field public static final dialog_button:I = 0x7f0a02cc
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final fragment_container_view_tag:I = 0x7f0a03bf
+.field public static final fragment_container_view_tag:I = 0x7f0a03c7
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a095a
+.field public static final tag_accessibility_actions:I = 0x7f0a0963
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
-.field public static final tag_accessibility_heading:I = 0x7f0a095c
+.field public static final tag_accessibility_heading:I = 0x7f0a0965
-.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
-.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
-.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a3e
+.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a48
# direct methods
diff --git a/com.discord/smali/androidx/fragment/R$string.smali b/com.discord/smali/androidx/fragment/R$string.smali
index 88b19dda1e..e788b8cece 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 = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
# 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 9d2bbc7a90..c4bb43b5e1 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 = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final dialog_button:I = 0x7f0a02c7
+.field public static final dialog_button:I = 0x7f0a02cc
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final fragment_container_view_tag:I = 0x7f0a03bf
+.field public static final fragment_container_view_tag:I = 0x7f0a03c7
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a095a
+.field public static final tag_accessibility_actions:I = 0x7f0a0963
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
-.field public static final tag_accessibility_heading:I = 0x7f0a095c
+.field public static final tag_accessibility_heading:I = 0x7f0a0965
-.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
-.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
-.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a3e
+.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a48
# 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 1253dc135b..361b7d45d5 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 = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
# 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 892765337d..d7b8fe05a5 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 = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final end:I = 0x7f0a0344
+.field public static final end:I = 0x7f0a034a
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final left:I = 0x7f0a057a
+.field public static final left:I = 0x7f0a0582
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final none:I = 0x7f0a061d
+.field public static final none:I = 0x7f0a0625
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right:I = 0x7f0a0755
+.field public static final right:I = 0x7f0a075d
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final start:I = 0x7f0a0922
+.field public static final start:I = 0x7f0a092a
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
-.field public static final top:I = 0x7f0a098a
+.field public static final top:I = 0x7f0a0994
# 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 e974983a30..2193b17c41 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 = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
# 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 1b90342012..1572a59591 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 = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
# 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 7cb1875df2..d0f132c005 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 = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
# 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 ad39b339e1..cb2861e255 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 = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final end:I = 0x7f0a0344
+.field public static final end:I = 0x7f0a034a
-.field public static final end_padder:I = 0x7f0a0345
+.field public static final end_padder:I = 0x7f0a034b
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final left:I = 0x7f0a057a
+.field public static final left:I = 0x7f0a0582
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final media_actions:I = 0x7f0a0597
+.field public static final media_actions:I = 0x7f0a059f
-.field public static final none:I = 0x7f0a061d
+.field public static final none:I = 0x7f0a0625
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right:I = 0x7f0a0755
+.field public static final right:I = 0x7f0a075d
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final start:I = 0x7f0a0922
+.field public static final start:I = 0x7f0a092a
-.field public static final status_bar_latest_event_content:I = 0x7f0a0926
+.field public static final status_bar_latest_event_content:I = 0x7f0a092e
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
-.field public static final top:I = 0x7f0a098a
+.field public static final top:I = 0x7f0a0994
# 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 3cf8fefea0..190d33cf45 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 = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
# direct methods
diff --git a/com.discord/smali/androidx/lifecycle/CloseableCoroutineScope.smali b/com.discord/smali/androidx/lifecycle/CloseableCoroutineScope.smali
index cad1d3197d..59d8253f5a 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;->p(Lkotlin/coroutines/CoroutineContext;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+ invoke-static {v0, v1, v2, v1}, Lf/n/a/k/a;->q(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 c388329705..fb2b7a8559 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;->q(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+ invoke-static {p2, v0, v1, v0}, Lf/n/a/k/a;->r(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 899ace1e5e..69cb22be5d 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;->q(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+ invoke-static {p4, v0, p1, v0}, Lf/n/a/k/a;->r(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;->q(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+ invoke-static {p1, v0, v1, v0}, Lf/n/a/k/a;->r(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 29f49213e5..720c00a550 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;->L(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;->M(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;->L(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;->M(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;->L(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;->M(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 5e24ae9208..b7258718c4 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;->p(Lkotlin/coroutines/CoroutineContext;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+ invoke-static {p1, v1, v0, v1}, Lf/n/a/k/a;->q(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 a152d96591..48b6fd529e 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;->p(Lkotlin/coroutines/CoroutineContext;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+ invoke-static {p1, v0, p2, v0}, Lf/n/a/k/a;->q(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;->p(Lkotlin/coroutines/CoroutineContext;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+ invoke-static {p1, v0, p2, v0}, Lf/n/a/k/a;->q(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;->L(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;->M(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 7f8408e705..568a3062ea 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;->n0(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+ invoke-static {v3, v5, p0}, Lf/n/a/k/a;->o0(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 beb04f7526..c7a2d698a6 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;->n0(Lkotlin/coroutines/CoroutineContext;Lkotlin/jvm/functions/Function2;Lkotlin/coroutines/Continuation;)Ljava/lang/Object;
+ invoke-static {v0, v1, p3}, Lf/n/a/k/a;->o0(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 532b073a94..104805cd9d 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 = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
# direct methods
diff --git a/com.discord/smali/androidx/loader/R$string.smali b/com.discord/smali/androidx/loader/R$string.smali
index ed837ea13b..337e9dad16 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 = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
# direct methods
diff --git a/com.discord/smali/androidx/media/R$id.smali b/com.discord/smali/androidx/media/R$id.smali
index 4d77549249..d3aa5a0eaf 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 = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final end_padder:I = 0x7f0a0345
+.field public static final end_padder:I = 0x7f0a034b
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final media_actions:I = 0x7f0a0597
+.field public static final media_actions:I = 0x7f0a059f
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final status_bar_latest_event_content:I = 0x7f0a0926
+.field public static final status_bar_latest_event_content:I = 0x7f0a092e
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
# direct methods
diff --git a/com.discord/smali/androidx/media/R$string.smali b/com.discord/smali/androidx/media/R$string.smali
index e97534ff80..c67baec4fb 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 = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
# direct methods
diff --git a/com.discord/smali/androidx/preference/R$id.smali b/com.discord/smali/androidx/preference/R$id.smali
index e44a4aff1c..b84e426106 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 = 0x7f0a025a
+.field public static final checkbox:I = 0x7f0a025f
-.field public static final checked:I = 0x7f0a025c
+.field public static final checked:I = 0x7f0a0261
-.field public static final chronometer:I = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final content:I = 0x7f0a0284
+.field public static final content:I = 0x7f0a0289
-.field public static final contentPanel:I = 0x7f0a0285
+.field public static final contentPanel:I = 0x7f0a028a
-.field public static final custom:I = 0x7f0a02af
+.field public static final custom:I = 0x7f0a02b4
-.field public static final customPanel:I = 0x7f0a02b0
+.field public static final customPanel:I = 0x7f0a02b5
-.field public static final decor_content_parent:I = 0x7f0a02b8
+.field public static final decor_content_parent:I = 0x7f0a02bd
-.field public static final default_activity_button:I = 0x7f0a02b9
+.field public static final default_activity_button:I = 0x7f0a02be
-.field public static final dialog_button:I = 0x7f0a02c7
+.field public static final dialog_button:I = 0x7f0a02cc
-.field public static final edit_query:I = 0x7f0a0317
+.field public static final edit_query:I = 0x7f0a031d
-.field public static final end:I = 0x7f0a0344
+.field public static final end:I = 0x7f0a034a
-.field public static final expand_activities_button:I = 0x7f0a0361
+.field public static final expand_activities_button:I = 0x7f0a0367
-.field public static final expanded_menu:I = 0x7f0a0362
+.field public static final expanded_menu:I = 0x7f0a0368
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final fragment_container_view_tag:I = 0x7f0a03bf
+.field public static final fragment_container_view_tag:I = 0x7f0a03c7
-.field public static final group_divider:I = 0x7f0a0409
+.field public static final group_divider:I = 0x7f0a0411
-.field public static final home:I = 0x7f0a04b8
+.field public static final home:I = 0x7f0a04c0
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_frame:I = 0x7f0a04cb
+.field public static final icon_frame:I = 0x7f0a04d3
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final image:I = 0x7f0a04d6
+.field public static final image:I = 0x7f0a04de
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0565
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a056d
-.field public static final left:I = 0x7f0a057a
+.field public static final left:I = 0x7f0a0582
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final listMode:I = 0x7f0a0580
+.field public static final listMode:I = 0x7f0a0588
-.field public static final list_item:I = 0x7f0a0581
+.field public static final list_item:I = 0x7f0a0589
-.field public static final message:I = 0x7f0a05d4
+.field public static final message:I = 0x7f0a05dc
-.field public static final multiply:I = 0x7f0a05f6
+.field public static final multiply:I = 0x7f0a05fe
-.field public static final none:I = 0x7f0a061d
+.field public static final none:I = 0x7f0a0625
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final off:I = 0x7f0a065e
+.field public static final off:I = 0x7f0a0666
-.field public static final on:I = 0x7f0a0662
+.field public static final on:I = 0x7f0a066a
-.field public static final parentPanel:I = 0x7f0a0677
+.field public static final parentPanel:I = 0x7f0a067f
-.field public static final progress_circular:I = 0x7f0a0722
+.field public static final progress_circular:I = 0x7f0a072a
-.field public static final progress_horizontal:I = 0x7f0a0725
+.field public static final progress_horizontal:I = 0x7f0a072d
-.field public static final radio:I = 0x7f0a0733
+.field public static final radio:I = 0x7f0a073b
-.field public static final recycler_view:I = 0x7f0a0739
+.field public static final recycler_view:I = 0x7f0a0741
-.field public static final right:I = 0x7f0a0755
+.field public static final right:I = 0x7f0a075d
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final screen:I = 0x7f0a0787
+.field public static final screen:I = 0x7f0a078f
-.field public static final scrollIndicatorDown:I = 0x7f0a078b
+.field public static final scrollIndicatorDown:I = 0x7f0a0793
-.field public static final scrollIndicatorUp:I = 0x7f0a078c
+.field public static final scrollIndicatorUp:I = 0x7f0a0794
-.field public static final scrollView:I = 0x7f0a078d
+.field public static final scrollView:I = 0x7f0a0795
-.field public static final search_badge:I = 0x7f0a0790
+.field public static final search_badge:I = 0x7f0a0798
-.field public static final search_bar:I = 0x7f0a0791
+.field public static final search_bar:I = 0x7f0a0799
-.field public static final search_button:I = 0x7f0a0792
+.field public static final search_button:I = 0x7f0a079a
-.field public static final search_close_btn:I = 0x7f0a0793
+.field public static final search_close_btn:I = 0x7f0a079b
-.field public static final search_edit_frame:I = 0x7f0a0794
+.field public static final search_edit_frame:I = 0x7f0a079c
-.field public static final search_go_btn:I = 0x7f0a0796
+.field public static final search_go_btn:I = 0x7f0a079e
-.field public static final search_mag_icon:I = 0x7f0a0797
+.field public static final search_mag_icon:I = 0x7f0a079f
-.field public static final search_plate:I = 0x7f0a0798
+.field public static final search_plate:I = 0x7f0a07a0
-.field public static final search_src_text:I = 0x7f0a079b
+.field public static final search_src_text:I = 0x7f0a07a3
-.field public static final search_voice_btn:I = 0x7f0a07a7
+.field public static final search_voice_btn:I = 0x7f0a07af
-.field public static final seekbar:I = 0x7f0a07a8
+.field public static final seekbar:I = 0x7f0a07b0
-.field public static final seekbar_value:I = 0x7f0a07a9
+.field public static final seekbar_value:I = 0x7f0a07b1
-.field public static final select_dialog_listview:I = 0x7f0a07aa
+.field public static final select_dialog_listview:I = 0x7f0a07b2
-.field public static final shortcut:I = 0x7f0a0906
+.field public static final shortcut:I = 0x7f0a090e
-.field public static final spacer:I = 0x7f0a0915
+.field public static final spacer:I = 0x7f0a091d
-.field public static final spinner:I = 0x7f0a0918
+.field public static final spinner:I = 0x7f0a0920
-.field public static final split_action_bar:I = 0x7f0a0919
+.field public static final split_action_bar:I = 0x7f0a0921
-.field public static final src_atop:I = 0x7f0a091d
+.field public static final src_atop:I = 0x7f0a0925
-.field public static final src_in:I = 0x7f0a091e
+.field public static final src_in:I = 0x7f0a0926
-.field public static final src_over:I = 0x7f0a091f
+.field public static final src_over:I = 0x7f0a0927
-.field public static final start:I = 0x7f0a0922
+.field public static final start:I = 0x7f0a092a
-.field public static final submenuarrow:I = 0x7f0a093c
+.field public static final submenuarrow:I = 0x7f0a0944
-.field public static final submit_area:I = 0x7f0a093d
+.field public static final submit_area:I = 0x7f0a0945
-.field public static final switchWidget:I = 0x7f0a094a
+.field public static final switchWidget:I = 0x7f0a0953
-.field public static final tabMode:I = 0x7f0a094c
+.field public static final tabMode:I = 0x7f0a0955
-.field public static final tag_accessibility_actions:I = 0x7f0a095a
+.field public static final tag_accessibility_actions:I = 0x7f0a0963
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
-.field public static final tag_accessibility_heading:I = 0x7f0a095c
+.field public static final tag_accessibility_heading:I = 0x7f0a0965
-.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
-.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final textSpacerNoButtons:I = 0x7f0a0970
+.field public static final textSpacerNoButtons:I = 0x7f0a0979
-.field public static final textSpacerNoTitle:I = 0x7f0a0971
+.field public static final textSpacerNoTitle:I = 0x7f0a097a
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
-.field public static final titleDividerNoCustom:I = 0x7f0a0984
+.field public static final titleDividerNoCustom:I = 0x7f0a098d
-.field public static final title_template:I = 0x7f0a0985
+.field public static final title_template:I = 0x7f0a098e
-.field public static final top:I = 0x7f0a098a
+.field public static final top:I = 0x7f0a0994
-.field public static final topPanel:I = 0x7f0a098b
+.field public static final topPanel:I = 0x7f0a0995
-.field public static final unchecked:I = 0x7f0a09a1
+.field public static final unchecked:I = 0x7f0a09ab
-.field public static final uniform:I = 0x7f0a09a4
+.field public static final uniform:I = 0x7f0a09ae
-.field public static final up:I = 0x7f0a09a6
+.field public static final up:I = 0x7f0a09b0
-.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a3e
+.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a48
-.field public static final wrap_content:I = 0x7f0a0aa5
+.field public static final wrap_content:I = 0x7f0a0aaf
# direct methods
diff --git a/com.discord/smali/androidx/preference/R$string.smali b/com.discord/smali/androidx/preference/R$string.smali
index 8c396460cf..f1b4fcf570 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 = 0x7f1204ce
+.field public static final copy:I = 0x7f1204d1
-.field public static final expand_button_title:I = 0x7f12067a
+.field public static final expand_button_title:I = 0x7f12067f
-.field public static final not_set:I = 0x7f120f95
+.field public static final not_set:I = 0x7f120fa9
-.field public static final preference_copied:I = 0x7f121131
+.field public static final preference_copied:I = 0x7f121143
-.field public static final search_menu_title:I = 0x7f1213f4
+.field public static final search_menu_title:I = 0x7f121408
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
-.field public static final summary_collapsed_preference_list:I = 0x7f121515
+.field public static final summary_collapsed_preference_list:I = 0x7f12152d
-.field public static final v7_preference_off:I = 0x7f121741
+.field public static final v7_preference_off:I = 0x7f12175a
-.field public static final v7_preference_on:I = 0x7f121742
+.field public static final v7_preference_on:I = 0x7f12175b
# 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 87b4823546..8f7a60467f 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 = 0x7f0a025a
+.field public static final checkbox:I = 0x7f0a025f
-.field public static final checked:I = 0x7f0a025c
+.field public static final checked:I = 0x7f0a0261
-.field public static final chronometer:I = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final content:I = 0x7f0a0284
+.field public static final content:I = 0x7f0a0289
-.field public static final contentPanel:I = 0x7f0a0285
+.field public static final contentPanel:I = 0x7f0a028a
-.field public static final custom:I = 0x7f0a02af
+.field public static final custom:I = 0x7f0a02b4
-.field public static final customPanel:I = 0x7f0a02b0
+.field public static final customPanel:I = 0x7f0a02b5
-.field public static final decor_content_parent:I = 0x7f0a02b8
+.field public static final decor_content_parent:I = 0x7f0a02bd
-.field public static final default_activity_button:I = 0x7f0a02b9
+.field public static final default_activity_button:I = 0x7f0a02be
-.field public static final dialog_button:I = 0x7f0a02c7
+.field public static final dialog_button:I = 0x7f0a02cc
-.field public static final edit_query:I = 0x7f0a0317
+.field public static final edit_query:I = 0x7f0a031d
-.field public static final end:I = 0x7f0a0344
+.field public static final end:I = 0x7f0a034a
-.field public static final expand_activities_button:I = 0x7f0a0361
+.field public static final expand_activities_button:I = 0x7f0a0367
-.field public static final expanded_menu:I = 0x7f0a0362
+.field public static final expanded_menu:I = 0x7f0a0368
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final fragment_container_view_tag:I = 0x7f0a03bf
+.field public static final fragment_container_view_tag:I = 0x7f0a03c7
-.field public static final group_divider:I = 0x7f0a0409
+.field public static final group_divider:I = 0x7f0a0411
-.field public static final home:I = 0x7f0a04b8
+.field public static final home:I = 0x7f0a04c0
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_frame:I = 0x7f0a04cb
+.field public static final icon_frame:I = 0x7f0a04d3
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final image:I = 0x7f0a04d6
+.field public static final image:I = 0x7f0a04de
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0565
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a056d
-.field public static final left:I = 0x7f0a057a
+.field public static final left:I = 0x7f0a0582
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final listMode:I = 0x7f0a0580
+.field public static final listMode:I = 0x7f0a0588
-.field public static final list_item:I = 0x7f0a0581
+.field public static final list_item:I = 0x7f0a0589
-.field public static final message:I = 0x7f0a05d4
+.field public static final message:I = 0x7f0a05dc
-.field public static final multiply:I = 0x7f0a05f6
+.field public static final multiply:I = 0x7f0a05fe
-.field public static final none:I = 0x7f0a061d
+.field public static final none:I = 0x7f0a0625
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final off:I = 0x7f0a065e
+.field public static final off:I = 0x7f0a0666
-.field public static final on:I = 0x7f0a0662
+.field public static final on:I = 0x7f0a066a
-.field public static final parentPanel:I = 0x7f0a0677
+.field public static final parentPanel:I = 0x7f0a067f
-.field public static final progress_circular:I = 0x7f0a0722
+.field public static final progress_circular:I = 0x7f0a072a
-.field public static final progress_horizontal:I = 0x7f0a0725
+.field public static final progress_horizontal:I = 0x7f0a072d
-.field public static final radio:I = 0x7f0a0733
+.field public static final radio:I = 0x7f0a073b
-.field public static final recycler_view:I = 0x7f0a0739
+.field public static final recycler_view:I = 0x7f0a0741
-.field public static final right:I = 0x7f0a0755
+.field public static final right:I = 0x7f0a075d
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final screen:I = 0x7f0a0787
+.field public static final screen:I = 0x7f0a078f
-.field public static final scrollIndicatorDown:I = 0x7f0a078b
+.field public static final scrollIndicatorDown:I = 0x7f0a0793
-.field public static final scrollIndicatorUp:I = 0x7f0a078c
+.field public static final scrollIndicatorUp:I = 0x7f0a0794
-.field public static final scrollView:I = 0x7f0a078d
+.field public static final scrollView:I = 0x7f0a0795
-.field public static final search_badge:I = 0x7f0a0790
+.field public static final search_badge:I = 0x7f0a0798
-.field public static final search_bar:I = 0x7f0a0791
+.field public static final search_bar:I = 0x7f0a0799
-.field public static final search_button:I = 0x7f0a0792
+.field public static final search_button:I = 0x7f0a079a
-.field public static final search_close_btn:I = 0x7f0a0793
+.field public static final search_close_btn:I = 0x7f0a079b
-.field public static final search_edit_frame:I = 0x7f0a0794
+.field public static final search_edit_frame:I = 0x7f0a079c
-.field public static final search_go_btn:I = 0x7f0a0796
+.field public static final search_go_btn:I = 0x7f0a079e
-.field public static final search_mag_icon:I = 0x7f0a0797
+.field public static final search_mag_icon:I = 0x7f0a079f
-.field public static final search_plate:I = 0x7f0a0798
+.field public static final search_plate:I = 0x7f0a07a0
-.field public static final search_src_text:I = 0x7f0a079b
+.field public static final search_src_text:I = 0x7f0a07a3
-.field public static final search_voice_btn:I = 0x7f0a07a7
+.field public static final search_voice_btn:I = 0x7f0a07af
-.field public static final seekbar:I = 0x7f0a07a8
+.field public static final seekbar:I = 0x7f0a07b0
-.field public static final seekbar_value:I = 0x7f0a07a9
+.field public static final seekbar_value:I = 0x7f0a07b1
-.field public static final select_dialog_listview:I = 0x7f0a07aa
+.field public static final select_dialog_listview:I = 0x7f0a07b2
-.field public static final shortcut:I = 0x7f0a0906
+.field public static final shortcut:I = 0x7f0a090e
-.field public static final spacer:I = 0x7f0a0915
+.field public static final spacer:I = 0x7f0a091d
-.field public static final spinner:I = 0x7f0a0918
+.field public static final spinner:I = 0x7f0a0920
-.field public static final split_action_bar:I = 0x7f0a0919
+.field public static final split_action_bar:I = 0x7f0a0921
-.field public static final src_atop:I = 0x7f0a091d
+.field public static final src_atop:I = 0x7f0a0925
-.field public static final src_in:I = 0x7f0a091e
+.field public static final src_in:I = 0x7f0a0926
-.field public static final src_over:I = 0x7f0a091f
+.field public static final src_over:I = 0x7f0a0927
-.field public static final start:I = 0x7f0a0922
+.field public static final start:I = 0x7f0a092a
-.field public static final submenuarrow:I = 0x7f0a093c
+.field public static final submenuarrow:I = 0x7f0a0944
-.field public static final submit_area:I = 0x7f0a093d
+.field public static final submit_area:I = 0x7f0a0945
-.field public static final switchWidget:I = 0x7f0a094a
+.field public static final switchWidget:I = 0x7f0a0953
-.field public static final tabMode:I = 0x7f0a094c
+.field public static final tabMode:I = 0x7f0a0955
-.field public static final tag_accessibility_actions:I = 0x7f0a095a
+.field public static final tag_accessibility_actions:I = 0x7f0a0963
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
-.field public static final tag_accessibility_heading:I = 0x7f0a095c
+.field public static final tag_accessibility_heading:I = 0x7f0a0965
-.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
-.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final textSpacerNoButtons:I = 0x7f0a0970
+.field public static final textSpacerNoButtons:I = 0x7f0a0979
-.field public static final textSpacerNoTitle:I = 0x7f0a0971
+.field public static final textSpacerNoTitle:I = 0x7f0a097a
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
-.field public static final titleDividerNoCustom:I = 0x7f0a0984
+.field public static final titleDividerNoCustom:I = 0x7f0a098d
-.field public static final title_template:I = 0x7f0a0985
+.field public static final title_template:I = 0x7f0a098e
-.field public static final top:I = 0x7f0a098a
+.field public static final top:I = 0x7f0a0994
-.field public static final topPanel:I = 0x7f0a098b
+.field public static final topPanel:I = 0x7f0a0995
-.field public static final unchecked:I = 0x7f0a09a1
+.field public static final unchecked:I = 0x7f0a09ab
-.field public static final uniform:I = 0x7f0a09a4
+.field public static final uniform:I = 0x7f0a09ae
-.field public static final up:I = 0x7f0a09a6
+.field public static final up:I = 0x7f0a09b0
-.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a3e
+.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a48
-.field public static final wrap_content:I = 0x7f0a0aa5
+.field public static final wrap_content:I = 0x7f0a0aaf
# 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 c2d76750e5..202abe345c 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 = 0x7f1204ce
+.field public static final copy:I = 0x7f1204d1
-.field public static final expand_button_title:I = 0x7f12067a
+.field public static final expand_button_title:I = 0x7f12067f
-.field public static final not_set:I = 0x7f120f95
+.field public static final not_set:I = 0x7f120fa9
-.field public static final preference_copied:I = 0x7f121131
+.field public static final preference_copied:I = 0x7f121143
-.field public static final search_menu_title:I = 0x7f1213f4
+.field public static final search_menu_title:I = 0x7f121408
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
-.field public static final summary_collapsed_preference_list:I = 0x7f121515
+.field public static final summary_collapsed_preference_list:I = 0x7f12152d
-.field public static final v7_preference_off:I = 0x7f121741
+.field public static final v7_preference_off:I = 0x7f12175a
-.field public static final v7_preference_on:I = 0x7f121742
+.field public static final v7_preference_on:I = 0x7f12175b
# direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$id.smali b/com.discord/smali/androidx/recyclerview/R$id.smali
index 29a1bcc6a5..0e8aefc4ae 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 = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final dialog_button:I = 0x7f0a02c7
+.field public static final dialog_button:I = 0x7f0a02cc
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0565
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a056d
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a095a
+.field public static final tag_accessibility_actions:I = 0x7f0a0963
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
-.field public static final tag_accessibility_heading:I = 0x7f0a095c
+.field public static final tag_accessibility_heading:I = 0x7f0a0965
-.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
-.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
# direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$string.smali b/com.discord/smali/androidx/recyclerview/R$string.smali
index 1808fbfebe..6c39fd23d8 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 = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
# direct methods
diff --git a/com.discord/smali/androidx/sharetarget/R$id.smali b/com.discord/smali/androidx/sharetarget/R$id.smali
index f325f56b8a..7dc01b4034 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 = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final dialog_button:I = 0x7f0a02c7
+.field public static final dialog_button:I = 0x7f0a02cc
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a095a
+.field public static final tag_accessibility_actions:I = 0x7f0a0963
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
-.field public static final tag_accessibility_heading:I = 0x7f0a095c
+.field public static final tag_accessibility_heading:I = 0x7f0a0965
-.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
-.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
# direct methods
diff --git a/com.discord/smali/androidx/sharetarget/R$string.smali b/com.discord/smali/androidx/sharetarget/R$string.smali
index 6667d2669b..24aed6d560 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 = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
# direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$id.smali b/com.discord/smali/androidx/slidingpanelayout/R$id.smali
index 9df1b525f9..d37d2a969b 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 = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
# direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$string.smali b/com.discord/smali/androidx/slidingpanelayout/R$string.smali
index 09f9e75c91..ed6a33e12a 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 = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
# direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$id.smali b/com.discord/smali/androidx/swiperefreshlayout/R$id.smali
index 87f1ce6e87..56986c4668 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 = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final dialog_button:I = 0x7f0a02c7
+.field public static final dialog_button:I = 0x7f0a02cc
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a095a
+.field public static final tag_accessibility_actions:I = 0x7f0a0963
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
-.field public static final tag_accessibility_heading:I = 0x7f0a095c
+.field public static final tag_accessibility_heading:I = 0x7f0a0965
-.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
-.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
# direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$string.smali b/com.discord/smali/androidx/swiperefreshlayout/R$string.smali
index bce4bf837b..596ce55c6a 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 = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
# direct methods
diff --git a/com.discord/smali/androidx/transition/R$id.smali b/com.discord/smali/androidx/transition/R$id.smali
index 9eb0711004..e153c4220a 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 = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final ghost_view:I = 0x7f0a03da
+.field public static final ghost_view:I = 0x7f0a03e2
-.field public static final ghost_view_holder:I = 0x7f0a03db
+.field public static final ghost_view_holder:I = 0x7f0a03e3
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final parent_matrix:I = 0x7f0a0678
+.field public static final parent_matrix:I = 0x7f0a0680
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final save_non_transition_alpha:I = 0x7f0a0783
+.field public static final save_non_transition_alpha:I = 0x7f0a078b
-.field public static final save_overlay_view:I = 0x7f0a0784
+.field public static final save_overlay_view:I = 0x7f0a078c
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
-.field public static final transition_current_scene:I = 0x7f0a098e
+.field public static final transition_current_scene:I = 0x7f0a0998
-.field public static final transition_layout_save:I = 0x7f0a098f
+.field public static final transition_layout_save:I = 0x7f0a0999
-.field public static final transition_position:I = 0x7f0a0990
+.field public static final transition_position:I = 0x7f0a099a
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a0991
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a099b
-.field public static final transition_transform:I = 0x7f0a0992
+.field public static final transition_transform:I = 0x7f0a099c
# direct methods
diff --git a/com.discord/smali/androidx/transition/R$string.smali b/com.discord/smali/androidx/transition/R$string.smali
index 9f30fa0725..7408233bcc 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 = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$id.smali b/com.discord/smali/androidx/vectordrawable/R$id.smali
index 9d510c618d..475d6baf03 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 = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final dialog_button:I = 0x7f0a02c7
+.field public static final dialog_button:I = 0x7f0a02cc
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a095a
+.field public static final tag_accessibility_actions:I = 0x7f0a0963
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
-.field public static final tag_accessibility_heading:I = 0x7f0a095c
+.field public static final tag_accessibility_heading:I = 0x7f0a0965
-.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
-.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$string.smali b/com.discord/smali/androidx/vectordrawable/R$string.smali
index 881eeaac5b..5f52e84815 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 = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
# 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 5c17de021d..53b7580964 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 = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final dialog_button:I = 0x7f0a02c7
+.field public static final dialog_button:I = 0x7f0a02cc
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a095a
+.field public static final tag_accessibility_actions:I = 0x7f0a0963
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
-.field public static final tag_accessibility_heading:I = 0x7f0a095c
+.field public static final tag_accessibility_heading:I = 0x7f0a0965
-.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
-.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
# 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 12b0add746..4d29551b36 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 = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
# direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$id.smali b/com.discord/smali/androidx/viewpager/R$id.smali
index a40327a091..0724967b3e 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 = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
# direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$string.smali b/com.discord/smali/androidx/viewpager/R$string.smali
index f017333361..b31acdce4a 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 = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
# direct methods
diff --git a/com.discord/smali/androidx/viewpager2/R$id.smali b/com.discord/smali/androidx/viewpager2/R$id.smali
index 95ff1b7a83..5acac8f1aa 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 = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final dialog_button:I = 0x7f0a02c7
+.field public static final dialog_button:I = 0x7f0a02cc
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0565
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a056d
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a095a
+.field public static final tag_accessibility_actions:I = 0x7f0a0963
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
-.field public static final tag_accessibility_heading:I = 0x7f0a095c
+.field public static final tag_accessibility_heading:I = 0x7f0a0965
-.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
-.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
# direct methods
diff --git a/com.discord/smali/androidx/viewpager2/R$string.smali b/com.discord/smali/androidx/viewpager2/R$string.smali
index 6f730100eb..9aae1efd19 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 = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
# direct methods
diff --git a/com.discord/smali/androidx/work/CoroutineWorker$1.smali b/com.discord/smali/androidx/work/CoroutineWorker$1.smali
index 9e936e45f8..f7609b119e 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;->q(Lkotlinx/coroutines/Job;Ljava/util/concurrent/CancellationException;ILjava/lang/Object;)V
+ invoke-static {v0, v2, v1, v2}, Lf/n/a/k/a;->r(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 9c451f76e5..af0f77ffe7 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;->L(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;->M(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 1ccb3e52c1..ea513cfe20 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 = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final dialog_button:I = 0x7f0a02c7
+.field public static final dialog_button:I = 0x7f0a02cc
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a095a
+.field public static final tag_accessibility_actions:I = 0x7f0a0963
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
-.field public static final tag_accessibility_heading:I = 0x7f0a095c
+.field public static final tag_accessibility_heading:I = 0x7f0a0965
-.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
-.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
# direct methods
diff --git a/com.discord/smali/androidx/work/R$string.smali b/com.discord/smali/androidx/work/R$string.smali
index 4d0c99b823..597ce0ba23 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 = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
# 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 b9a6ce76df..790e673283 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 = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final dialog_button:I = 0x7f0a02c7
+.field public static final dialog_button:I = 0x7f0a02cc
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a095a
+.field public static final tag_accessibility_actions:I = 0x7f0a0963
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
-.field public static final tag_accessibility_heading:I = 0x7f0a095c
+.field public static final tag_accessibility_heading:I = 0x7f0a0965
-.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
-.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
# 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 38435f098f..89fb0f6ec1 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 = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
# direct methods
diff --git a/com.discord/smali/co/discord/media_engine/Connection.smali b/com.discord/smali/co/discord/media_engine/Connection.smali
index c8d0126ee1..dfb286ab50 100644
--- a/com.discord/smali/co/discord/media_engine/Connection.smali
+++ b/com.discord/smali/co/discord/media_engine/Connection.smali
@@ -179,6 +179,9 @@
.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 f33e78d732..99b3142731 100644
--- a/com.discord/smali/co/discord/media_engine/OutboundRtpAudio.smali
+++ b/com.discord/smali/co/discord/media_engine/OutboundRtpAudio.smali
@@ -14,6 +14,12 @@
.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
@@ -22,60 +28,98 @@
.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;JIIFFZ)V
- .locals 1
+.method public constructor (Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFFZJJJJ)V
+ .locals 4
- const/4 v0, 0x0
+ move-object v0, p0
- if-eqz p1, :cond_1
+ move-object v1, p1
- if-eqz p3, :cond_0
+ move-object v2, p3
+
+ const/4 v3, 0x0
+
+ if-eqz v1, :cond_1
+
+ if-eqz v2, :cond_0
invoke-direct {p0}, Ljava/lang/Object;->()V
- iput-object p1, p0, Lco/discord/media_engine/OutboundRtpAudio;->type:Ljava/lang/String;
+ iput-object v1, v0, Lco/discord/media_engine/OutboundRtpAudio;->type:Ljava/lang/String;
- iput p2, p0, Lco/discord/media_engine/OutboundRtpAudio;->ssrc:I
+ move v1, p2
- iput-object p3, p0, Lco/discord/media_engine/OutboundRtpAudio;->codec:Lco/discord/media_engine/StatsCodec;
+ iput v1, v0, Lco/discord/media_engine/OutboundRtpAudio;->ssrc:I
- iput-wide p4, p0, Lco/discord/media_engine/OutboundRtpAudio;->bytesSent:J
+ iput-object v2, v0, Lco/discord/media_engine/OutboundRtpAudio;->codec:Lco/discord/media_engine/StatsCodec;
- iput p6, p0, Lco/discord/media_engine/OutboundRtpAudio;->packetsSent:I
+ move-wide v1, p4
- iput p7, p0, Lco/discord/media_engine/OutboundRtpAudio;->packetsLost:I
+ iput-wide v1, v0, Lco/discord/media_engine/OutboundRtpAudio;->bytesSent:J
- iput p8, p0, Lco/discord/media_engine/OutboundRtpAudio;->fractionLost:F
+ move v1, p6
- iput p9, p0, Lco/discord/media_engine/OutboundRtpAudio;->audioLevel:F
+ iput v1, v0, Lco/discord/media_engine/OutboundRtpAudio;->packetsSent:I
- iput-boolean p10, p0, Lco/discord/media_engine/OutboundRtpAudio;->audioDetected:Z
+ 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
return-void
:cond_0
- const-string p1, "codec"
+ const-string v1, "codec"
- 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
+ throw v3
:cond_1
- const-string p1, "type"
+ const-string v1, "type"
- 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
+ throw v3
.end method
-.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
+.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
- move-object v0, p0
+ move-object/from16 v0, p0
- move/from16 v1, p11
+ move/from16 v1, p19
and-int/lit8 v2, v1, 0x1
@@ -86,7 +130,7 @@
goto :goto_0
:cond_0
- move-object v2, p1
+ move-object/from16 v2, p1
:goto_0
and-int/lit8 v3, v1, 0x2
@@ -98,7 +142,7 @@
goto :goto_1
:cond_1
- move v3, p2
+ move/from16 v3, p2
:goto_1
and-int/lit8 v4, v1, 0x4
@@ -110,7 +154,7 @@
goto :goto_2
:cond_2
- move-object v4, p3
+ move-object/from16 v4, p3
:goto_2
and-int/lit8 v5, v1, 0x8
@@ -122,7 +166,7 @@
goto :goto_3
:cond_3
- move-wide v5, p4
+ move-wide/from16 v5, p4
:goto_3
and-int/lit8 v7, v1, 0x10
@@ -173,25 +217,77 @@
move/from16 v10, p9
:goto_7
- and-int/lit16 v1, v1, 0x100
+ and-int/lit16 v11, v1, 0x100
- if-eqz v1, :cond_8
+ if-eqz v11, :cond_8
- iget-boolean v1, v0, Lco/discord/media_engine/OutboundRtpAudio;->audioDetected:Z
+ iget-boolean v11, v0, Lco/discord/media_engine/OutboundRtpAudio;->audioDetected:Z
goto :goto_8
:cond_8
- move/from16 v1, p10
+ move/from16 v11, p10
:goto_8
- move-object p1, v2
+ and-int/lit16 v12, v1, 0x200
- move p2, v3
+ if-eqz v12, :cond_9
- move-object p3, v4
+ iget-wide v12, v0, Lco/discord/media_engine/OutboundRtpAudio;->framesCaptured:J
- move-wide p4, v5
+ 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/from16 p6, v7
@@ -201,9 +297,13 @@
move/from16 p9, v10
- move/from16 p10, v1
+ move/from16 p10, v11
- 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-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;
move-result-object v0
@@ -220,6 +320,38 @@
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
@@ -284,8 +416,8 @@
return v0
.end method
-.method public final copy(Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFFZ)Lco/discord/media_engine/OutboundRtpAudio;
- .locals 12
+.method public final copy(Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFFZJJJJ)Lco/discord/media_engine/OutboundRtpAudio;
+ .locals 20
const/4 v0, 0x0
@@ -297,11 +429,11 @@
move-object v1, v0
- move-object v2, p1
+ move-object/from16 v2, p1
- move v3, p2
+ move/from16 v3, p2
- move-object v4, p3
+ move-object/from16 v4, p3
move-wide/from16 v5, p4
@@ -315,7 +447,15 @@
move/from16 v11, p10
- invoke-direct/range {v1 .. v11}, Lco/discord/media_engine/OutboundRtpAudio;->(Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFFZ)V
+ 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
return-object v0
@@ -339,13 +479,13 @@
const/4 v0, 0x1
- if-eq p0, p1, :cond_6
+ if-eq p0, p1, :cond_a
instance-of v1, p1, Lco/discord/media_engine/OutboundRtpAudio;
const/4 v2, 0x0
- if-eqz v1, :cond_5
+ if-eqz v1, :cond_9
check-cast p1, Lco/discord/media_engine/OutboundRtpAudio;
@@ -357,7 +497,7 @@
move-result v1
- if-eqz v1, :cond_5
+ if-eqz v1, :cond_9
iget v1, p0, Lco/discord/media_engine/OutboundRtpAudio;->ssrc:I
@@ -373,7 +513,7 @@
const/4 v1, 0x0
:goto_0
- if-eqz v1, :cond_5
+ if-eqz v1, :cond_9
iget-object v1, p0, Lco/discord/media_engine/OutboundRtpAudio;->codec:Lco/discord/media_engine/StatsCodec;
@@ -383,7 +523,7 @@
move-result v1
- if-eqz v1, :cond_5
+ if-eqz v1, :cond_9
iget-wide v3, p0, Lco/discord/media_engine/OutboundRtpAudio;->bytesSent:J
@@ -401,7 +541,7 @@
const/4 v1, 0x0
:goto_1
- if-eqz v1, :cond_5
+ if-eqz v1, :cond_9
iget v1, p0, Lco/discord/media_engine/OutboundRtpAudio;->packetsSent:I
@@ -417,7 +557,7 @@
const/4 v1, 0x0
:goto_2
- if-eqz v1, :cond_5
+ if-eqz v1, :cond_9
iget v1, p0, Lco/discord/media_engine/OutboundRtpAudio;->packetsLost:I
@@ -433,7 +573,7 @@
const/4 v1, 0x0
:goto_3
- if-eqz v1, :cond_5
+ if-eqz v1, :cond_9
iget v1, p0, Lco/discord/media_engine/OutboundRtpAudio;->fractionLost:F
@@ -443,7 +583,7 @@
move-result v1
- if-nez v1, :cond_5
+ if-nez v1, :cond_9
iget v1, p0, Lco/discord/media_engine/OutboundRtpAudio;->audioLevel:F
@@ -453,31 +593,103 @@
move-result v1
- if-nez v1, :cond_5
+ if-nez v1, :cond_9
iget-boolean v1, p0, Lco/discord/media_engine/OutboundRtpAudio;->audioDetected:Z
- iget-boolean p1, p1, Lco/discord/media_engine/OutboundRtpAudio;->audioDetected:Z
+ iget-boolean v3, p1, Lco/discord/media_engine/OutboundRtpAudio;->audioDetected:Z
- if-ne v1, p1, :cond_4
+ if-ne v1, v3, :cond_4
- const/4 p1, 0x1
+ const/4 v1, 0x1
goto :goto_4
:cond_4
- const/4 p1, 0x0
+ const/4 v1, 0x0
:goto_4
- if-eqz p1, :cond_5
+ 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
goto :goto_5
:cond_5
- return v2
+ 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
- :goto_5
+ 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
return v0
.end method
@@ -521,6 +733,30 @@
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
@@ -553,8 +789,16 @@
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 3
+ .locals 4
iget-object v0, p0, Lco/discord/media_engine/OutboundRtpAudio;->type:Ljava/lang/String;
@@ -638,11 +882,51 @@
: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 3
+ .locals 4
const-string v0, "OutboundRtpAudio(type="
@@ -716,9 +1000,41 @@
iget-boolean v1, p0, Lco/discord/media_engine/OutboundRtpAudio;->audioDetected:Z
- const-string v2, ")"
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
- invoke-static {v0, v1, v2}, Lf/e/b/a/a;->z(Ljava/lang/StringBuilder;ZLjava/lang/String;)Ljava/lang/String;
+ 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;
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 d019bc1136..7bc537f7c0 100644
--- a/com.discord/smali/co/discord/media_engine/internal/AssetManagement.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/AssetManagement.smali
@@ -199,6 +199,10 @@
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 be946739a7..4d1b5fcb10 100644
--- a/com.discord/smali/co/discord/media_engine/internal/OutboundAudio.smali
+++ b/com.discord/smali/co/discord/media_engine/internal/OutboundAudio.smali
@@ -24,8 +24,14 @@
.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
@@ -42,9 +48,11 @@
.field public final typingNoiseDetected:Z
+.field public final voiceActivityDetectorProcessTime:J
+
# direct methods
-.method public constructor (IILjava/lang/String;IFFFFIFFIIFFIIIZ)V
+.method public constructor (IILjava/lang/String;IFFFFIFFIIFFIIIZJJJJ)V
.locals 3
move-object v0, p0
@@ -129,6 +137,22 @@
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
@@ -141,12 +165,12 @@
throw v1
.end method
-.method public static synthetic copy$default(Lco/discord/media_engine/internal/OutboundAudio;IILjava/lang/String;IFFFFIFFIIFFIIIZILjava/lang/Object;)Lco/discord/media_engine/internal/OutboundAudio;
+.method public static synthetic copy$default(Lco/discord/media_engine/internal/OutboundAudio;IILjava/lang/String;IFFFFIFFIIFFIIIZJJJJILjava/lang/Object;)Lco/discord/media_engine/internal/OutboundAudio;
.locals 17
move-object/from16 v0, p0
- move/from16 v1, p20
+ move/from16 v1, p28
and-int/lit8 v2, v1, 0x1
@@ -380,18 +404,86 @@
:goto_11
const/high16 v16, 0x40000
- and-int v1, v1, v16
+ and-int v16, v1, v16
- if-eqz v1, :cond_12
+ move/from16 p18, v15
- iget-boolean v1, v0, Lco/discord/media_engine/internal/OutboundAudio;->typingNoiseDetected:Z
+ if-eqz v16, :cond_12
+
+ iget-boolean v15, v0, Lco/discord/media_engine/internal/OutboundAudio;->typingNoiseDetected:Z
goto :goto_12
:cond_12
- move/from16 v1, p19
+ move/from16 v15, 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
@@ -416,13 +508,9 @@
move/from16 p12, v13
- move/from16 p13, v14
+ move-wide/from16 p26, v14
- 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;
+ invoke-virtual/range {p0 .. p27}, Lco/discord/media_engine/internal/OutboundAudio;->copy(IILjava/lang/String;IFFFFIFFIIFFIIIZJJJJ)Lco/discord/media_engine/internal/OutboundAudio;
move-result-object v0
@@ -527,6 +615,38 @@
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
@@ -583,14 +703,14 @@
return v0
.end method
-.method public final copy(IILjava/lang/String;IFFFFIFFIIFFIIIZ)Lco/discord/media_engine/internal/OutboundAudio;
- .locals 21
+.method public final copy(IILjava/lang/String;IFFFFIFFIIFFIIIZJJJJ)Lco/discord/media_engine/internal/OutboundAudio;
+ .locals 29
if-eqz p3, :cond_0
- new-instance v20, Lco/discord/media_engine/internal/OutboundAudio;
+ new-instance v28, Lco/discord/media_engine/internal/OutboundAudio;
- move-object/from16 v0, v20
+ move-object/from16 v0, v28
move/from16 v1, p1
@@ -630,9 +750,17 @@
move/from16 v19, p19
- invoke-direct/range {v0 .. v19}, Lco/discord/media_engine/internal/OutboundAudio;->(IILjava/lang/String;IFFFFIFFIIFFIIIZ)V
+ move-wide/from16 v20, p20
- return-object v20
+ 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
:cond_0
const-string v0, "codecName"
@@ -645,17 +773,17 @@
.end method
.method public equals(Ljava/lang/Object;)Z
- .locals 4
+ .locals 7
const/4 v0, 0x1
- if-eq p0, p1, :cond_b
+ if-eq p0, p1, :cond_f
instance-of v1, p1, Lco/discord/media_engine/internal/OutboundAudio;
const/4 v2, 0x0
- if-eqz v1, :cond_a
+ if-eqz v1, :cond_e
check-cast p1, Lco/discord/media_engine/internal/OutboundAudio;
@@ -673,7 +801,7 @@
const/4 v1, 0x0
:goto_0
- if-eqz v1, :cond_a
+ if-eqz v1, :cond_e
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->bytesSent:I
@@ -689,7 +817,7 @@
const/4 v1, 0x0
:goto_1
- if-eqz v1, :cond_a
+ if-eqz v1, :cond_e
iget-object v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->codecName:Ljava/lang/String;
@@ -699,7 +827,7 @@
move-result v1
- if-eqz v1, :cond_a
+ if-eqz v1, :cond_e
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->codecPayloadType:I
@@ -715,7 +843,7 @@
const/4 v1, 0x0
:goto_2
- if-eqz v1, :cond_a
+ if-eqz v1, :cond_e
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->delayMedian:F
@@ -725,7 +853,7 @@
move-result v1
- if-nez v1, :cond_a
+ if-nez v1, :cond_e
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->delayStd:F
@@ -735,7 +863,7 @@
move-result v1
- if-nez v1, :cond_a
+ if-nez v1, :cond_e
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->echoReturnLoss:F
@@ -745,7 +873,7 @@
move-result v1
- if-nez v1, :cond_a
+ if-nez v1, :cond_e
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->echoReturnLossEnchancement:F
@@ -755,7 +883,7 @@
move-result v1
- if-nez v1, :cond_a
+ if-nez v1, :cond_e
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->extSeqNum:I
@@ -771,7 +899,7 @@
const/4 v1, 0x0
:goto_3
- if-eqz v1, :cond_a
+ if-eqz v1, :cond_e
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->fractionLost:F
@@ -781,7 +909,7 @@
move-result v1
- if-nez v1, :cond_a
+ if-nez v1, :cond_e
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->jitter:F
@@ -791,7 +919,7 @@
move-result v1
- if-nez v1, :cond_a
+ if-nez v1, :cond_e
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->packetsLost:I
@@ -807,7 +935,7 @@
const/4 v1, 0x0
:goto_4
- if-eqz v1, :cond_a
+ if-eqz v1, :cond_e
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->packetsSent:I
@@ -823,7 +951,7 @@
const/4 v1, 0x0
:goto_5
- if-eqz v1, :cond_a
+ if-eqz v1, :cond_e
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->residualEchoLikelihood:F
@@ -833,7 +961,7 @@
move-result v1
- if-nez v1, :cond_a
+ if-nez v1, :cond_e
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->residualEchoLikelihoodRecentMax:F
@@ -843,7 +971,7 @@
move-result v1
- if-nez v1, :cond_a
+ if-nez v1, :cond_e
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->rtt:I
@@ -859,7 +987,7 @@
const/4 v1, 0x0
:goto_6
- if-eqz v1, :cond_a
+ if-eqz v1, :cond_e
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->speaking:I
@@ -875,7 +1003,7 @@
const/4 v1, 0x0
:goto_7
- if-eqz v1, :cond_a
+ if-eqz v1, :cond_e
iget v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->ssrc:I
@@ -891,31 +1019,103 @@
const/4 v1, 0x0
:goto_8
- if-eqz v1, :cond_a
+ if-eqz v1, :cond_e
iget-boolean v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->typingNoiseDetected:Z
- iget-boolean p1, p1, Lco/discord/media_engine/internal/OutboundAudio;->typingNoiseDetected:Z
+ iget-boolean v3, p1, Lco/discord/media_engine/internal/OutboundAudio;->typingNoiseDetected:Z
- if-ne v1, p1, :cond_9
+ if-ne v1, v3, :cond_9
- const/4 p1, 0x1
+ const/4 v1, 0x1
goto :goto_9
:cond_9
- const/4 p1, 0x0
+ const/4 v1, 0x0
:goto_9
- if-eqz p1, :cond_a
+ 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
goto :goto_a
:cond_a
- return v2
+ 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
- :goto_a
+ 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
return v0
.end method
@@ -999,6 +1199,22 @@
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
@@ -1007,6 +1223,14 @@
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
@@ -1071,8 +1295,16 @@
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 3
+ .locals 4
iget v0, p0, Lco/discord/media_engine/internal/OutboundAudio;->audioLevel:I
@@ -1203,11 +1435,51 @@
: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 3
+ .locals 4
const-string v0, "OutboundAudio(audioLevel="
@@ -1361,9 +1633,41 @@
iget-boolean v1, p0, Lco/discord/media_engine/internal/OutboundAudio;->typingNoiseDetected:Z
- const-string v2, ")"
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
- invoke-static {v0, v1, v2}, Lf/e/b/a/a;->z(Ljava/lang/StringBuilder;ZLjava/lang/String;)Ljava/lang/String;
+ 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;
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 2c2a6d8bbc..4c26657dd6 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 v21, Lco/discord/media_engine/OutboundRtpAudio;
+ new-instance v29, 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 v2
+ move-result v10
- if-lez v2, :cond_0
+ if-lez v10, :cond_0
const/16 v20, 0x1
@@ -371,15 +371,31 @@
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, v21
+ move-object/from16 v10, v29
move-wide v14, v8
- invoke-direct/range {v10 .. v20}, Lco/discord/media_engine/OutboundRtpAudio;->(Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFFZ)V
+ invoke-direct/range {v10 .. v28}, Lco/discord/media_engine/OutboundRtpAudio;->(Ljava/lang/String;ILco/discord/media_engine/StatsCodec;JIIFFZJJJJ)V
- move-object/from16 v12, v21
+ move-object/from16 v12, v29
goto :goto_1
diff --git a/com.discord/smali/com/airbnb/lottie/LottieAnimationView.smali b/com.discord/smali/com/airbnb/lottie/LottieAnimationView.smali
index 8375165f7b..95e31e0377 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;->W(Ljava/io/InputStream;)Lo0/w;
+ invoke-static {v0}, Lf/n/a/k/a;->X(Ljava/io/InputStream;)Lo0/w;
move-result-object p1
- invoke-static {p1}, Lf/n/a/k/a;->o(Lo0/w;)Lo0/g;
+ invoke-static {p1}, Lf/n/a/k/a;->p(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 2d38543001..8cad3bf7e9 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/1225"
+.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1235"
-.field public static final VERSION_CODE:I = 0x4c9
+.field public static final VERSION_CODE:I = 0x4d3
-.field public static final VERSION_NAME:Ljava/lang/String; = "34.7"
+.field public static final VERSION_NAME:Ljava/lang/String; = "35.0"
# direct methods
diff --git a/com.discord/smali/com/discord/app/App.smali b/com.discord/smali/com/discord/app/App.smali
index bcb137f42a..4a2d0db006 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 11
+ .locals 12
invoke-super {p0}, Landroid/app/Application;->onCreate()V
@@ -146,7 +146,9 @@
:try_start_0
const-string v2, "logger"
- if-eqz v9, :cond_3
+ const/4 v10, 0x0
+
+ if-eqz v9, :cond_5
sget-boolean v2, Lf/a/b/s0;->c:Z
:try_end_0
@@ -164,16 +166,16 @@
invoke-interface {v2}, Ljava/util/List;->iterator()Ljava/util/Iterator;
- move-result-object v10
+ move-result-object v11
:goto_0
- invoke-interface {v10}, Ljava/util/Iterator;->hasNext()Z
+ invoke-interface {v11}, Ljava/util/Iterator;->hasNext()Z
move-result v2
if-eqz v2, :cond_1
- invoke-interface {v10}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+ invoke-interface {v11}, Ljava/util/Iterator;->next()Ljava/lang/Object;
move-result-object v2
@@ -301,17 +303,37 @@
invoke-static {v0}, Lcom/discord/app/AppLog;->i(Ljava/lang/String;)V
- return-void
+ 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
: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
- const/4 v0, 0x0
-
- throw v0
+ throw v10
: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 6a28eba99b..1c552da6a3 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, 0x7f0a0283
+ const v2, 0x7f0a0288
invoke-virtual {v1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -92,7 +92,7 @@
move-result-object v1
- const v2, 0x7f0a02bd
+ const v2, 0x7f0a02c2
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 d9136afa7c..60b3f3a043 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, 0x7f12167a
+ const v2, 0x7f121692
const/4 v3, 0x1
diff --git a/com.discord/smali/com/discord/app/AppFragment.smali b/com.discord/smali/com/discord/app/AppFragment.smali
index 17f5d3aac1..b7240c8736 100644
--- a/com.discord/smali/com/discord/app/AppFragment.smali
+++ b/com.discord/smali/com/discord/app/AppFragment.smali
@@ -1263,6 +1263,37 @@
throw v0
.end method
+.method public final setActionBarTitleColor(I)Lkotlin/Unit;
+ .locals 2
+ .param p1 # I
+ .annotation build Landroidx/annotation/ColorInt;
+ .end annotation
+ .end param
+
+ invoke-virtual {p0}, Lcom/discord/app/AppFragment;->getAppActivity()Lcom/discord/app/AppActivity;
+
+ move-result-object v0
+
+ const/4 v1, 0x0
+
+ if-eqz v0, :cond_0
+
+ invoke-virtual {v0}, Lcom/discord/app/AppActivity;->g()Lcom/discord/views/ToolbarTitleLayout;
+
+ move-result-object v0
+
+ if-eqz v0, :cond_0
+
+ invoke-virtual {v0, p1}, Lcom/discord/views/ToolbarTitleLayout;->setTitleColor(I)V
+
+ sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+ move-object v1, p1
+
+ :cond_0
+ return-object v1
+.end method
+
.method public final setActionBarTitleLayoutExpandedTappableArea()Lkotlin/Unit;
.locals 3
diff --git a/com.discord/smali/com/discord/app/AppLog$b.smali b/com.discord/smali/com/discord/app/AppLog$b.smali
index 4c592d93a8..f06aef936f 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 6
+ .locals 10
- if-eqz p1, :cond_3
+ if-eqz p1, :cond_4
:try_start_0
iget-object v0, p0, Lcom/discord/app/AppLog$b;->$throwable:Ljava/lang/Throwable;
@@ -227,9 +227,87 @@
invoke-virtual {v0, v1, p1}, Lcom/discord/app/AppLog;->w(Ljava/lang/String;Ljava/lang/Throwable;)V
:goto_1
- return-void
+ 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
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 2db254280b..9ea9f39553 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, 0x7f121100
+ const p1, 0x7f121112
new-instance v0, Lf/a/b/i;
@@ -265,7 +265,7 @@
goto :goto_0
:cond_1
- const p1, 0x7f121107
+ const p1, 0x7f121119
new-instance v0, Lf/a/b/i;
@@ -274,7 +274,7 @@
goto :goto_0
:cond_2
- const p1, 0x7f121101
+ const p1, 0x7f121113
new-instance v0, Lf/a/b/i;
@@ -283,7 +283,7 @@
goto :goto_0
:cond_3
- const p1, 0x7f121102
+ const p1, 0x7f121114
new-instance v0, Lf/a/b/i;
@@ -292,7 +292,7 @@
goto :goto_0
:cond_4
- const p1, 0x7f120f5b
+ const p1, 0x7f120f6d
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 3078d59238..cbd0f87a35 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, 0x7f12049b
+ const v1, 0x7f12049e
invoke-virtual {p0, v1}, Landroid/app/Service;->getString(I)Ljava/lang/String;
@@ -129,7 +129,7 @@
move-result-object v0
- const v1, 0x7f1204a2
+ const v1, 0x7f1204a5
invoke-virtual {p0, v1}, Landroid/app/Service;->getString(I)Ljava/lang/String;
@@ -301,7 +301,7 @@
if-eqz v6, :cond_3
- const v2, 0x7f12108e
+ const v2, 0x7f1210a0
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, 0x7f121102
+ const v2, 0x7f121114
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 29d30570f5..55e71368d0 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, 0x7f0a0627
+ const v0, 0x7f0a062f
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, 0x7f0a0622
+ const v0, 0x7f0a062a
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, 0x7f0a0621
+ const v0, 0x7f0a0629
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, 0x7f0a0625
+ const v0, 0x7f0a062d
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 aa9bb514a5..0f2df27d00 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 = 0x6
+.field public static final GATEWAY_VERSION:I = 0x8
.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 6."
+ const-string v4, ", encoding: json, version 8."
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=6&compress=zlib-stream"
+ const-string p1, "/?encoding=json&v=8&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 e2123cd27f..b415fe3ecd 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 = 0x7f0801f9
+.field public static final googleg_disabled_color_18:I = 0x7f0801f8
-.field public static final googleg_standard_color_18:I = 0x7f0801fa
+.field public static final googleg_standard_color_18:I = 0x7f0801f9
.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 82fadf3973..2919d490c8 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 = 0x7f0a025a
+.field public static final checkbox:I = 0x7f0a025f
-.field public static final checked:I = 0x7f0a025c
+.field public static final checked:I = 0x7f0a0261
-.field public static final chip:I = 0x7f0a025d
+.field public static final chip:I = 0x7f0a0262
-.field public static final chip1:I = 0x7f0a025e
+.field public static final chip1:I = 0x7f0a0263
-.field public static final chip2:I = 0x7f0a025f
+.field public static final chip2:I = 0x7f0a0264
-.field public static final chip3:I = 0x7f0a0260
+.field public static final chip3:I = 0x7f0a0265
-.field public static final chip_group:I = 0x7f0a0261
+.field public static final chip_group:I = 0x7f0a0266
-.field public static final chip_image:I = 0x7f0a0262
+.field public static final chip_image:I = 0x7f0a0267
-.field public static final chip_text:I = 0x7f0a0263
+.field public static final chip_text:I = 0x7f0a0268
-.field public static final chronometer:I = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final circular:I = 0x7f0a0266
+.field public static final circular:I = 0x7f0a026b
-.field public static final clear_text:I = 0x7f0a0267
+.field public static final clear_text:I = 0x7f0a026c
-.field public static final column:I = 0x7f0a0270
+.field public static final column:I = 0x7f0a0275
-.field public static final column_reverse:I = 0x7f0a0271
+.field public static final column_reverse:I = 0x7f0a0276
-.field public static final confirm_button:I = 0x7f0a0272
+.field public static final confirm_button:I = 0x7f0a0277
-.field public static final container:I = 0x7f0a0283
+.field public static final container:I = 0x7f0a0288
-.field public static final content:I = 0x7f0a0284
+.field public static final content:I = 0x7f0a0289
-.field public static final contentPanel:I = 0x7f0a0285
+.field public static final contentPanel:I = 0x7f0a028a
-.field public static final coordinator:I = 0x7f0a0289
+.field public static final coordinator:I = 0x7f0a028e
-.field public static final custom:I = 0x7f0a02af
+.field public static final custom:I = 0x7f0a02b4
-.field public static final customPanel:I = 0x7f0a02b0
+.field public static final customPanel:I = 0x7f0a02b5
-.field public static final cut:I = 0x7f0a02b1
+.field public static final cut:I = 0x7f0a02b6
-.field public static final dark:I = 0x7f0a02b2
+.field public static final dark:I = 0x7f0a02b7
-.field public static final date_picker_actions:I = 0x7f0a02b4
+.field public static final date_picker_actions:I = 0x7f0a02b9
-.field public static final decor_content_parent:I = 0x7f0a02b8
+.field public static final decor_content_parent:I = 0x7f0a02bd
-.field public static final default_activity_button:I = 0x7f0a02b9
+.field public static final default_activity_button:I = 0x7f0a02be
-.field public static final design_bottom_sheet:I = 0x7f0a02bd
+.field public static final design_bottom_sheet:I = 0x7f0a02c2
-.field public static final design_menu_item_action_area:I = 0x7f0a02be
+.field public static final design_menu_item_action_area:I = 0x7f0a02c3
-.field public static final design_menu_item_action_area_stub:I = 0x7f0a02bf
+.field public static final design_menu_item_action_area_stub:I = 0x7f0a02c4
-.field public static final design_menu_item_text:I = 0x7f0a02c0
+.field public static final design_menu_item_text:I = 0x7f0a02c5
-.field public static final design_navigation_view:I = 0x7f0a02c1
+.field public static final design_navigation_view:I = 0x7f0a02c6
-.field public static final dialog_button:I = 0x7f0a02c7
+.field public static final dialog_button:I = 0x7f0a02cc
-.field public static final dropdown_menu:I = 0x7f0a02f2
+.field public static final dropdown_menu:I = 0x7f0a02f8
-.field public static final edit_query:I = 0x7f0a0317
+.field public static final edit_query:I = 0x7f0a031d
-.field public static final end:I = 0x7f0a0344
+.field public static final end:I = 0x7f0a034a
-.field public static final end_padder:I = 0x7f0a0345
+.field public static final end_padder:I = 0x7f0a034b
-.field public static final expand_activities_button:I = 0x7f0a0361
+.field public static final expand_activities_button:I = 0x7f0a0367
-.field public static final expanded_menu:I = 0x7f0a0362
+.field public static final expanded_menu:I = 0x7f0a0368
-.field public static final fade:I = 0x7f0a0380
+.field public static final fade:I = 0x7f0a0386
-.field public static final fill:I = 0x7f0a0395
+.field public static final fill:I = 0x7f0a039d
-.field public static final filled:I = 0x7f0a0398
+.field public static final filled:I = 0x7f0a03a0
-.field public static final fitBottomStart:I = 0x7f0a039c
+.field public static final fitBottomStart:I = 0x7f0a03a4
-.field public static final fitCenter:I = 0x7f0a039d
+.field public static final fitCenter:I = 0x7f0a03a5
-.field public static final fitEnd:I = 0x7f0a039e
+.field public static final fitEnd:I = 0x7f0a03a6
-.field public static final fitStart:I = 0x7f0a039f
+.field public static final fitStart:I = 0x7f0a03a7
-.field public static final fitXY:I = 0x7f0a03a1
+.field public static final fitXY:I = 0x7f0a03a9
-.field public static final fixed:I = 0x7f0a03a2
+.field public static final fixed:I = 0x7f0a03aa
-.field public static final flex_end:I = 0x7f0a03a5
+.field public static final flex_end:I = 0x7f0a03ad
-.field public static final flex_start:I = 0x7f0a03b6
+.field public static final flex_start:I = 0x7f0a03be
-.field public static final floating:I = 0x7f0a03b7
+.field public static final floating:I = 0x7f0a03bf
-.field public static final focusCrop:I = 0x7f0a03b9
+.field public static final focusCrop:I = 0x7f0a03c1
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final fragment_container_view_tag:I = 0x7f0a03bf
+.field public static final fragment_container_view_tag:I = 0x7f0a03c7
-.field public static final ghost_view:I = 0x7f0a03da
+.field public static final ghost_view:I = 0x7f0a03e2
-.field public static final ghost_view_holder:I = 0x7f0a03db
+.field public static final ghost_view_holder:I = 0x7f0a03e3
-.field public static final gone:I = 0x7f0a0407
+.field public static final gone:I = 0x7f0a040f
-.field public static final group_divider:I = 0x7f0a0409
+.field public static final group_divider:I = 0x7f0a0411
-.field public static final home:I = 0x7f0a04b8
+.field public static final home:I = 0x7f0a04c0
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_frame:I = 0x7f0a04cb
+.field public static final icon_frame:I = 0x7f0a04d3
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final icon_only:I = 0x7f0a04cd
+.field public static final icon_only:I = 0x7f0a04d5
-.field public static final image:I = 0x7f0a04d6
+.field public static final image:I = 0x7f0a04de
-.field public static final incoming:I = 0x7f0a04de
+.field public static final incoming:I = 0x7f0a04e6
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0565
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a056d
-.field public static final labeled:I = 0x7f0a056d
+.field public static final labeled:I = 0x7f0a0575
-.field public static final largeLabel:I = 0x7f0a056f
+.field public static final largeLabel:I = 0x7f0a0577
-.field public static final left:I = 0x7f0a057a
+.field public static final left:I = 0x7f0a0582
-.field public static final light:I = 0x7f0a057b
+.field public static final light:I = 0x7f0a0583
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final linear:I = 0x7f0a057e
+.field public static final linear:I = 0x7f0a0586
-.field public static final listMode:I = 0x7f0a0580
+.field public static final listMode:I = 0x7f0a0588
-.field public static final list_item:I = 0x7f0a0581
+.field public static final list_item:I = 0x7f0a0589
-.field public static final masked:I = 0x7f0a0591
+.field public static final masked:I = 0x7f0a0599
-.field public static final media_actions:I = 0x7f0a0597
+.field public static final media_actions:I = 0x7f0a059f
-.field public static final message:I = 0x7f0a05d4
+.field public static final message:I = 0x7f0a05dc
-.field public static final mini:I = 0x7f0a05d9
+.field public static final mini:I = 0x7f0a05e1
-.field public static final month_grid:I = 0x7f0a05db
+.field public static final month_grid:I = 0x7f0a05e3
-.field public static final month_navigation_bar:I = 0x7f0a05dc
+.field public static final month_navigation_bar:I = 0x7f0a05e4
-.field public static final month_navigation_fragment_toggle:I = 0x7f0a05dd
+.field public static final month_navigation_fragment_toggle:I = 0x7f0a05e5
-.field public static final month_navigation_next:I = 0x7f0a05de
+.field public static final month_navigation_next:I = 0x7f0a05e6
-.field public static final month_navigation_previous:I = 0x7f0a05df
+.field public static final month_navigation_previous:I = 0x7f0a05e7
-.field public static final month_title:I = 0x7f0a05e0
+.field public static final month_title:I = 0x7f0a05e8
-.field public static final mtrl_calendar_day_selector_frame:I = 0x7f0a05e1
+.field public static final mtrl_calendar_day_selector_frame:I = 0x7f0a05e9
-.field public static final mtrl_calendar_days_of_week:I = 0x7f0a05e2
+.field public static final mtrl_calendar_days_of_week:I = 0x7f0a05ea
-.field public static final mtrl_calendar_frame:I = 0x7f0a05e3
+.field public static final mtrl_calendar_frame:I = 0x7f0a05eb
-.field public static final mtrl_calendar_main_pane:I = 0x7f0a05e4
+.field public static final mtrl_calendar_main_pane:I = 0x7f0a05ec
-.field public static final mtrl_calendar_months:I = 0x7f0a05e5
+.field public static final mtrl_calendar_months:I = 0x7f0a05ed
-.field public static final mtrl_calendar_selection_frame:I = 0x7f0a05e6
+.field public static final mtrl_calendar_selection_frame:I = 0x7f0a05ee
-.field public static final mtrl_calendar_text_input_frame:I = 0x7f0a05e7
+.field public static final mtrl_calendar_text_input_frame:I = 0x7f0a05ef
-.field public static final mtrl_calendar_year_selector_frame:I = 0x7f0a05e8
+.field public static final mtrl_calendar_year_selector_frame:I = 0x7f0a05f0
-.field public static final mtrl_card_checked_layer_id:I = 0x7f0a05e9
+.field public static final mtrl_card_checked_layer_id:I = 0x7f0a05f1
-.field public static final mtrl_child_content_container:I = 0x7f0a05ea
+.field public static final mtrl_child_content_container:I = 0x7f0a05f2
-.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a05eb
+.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a05f3
-.field public static final mtrl_motion_snapshot_view:I = 0x7f0a05ec
+.field public static final mtrl_motion_snapshot_view:I = 0x7f0a05f4
-.field public static final mtrl_picker_fullscreen:I = 0x7f0a05ed
+.field public static final mtrl_picker_fullscreen:I = 0x7f0a05f5
-.field public static final mtrl_picker_header:I = 0x7f0a05ee
+.field public static final mtrl_picker_header:I = 0x7f0a05f6
-.field public static final mtrl_picker_header_selection_text:I = 0x7f0a05ef
+.field public static final mtrl_picker_header_selection_text:I = 0x7f0a05f7
-.field public static final mtrl_picker_header_title_and_selection:I = 0x7f0a05f0
+.field public static final mtrl_picker_header_title_and_selection:I = 0x7f0a05f8
-.field public static final mtrl_picker_header_toggle:I = 0x7f0a05f1
+.field public static final mtrl_picker_header_toggle:I = 0x7f0a05f9
-.field public static final mtrl_picker_text_input_date:I = 0x7f0a05f2
+.field public static final mtrl_picker_text_input_date:I = 0x7f0a05fa
-.field public static final mtrl_picker_text_input_range_end:I = 0x7f0a05f3
+.field public static final mtrl_picker_text_input_range_end:I = 0x7f0a05fb
-.field public static final mtrl_picker_text_input_range_start:I = 0x7f0a05f4
+.field public static final mtrl_picker_text_input_range_start:I = 0x7f0a05fc
-.field public static final mtrl_picker_title_text:I = 0x7f0a05f5
+.field public static final mtrl_picker_title_text:I = 0x7f0a05fd
-.field public static final multiply:I = 0x7f0a05f6
+.field public static final multiply:I = 0x7f0a05fe
-.field public static final navigation_header_container:I = 0x7f0a0608
+.field public static final navigation_header_container:I = 0x7f0a0610
-.field public static final none:I = 0x7f0a061d
+.field public static final none:I = 0x7f0a0625
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final nowrap:I = 0x7f0a062e
+.field public static final nowrap:I = 0x7f0a0636
-.field public static final off:I = 0x7f0a065e
+.field public static final off:I = 0x7f0a0666
-.field public static final on:I = 0x7f0a0662
+.field public static final on:I = 0x7f0a066a
-.field public static final outgoing:I = 0x7f0a0664
+.field public static final outgoing:I = 0x7f0a066c
-.field public static final outline:I = 0x7f0a0665
+.field public static final outline:I = 0x7f0a066d
-.field public static final parallax:I = 0x7f0a0675
+.field public static final parallax:I = 0x7f0a067d
-.field public static final parentPanel:I = 0x7f0a0677
+.field public static final parentPanel:I = 0x7f0a067f
-.field public static final parent_matrix:I = 0x7f0a0678
+.field public static final parent_matrix:I = 0x7f0a0680
-.field public static final password_toggle:I = 0x7f0a0686
+.field public static final password_toggle:I = 0x7f0a068e
-.field public static final pin:I = 0x7f0a06b3
+.field public static final pin:I = 0x7f0a06bb
-.field public static final progress_circular:I = 0x7f0a0722
+.field public static final progress_circular:I = 0x7f0a072a
-.field public static final progress_horizontal:I = 0x7f0a0725
+.field public static final progress_horizontal:I = 0x7f0a072d
-.field public static final radio:I = 0x7f0a0733
+.field public static final radio:I = 0x7f0a073b
-.field public static final recycler_view:I = 0x7f0a0739
+.field public static final recycler_view:I = 0x7f0a0741
-.field public static final right:I = 0x7f0a0755
+.field public static final right:I = 0x7f0a075d
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final rounded:I = 0x7f0a077f
+.field public static final rounded:I = 0x7f0a0787
-.field public static final row:I = 0x7f0a0780
+.field public static final row:I = 0x7f0a0788
-.field public static final row_index_key:I = 0x7f0a0781
+.field public static final row_index_key:I = 0x7f0a0789
-.field public static final row_reverse:I = 0x7f0a0782
+.field public static final row_reverse:I = 0x7f0a078a
-.field public static final save_non_transition_alpha:I = 0x7f0a0783
+.field public static final save_non_transition_alpha:I = 0x7f0a078b
-.field public static final save_overlay_view:I = 0x7f0a0784
+.field public static final save_overlay_view:I = 0x7f0a078c
-.field public static final scale:I = 0x7f0a0785
+.field public static final scale:I = 0x7f0a078d
-.field public static final screen:I = 0x7f0a0787
+.field public static final screen:I = 0x7f0a078f
-.field public static final scrollIndicatorDown:I = 0x7f0a078b
+.field public static final scrollIndicatorDown:I = 0x7f0a0793
-.field public static final scrollIndicatorUp:I = 0x7f0a078c
+.field public static final scrollIndicatorUp:I = 0x7f0a0794
-.field public static final scrollView:I = 0x7f0a078d
+.field public static final scrollView:I = 0x7f0a0795
-.field public static final scrollable:I = 0x7f0a078f
+.field public static final scrollable:I = 0x7f0a0797
-.field public static final search_badge:I = 0x7f0a0790
+.field public static final search_badge:I = 0x7f0a0798
-.field public static final search_bar:I = 0x7f0a0791
+.field public static final search_bar:I = 0x7f0a0799
-.field public static final search_button:I = 0x7f0a0792
+.field public static final search_button:I = 0x7f0a079a
-.field public static final search_close_btn:I = 0x7f0a0793
+.field public static final search_close_btn:I = 0x7f0a079b
-.field public static final search_edit_frame:I = 0x7f0a0794
+.field public static final search_edit_frame:I = 0x7f0a079c
-.field public static final search_go_btn:I = 0x7f0a0796
+.field public static final search_go_btn:I = 0x7f0a079e
-.field public static final search_mag_icon:I = 0x7f0a0797
+.field public static final search_mag_icon:I = 0x7f0a079f
-.field public static final search_plate:I = 0x7f0a0798
+.field public static final search_plate:I = 0x7f0a07a0
-.field public static final search_src_text:I = 0x7f0a079b
+.field public static final search_src_text:I = 0x7f0a07a3
-.field public static final search_voice_btn:I = 0x7f0a07a7
+.field public static final search_voice_btn:I = 0x7f0a07af
-.field public static final seekbar:I = 0x7f0a07a8
+.field public static final seekbar:I = 0x7f0a07b0
-.field public static final seekbar_value:I = 0x7f0a07a9
+.field public static final seekbar_value:I = 0x7f0a07b1
-.field public static final select_dialog_listview:I = 0x7f0a07aa
+.field public static final select_dialog_listview:I = 0x7f0a07b2
-.field public static final selected:I = 0x7f0a07ab
+.field public static final selected:I = 0x7f0a07b3
-.field public static final shortcut:I = 0x7f0a0906
+.field public static final shortcut:I = 0x7f0a090e
-.field public static final slide:I = 0x7f0a090b
+.field public static final slide:I = 0x7f0a0913
-.field public static final smallLabel:I = 0x7f0a090c
+.field public static final smallLabel:I = 0x7f0a0914
-.field public static final snackbar_action:I = 0x7f0a090d
+.field public static final snackbar_action:I = 0x7f0a0915
-.field public static final snackbar_text:I = 0x7f0a090e
+.field public static final snackbar_text:I = 0x7f0a0916
-.field public static final space_around:I = 0x7f0a0912
+.field public static final space_around:I = 0x7f0a091a
-.field public static final space_between:I = 0x7f0a0913
+.field public static final space_between:I = 0x7f0a091b
-.field public static final space_evenly:I = 0x7f0a0914
+.field public static final space_evenly:I = 0x7f0a091c
-.field public static final spacer:I = 0x7f0a0915
+.field public static final spacer:I = 0x7f0a091d
-.field public static final spinner:I = 0x7f0a0918
+.field public static final spinner:I = 0x7f0a0920
-.field public static final split_action_bar:I = 0x7f0a0919
+.field public static final split_action_bar:I = 0x7f0a0921
-.field public static final src_atop:I = 0x7f0a091d
+.field public static final src_atop:I = 0x7f0a0925
-.field public static final src_in:I = 0x7f0a091e
+.field public static final src_in:I = 0x7f0a0926
-.field public static final src_over:I = 0x7f0a091f
+.field public static final src_over:I = 0x7f0a0927
-.field public static final standard:I = 0x7f0a0921
+.field public static final standard:I = 0x7f0a0929
-.field public static final start:I = 0x7f0a0922
+.field public static final start:I = 0x7f0a092a
-.field public static final status_bar_latest_event_content:I = 0x7f0a0926
+.field public static final status_bar_latest_event_content:I = 0x7f0a092e
-.field public static final stretch:I = 0x7f0a093b
+.field public static final stretch:I = 0x7f0a0943
-.field public static final submenuarrow:I = 0x7f0a093c
+.field public static final submenuarrow:I = 0x7f0a0944
-.field public static final submit_area:I = 0x7f0a093d
+.field public static final submit_area:I = 0x7f0a0945
-.field public static final switchWidget:I = 0x7f0a094a
+.field public static final switchWidget:I = 0x7f0a0953
-.field public static final tabMode:I = 0x7f0a094c
+.field public static final tabMode:I = 0x7f0a0955
-.field public static final tag_accessibility_actions:I = 0x7f0a095a
+.field public static final tag_accessibility_actions:I = 0x7f0a0963
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
-.field public static final tag_accessibility_heading:I = 0x7f0a095c
+.field public static final tag_accessibility_heading:I = 0x7f0a0965
-.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
-.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final test_checkbox_android_button_tint:I = 0x7f0a0968
+.field public static final test_checkbox_android_button_tint:I = 0x7f0a0971
-.field public static final test_checkbox_app_button_tint:I = 0x7f0a0969
+.field public static final test_checkbox_app_button_tint:I = 0x7f0a0972
-.field public static final test_radiobutton_android_button_tint:I = 0x7f0a096a
+.field public static final test_radiobutton_android_button_tint:I = 0x7f0a0973
-.field public static final test_radiobutton_app_button_tint:I = 0x7f0a096b
+.field public static final test_radiobutton_app_button_tint:I = 0x7f0a0974
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final textSpacerNoButtons:I = 0x7f0a0970
+.field public static final textSpacerNoButtons:I = 0x7f0a0979
-.field public static final textSpacerNoTitle:I = 0x7f0a0971
+.field public static final textSpacerNoTitle:I = 0x7f0a097a
-.field public static final text_input_end_icon:I = 0x7f0a0973
+.field public static final text_input_end_icon:I = 0x7f0a097c
-.field public static final text_input_start_icon:I = 0x7f0a0974
+.field public static final text_input_start_icon:I = 0x7f0a097d
-.field public static final textinput_counter:I = 0x7f0a0977
+.field public static final textinput_counter:I = 0x7f0a0980
-.field public static final textinput_error:I = 0x7f0a0978
+.field public static final textinput_error:I = 0x7f0a0981
-.field public static final textinput_helper_text:I = 0x7f0a0979
+.field public static final textinput_helper_text:I = 0x7f0a0982
-.field public static final textinput_placeholder:I = 0x7f0a097a
+.field public static final textinput_placeholder:I = 0x7f0a0983
-.field public static final textinput_prefix_text:I = 0x7f0a097b
+.field public static final textinput_prefix_text:I = 0x7f0a0984
-.field public static final textinput_suffix_text:I = 0x7f0a097c
+.field public static final textinput_suffix_text:I = 0x7f0a0985
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
-.field public static final titleDividerNoCustom:I = 0x7f0a0984
+.field public static final titleDividerNoCustom:I = 0x7f0a098d
-.field public static final title_template:I = 0x7f0a0985
+.field public static final title_template:I = 0x7f0a098e
-.field public static final top:I = 0x7f0a098a
+.field public static final top:I = 0x7f0a0994
-.field public static final topPanel:I = 0x7f0a098b
+.field public static final topPanel:I = 0x7f0a0995
-.field public static final touch_outside:I = 0x7f0a098d
+.field public static final touch_outside:I = 0x7f0a0997
-.field public static final transition_current_scene:I = 0x7f0a098e
+.field public static final transition_current_scene:I = 0x7f0a0998
-.field public static final transition_layout_save:I = 0x7f0a098f
+.field public static final transition_layout_save:I = 0x7f0a0999
-.field public static final transition_position:I = 0x7f0a0990
+.field public static final transition_position:I = 0x7f0a099a
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a0991
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a099b
-.field public static final transition_transform:I = 0x7f0a0992
+.field public static final transition_transform:I = 0x7f0a099c
-.field public static final unchecked:I = 0x7f0a09a1
+.field public static final unchecked:I = 0x7f0a09ab
-.field public static final uniform:I = 0x7f0a09a4
+.field public static final uniform:I = 0x7f0a09ae
-.field public static final unlabeled:I = 0x7f0a09a5
+.field public static final unlabeled:I = 0x7f0a09af
-.field public static final up:I = 0x7f0a09a6
+.field public static final up:I = 0x7f0a09b0
-.field public static final view_offset_helper:I = 0x7f0a0a29
+.field public static final view_offset_helper:I = 0x7f0a0a33
-.field public static final visible:I = 0x7f0a0a3d
+.field public static final visible:I = 0x7f0a0a47
-.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a3e
+.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a48
-.field public static final wide:I = 0x7f0a0a6c
+.field public static final wide:I = 0x7f0a0a76
-.field public static final withinBounds:I = 0x7f0a0aa3
+.field public static final withinBounds:I = 0x7f0a0aad
-.field public static final wrap:I = 0x7f0a0aa4
+.field public static final wrap:I = 0x7f0a0aae
-.field public static final wrap_content:I = 0x7f0a0aa5
+.field public static final wrap_content:I = 0x7f0a0aaf
-.field public static final wrap_reverse:I = 0x7f0a0aa6
+.field public static final wrap_reverse:I = 0x7f0a0ab0
-.field public static final zero_corner_chip:I = 0x7f0a0aab
+.field public static final zero_corner_chip:I = 0x7f0a0ab5
# 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 d8a988a030..1c8633468d 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 = 0x7f0d0102
+.field public static final view_chip_default:I = 0x7f0d0104
# 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 b3afb83dea..c5b5bd7808 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 = 0x7f1000b2
+.field public static final mtrl_badge_content_description:I = 0x7f1000b3
# 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 790e412a79..4c086e136a 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 = 0x7f120417
+.field public static final character_counter_content_description:I = 0x7f12041a
-.field public static final character_counter_overflowed_content_description:I = 0x7f120418
+.field public static final character_counter_overflowed_content_description:I = 0x7f12041b
-.field public static final character_counter_pattern:I = 0x7f120419
+.field public static final character_counter_pattern:I = 0x7f12041c
-.field public static final chip_text:I = 0x7f120423
+.field public static final chip_text:I = 0x7f120426
-.field public static final clear_text_end_icon_content_description:I = 0x7f120430
+.field public static final clear_text_end_icon_content_description:I = 0x7f120433
-.field public static final common_google_play_services_enable_button:I = 0x7f12045f
+.field public static final common_google_play_services_enable_button:I = 0x7f120462
-.field public static final common_google_play_services_enable_text:I = 0x7f120460
+.field public static final common_google_play_services_enable_text:I = 0x7f120463
-.field public static final common_google_play_services_enable_title:I = 0x7f120461
+.field public static final common_google_play_services_enable_title:I = 0x7f120464
-.field public static final common_google_play_services_install_button:I = 0x7f120462
+.field public static final common_google_play_services_install_button:I = 0x7f120465
-.field public static final common_google_play_services_install_text:I = 0x7f120463
+.field public static final common_google_play_services_install_text:I = 0x7f120466
-.field public static final common_google_play_services_install_title:I = 0x7f120464
+.field public static final common_google_play_services_install_title:I = 0x7f120467
-.field public static final common_google_play_services_notification_channel_name:I = 0x7f120465
+.field public static final common_google_play_services_notification_channel_name:I = 0x7f120468
-.field public static final common_google_play_services_notification_ticker:I = 0x7f120466
+.field public static final common_google_play_services_notification_ticker:I = 0x7f120469
-.field public static final common_google_play_services_unknown_issue:I = 0x7f120467
+.field public static final common_google_play_services_unknown_issue:I = 0x7f12046a
-.field public static final common_google_play_services_unsupported_text:I = 0x7f120468
+.field public static final common_google_play_services_unsupported_text:I = 0x7f12046b
-.field public static final common_google_play_services_update_button:I = 0x7f120469
+.field public static final common_google_play_services_update_button:I = 0x7f12046c
-.field public static final common_google_play_services_update_text:I = 0x7f12046a
+.field public static final common_google_play_services_update_text:I = 0x7f12046d
-.field public static final common_google_play_services_update_title:I = 0x7f12046b
+.field public static final common_google_play_services_update_title:I = 0x7f12046e
-.field public static final common_google_play_services_updating_text:I = 0x7f12046c
+.field public static final common_google_play_services_updating_text:I = 0x7f12046f
-.field public static final common_google_play_services_wear_update_text:I = 0x7f12046d
+.field public static final common_google_play_services_wear_update_text:I = 0x7f120470
-.field public static final common_open_on_phone:I = 0x7f12046e
+.field public static final common_open_on_phone:I = 0x7f120471
-.field public static final common_signin_button_text:I = 0x7f12046f
+.field public static final common_signin_button_text:I = 0x7f120472
-.field public static final common_signin_button_text_long:I = 0x7f120470
+.field public static final common_signin_button_text_long:I = 0x7f120473
-.field public static final copy:I = 0x7f1204ce
+.field public static final copy:I = 0x7f1204d1
-.field public static final error_icon_content_description:I = 0x7f120643
+.field public static final error_icon_content_description:I = 0x7f120648
-.field public static final expand_button_title:I = 0x7f12067a
+.field public static final expand_button_title:I = 0x7f12067f
-.field public static final exposed_dropdown_menu_content_description:I = 0x7f120688
+.field public static final exposed_dropdown_menu_content_description:I = 0x7f12068d
-.field public static final fab_transformation_scrim_behavior:I = 0x7f120691
+.field public static final fab_transformation_scrim_behavior:I = 0x7f120696
-.field public static final fab_transformation_sheet_behavior:I = 0x7f120692
+.field public static final fab_transformation_sheet_behavior:I = 0x7f120697
-.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120bc0
+.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120bcc
-.field public static final icon_content_description:I = 0x7f120c4d
+.field public static final icon_content_description:I = 0x7f120c59
-.field public static final item_view_role_description:I = 0x7f120d6f
+.field public static final item_view_role_description:I = 0x7f120d7d
-.field public static final mtrl_badge_numberless_content_description:I = 0x7f120eef
+.field public static final mtrl_badge_numberless_content_description:I = 0x7f120f01
-.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120ef0
+.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120f02
-.field public static final mtrl_exceed_max_badge_number_content_description:I = 0x7f120ef1
+.field public static final mtrl_exceed_max_badge_number_content_description:I = 0x7f120f03
-.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120ef2
+.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120f04
-.field public static final mtrl_picker_a11y_next_month:I = 0x7f120ef3
+.field public static final mtrl_picker_a11y_next_month:I = 0x7f120f05
-.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120ef4
+.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120f06
-.field public static final mtrl_picker_announce_current_selection:I = 0x7f120ef5
+.field public static final mtrl_picker_announce_current_selection:I = 0x7f120f07
-.field public static final mtrl_picker_cancel:I = 0x7f120ef6
+.field public static final mtrl_picker_cancel:I = 0x7f120f08
-.field public static final mtrl_picker_confirm:I = 0x7f120ef7
+.field public static final mtrl_picker_confirm:I = 0x7f120f09
-.field public static final mtrl_picker_date_header_selected:I = 0x7f120ef8
+.field public static final mtrl_picker_date_header_selected:I = 0x7f120f0a
-.field public static final mtrl_picker_date_header_title:I = 0x7f120ef9
+.field public static final mtrl_picker_date_header_title:I = 0x7f120f0b
-.field public static final mtrl_picker_date_header_unselected:I = 0x7f120efa
+.field public static final mtrl_picker_date_header_unselected:I = 0x7f120f0c
-.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120efb
+.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120f0d
-.field public static final mtrl_picker_invalid_format:I = 0x7f120efc
+.field public static final mtrl_picker_invalid_format:I = 0x7f120f0e
-.field public static final mtrl_picker_invalid_format_example:I = 0x7f120efd
+.field public static final mtrl_picker_invalid_format_example:I = 0x7f120f0f
-.field public static final mtrl_picker_invalid_format_use:I = 0x7f120efe
+.field public static final mtrl_picker_invalid_format_use:I = 0x7f120f10
-.field public static final mtrl_picker_invalid_range:I = 0x7f120eff
+.field public static final mtrl_picker_invalid_range:I = 0x7f120f11
-.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120f00
+.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120f12
-.field public static final mtrl_picker_out_of_range:I = 0x7f120f01
+.field public static final mtrl_picker_out_of_range:I = 0x7f120f13
-.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120f02
+.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120f14
-.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120f03
+.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120f15
-.field public static final mtrl_picker_range_header_selected:I = 0x7f120f04
+.field public static final mtrl_picker_range_header_selected:I = 0x7f120f16
-.field public static final mtrl_picker_range_header_title:I = 0x7f120f05
+.field public static final mtrl_picker_range_header_title:I = 0x7f120f17
-.field public static final mtrl_picker_range_header_unselected:I = 0x7f120f06
+.field public static final mtrl_picker_range_header_unselected:I = 0x7f120f18
-.field public static final mtrl_picker_save:I = 0x7f120f07
+.field public static final mtrl_picker_save:I = 0x7f120f19
-.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120f08
+.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120f1a
-.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120f09
+.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120f1b
-.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120f0a
+.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120f1c
-.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120f0b
+.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120f1d
-.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120f0c
+.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120f1e
-.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120f0d
+.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120f1f
-.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120f0e
+.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120f20
-.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120f0f
+.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120f21
-.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120f10
+.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120f22
-.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120f11
+.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120f23
-.field public static final mtrl_slider_range_content_description:I = 0x7f120f12
+.field public static final mtrl_slider_range_content_description:I = 0x7f120f24
-.field public static final not_set:I = 0x7f120f95
+.field public static final not_set:I = 0x7f120fa9
-.field public static final password_toggle_content_description:I = 0x7f1210bc
+.field public static final password_toggle_content_description:I = 0x7f1210ce
-.field public static final path_password_eye:I = 0x7f1210be
+.field public static final path_password_eye:I = 0x7f1210d0
-.field public static final path_password_eye_mask_strike_through:I = 0x7f1210bf
+.field public static final path_password_eye_mask_strike_through:I = 0x7f1210d1
-.field public static final path_password_eye_mask_visible:I = 0x7f1210c0
+.field public static final path_password_eye_mask_visible:I = 0x7f1210d2
-.field public static final path_password_strike_through:I = 0x7f1210c1
+.field public static final path_password_strike_through:I = 0x7f1210d3
-.field public static final preference_copied:I = 0x7f121131
+.field public static final preference_copied:I = 0x7f121143
-.field public static final search_menu_title:I = 0x7f1213f4
+.field public static final search_menu_title:I = 0x7f121408
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
-.field public static final summary_collapsed_preference_list:I = 0x7f121515
+.field public static final summary_collapsed_preference_list:I = 0x7f12152d
-.field public static final v7_preference_off:I = 0x7f121741
+.field public static final v7_preference_off:I = 0x7f12175a
-.field public static final v7_preference_on:I = 0x7f121742
+.field public static final v7_preference_on:I = 0x7f12175b
# 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
deleted file mode 100644
index 979d9ddadf..0000000000
--- a/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry$OptionType.smali
+++ /dev/null
@@ -1,111 +0,0 @@
-.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 33907209ea..367ca01a98 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:Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+.field public type:I
# direct methods
@@ -182,25 +182,13 @@
goto :goto_2
:pswitch_1
- const/4 v0, 0x0
+ iget v0, p0, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->type:I
- invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextString(Ljava/lang/String;)Ljava/lang/String;
+ invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextInt(I)I
- move-result-object p1
+ move-result p1
- 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;
+ iput p1, p0, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->type:I
goto :goto_2
@@ -260,6 +248,8 @@
:goto_2
return-void
+ nop
+
:sswitch_data_0
.sparse-switch
-0x7315ce29 -> :sswitch_6
@@ -400,31 +390,19 @@
return v2
:cond_8
- 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
+ invoke-virtual {p0}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getType()I
move-result v1
- if-nez v1, :cond_a
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getType()I
+
+ move-result v3
+
+ if-eq v1, v3, :cond_9
- :goto_1
return v2
- :cond_a
+ :cond_9
invoke-virtual {p0}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getId()J
move-result-wide v3
@@ -435,11 +413,11 @@
cmp-long p1, v3, v5
- if-eqz p1, :cond_b
+ if-eqz p1, :cond_a
return v2
- :cond_b
+ :cond_a
return v0
.end method
@@ -491,12 +469,12 @@
return-object v0
.end method
-.method public getType()Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+.method public getType()I
.locals 1
- iget-object v0, p0, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->type:Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+ iget v0, p0, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->type:I
- return-object v0
+ return v0
.end method
.method public hashCode()I
@@ -530,8 +508,6 @@
mul-int/lit8 v0, v0, 0x3b
- const/16 v2, 0x2b
-
if-nez v1, :cond_0
const/16 v1, 0x2b
@@ -562,39 +538,29 @@
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
- if-nez v1, :cond_1
+ invoke-virtual {p0}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getType()I
- goto :goto_1
+ move-result v1
- :cond_1
- invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
-
- move-result v2
-
- :goto_1
- add-int/2addr v0, v2
+ add-int/2addr v1, v0
invoke-virtual {p0}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getId()J
- move-result-wide v1
+ move-result-wide v4
- mul-int/lit8 v0, v0, 0x3b
+ mul-int/lit8 v1, v1, 0x3b
- ushr-long v3, v1, v3
+ ushr-long v2, v4, v3
- xor-long/2addr v1, v3
+ xor-long/2addr v2, v4
- long-to-int v2, v1
+ long-to-int v0, v2
- add-int/2addr v0, v2
+ add-int/2addr v1, v0
- return v0
+ return v1
.end method
.method public toString()Ljava/lang/String;
@@ -656,11 +622,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()Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+ invoke-virtual {p0}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getType()I
- move-result-object v1
+ move-result v1
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)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 0d5d799538..db78774054 100644
--- a/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelAuditLogEntry.smali
@@ -9,7 +9,6 @@
# 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 8685dcff08..4a61cc4935 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;->O(Ljava/lang/CharSequence;III)I
+ invoke-static {p0, v1, v0, v1}, Lf/n/a/k/a;->P(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 07f284d6dd..5f44a8a6b9 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuildRole.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuildRole.smali
@@ -401,6 +401,19 @@
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
@@ -413,7 +426,7 @@
goto :goto_1
- :sswitch_1
+ :sswitch_2
const-string v1, "position"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -426,7 +439,7 @@
goto :goto_1
- :sswitch_2
+ :sswitch_3
const-string v1, "hoist"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -439,7 +452,7 @@
goto :goto_1
- :sswitch_3
+ :sswitch_4
const-string v1, "color"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -452,7 +465,7 @@
goto :goto_1
- :sswitch_4
+ :sswitch_5
const-string v1, "mentionable"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -465,7 +478,7 @@
goto :goto_1
- :sswitch_5
+ :sswitch_6
const-string v1, "name"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -478,7 +491,7 @@
goto :goto_1
- :sswitch_6
+ :sswitch_7
const-string v1, "id"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -491,19 +504,6 @@
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
- -0x5f96149b -> :sswitch_7
- 0xd1b -> :sswitch_6
- 0x337a8b -> :sswitch_5
- 0x3ddae44 -> :sswitch_4
- 0x5a72f63 -> :sswitch_3
- 0x5ed9a23 -> :sswitch_2
- 0x2c929929 -> :sswitch_1
- 0x31c90f9f -> :sswitch_0
+ 0xd1b -> :sswitch_7
+ 0x337a8b -> :sswitch_6
+ 0x3ddae44 -> :sswitch_5
+ 0x5a72f63 -> :sswitch_4
+ 0x5ed9a23 -> :sswitch_3
+ 0x2c929929 -> :sswitch_2
+ 0x31c90f9f -> :sswitch_1
+ 0x4392f484 -> :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 79f51200ea..09a6589a43 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMessage.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMessage.smali
@@ -99,6 +99,8 @@
.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
@@ -181,6 +183,16 @@
.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
@@ -312,7 +324,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;)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;Ljava/util/List;)V
.locals 4
.param p8 # Lcom/discord/models/domain/ModelUser;
.annotation build Llombok/NonNull;
@@ -354,6 +366,9 @@
"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
@@ -480,6 +495,10 @@
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
@@ -493,7 +512,7 @@
.end method
.method public constructor (Lcom/discord/models/domain/ModelMessage;)V
- .locals 30
+ .locals 31
.param p1 # Lcom/discord/models/domain/ModelMessage;
.annotation build Llombok/NonNull;
.end annotation
@@ -527,7 +546,7 @@
iget-boolean v15, v0, Lcom/discord/models/domain/ModelMessage;->tts:Z
- move-object/from16 v29, v1
+ move-object/from16 v30, v1
iget-object v1, v0, Lcom/discord/models/domain/ModelMessage;->call:Lcom/discord/models/domain/ModelMessage$Call;
@@ -577,19 +596,23 @@
move-object/from16 v27, v1
- iget-object v0, v0, Lcom/discord/models/domain/ModelMessage;->stickers:Ljava/util/List;
+ iget-object v1, v0, Lcom/discord/models/domain/ModelMessage;->stickers:Ljava/util/List;
- move-object/from16 v28, v0
+ move-object/from16 v28, v1
- move-object/from16 v1, v29
+ iget-object v0, v0, Lcom/discord/models/domain/ModelMessage;->localAttachments:Ljava/util/List;
- 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
+ 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
return-void
.end method
.method public constructor (Lcom/discord/models/domain/ModelMessage;Lcom/discord/models/domain/ModelMessage;)V
- .locals 34
+ .locals 35
.param p1 # Lcom/discord/models/domain/ModelMessage;
.annotation build Llombok/NonNull;
.end annotation
@@ -935,27 +958,39 @@
:goto_1b
move-object/from16 v32, v2
- iget-object v1, v1, Lcom/discord/models/domain/ModelMessage;->stickers:Ljava/util/List;
+ iget-object v2, v1, Lcom/discord/models/domain/ModelMessage;->stickers:Ljava/util/List;
- if-eqz v1, :cond_1c
+ if-eqz v2, :cond_1c
goto :goto_1c
:cond_1c
- iget-object v1, v0, Lcom/discord/models/domain/ModelMessage;->stickers:Ljava/util/List;
+ iget-object v2, v0, Lcom/discord/models/domain/ModelMessage;->stickers:Ljava/util/List;
:goto_1c
- move-object/from16 v33, v1
+ 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 v6, p0
- 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
+ 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
- if-eqz v0, :cond_1d
+ if-eqz v0, :cond_1e
return-void
- :cond_1d
+ :cond_1e
new-instance v0, Ljava/lang/NullPointerException;
const-string v1, "other is marked @NonNull but is null"
@@ -1113,8 +1148,106 @@
return-wide 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;)Lcom/discord/models/domain/ModelMessage;
- .locals 29
+.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
.param p3 # Lcom/discord/models/domain/ModelUser;
.annotation build Llombok/NonNull;
.end annotation
@@ -1131,7 +1264,9 @@
"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
@@ -1160,9 +1295,9 @@
move-result-object v10
- new-instance v28, Lcom/discord/models/domain/ModelMessage;
+ new-instance v29, Lcom/discord/models/domain/ModelMessage;
- move-object/from16 v0, v28
+ move-object/from16 v0, v29
invoke-static {v1, v2}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
@@ -1210,9 +1345,11 @@
move/from16 v24, p6
- 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
+ move-object/from16 v28, p10
- return-object v28
+ 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_1
new-instance v0, Ljava/lang/NullPointerException;
@@ -2130,6 +2267,26 @@
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
@@ -2682,13 +2839,38 @@
move-result-wide v5
- cmp-long p1, v3, v5
+ cmp-long v1, v3, v5
- if-eqz p1, :cond_2b
+ if-eqz v1, :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
@@ -2919,6 +3101,22 @@
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
@@ -3632,47 +3830,95 @@
if-nez v1, :cond_11
+ const/16 v1, 0x2b
+
goto :goto_11
:cond_11
invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
- move-result v4
+ move-result v1
:goto_11
- add-int/2addr v3, v4
+ add-int/2addr v3, v1
invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getTimestampMilliseconds()J
- move-result-wide v4
+ move-result-wide v5
mul-int/lit8 v3, v3, 0x3b
- ushr-long v6, v4, v2
+ ushr-long v7, v5, v2
- xor-long/2addr v4, v6
+ xor-long/2addr v5, v7
- long-to-int v1, v4
+ long-to-int v1, v5
add-int/2addr v3, v1
invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getEditedTimestampMilliseconds()J
- move-result-wide v4
+ move-result-wide v5
mul-int/lit8 v3, v3, 0x3b
- ushr-long v0, v4, v2
+ ushr-long v1, v5, v2
- xor-long/2addr v0, v4
+ xor-long/2addr v1, v5
- long-to-int v1, v0
+ long-to-int v2, v1
- add-int/2addr v3, v1
+ 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
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
@@ -3700,6 +3946,10 @@
const/4 v1, -0x2
+ if-eq v0, v1, :cond_1
+
+ const/4 v1, -0x3
+
if-ne v0, v1, :cond_0
goto :goto_0
@@ -4102,6 +4352,16 @@
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 00cd92700c..25c044a3f5 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPermissionOverwrite.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPermissionOverwrite.smali
@@ -99,79 +99,6 @@
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
@@ -200,35 +127,22 @@
if-eq v1, v2, :cond_3
- const v2, 0x368f3a
+ const v2, 0x2efe0c
if-eq v1, v2, :cond_2
- const v2, 0x1631afaa
+ const v2, 0x368f3a
if-eq v1, v2, :cond_1
- const v2, 0x3555f0ed
+ const v2, 0x589a349
if-eq v1, v2, :cond_0
goto :goto_0
:cond_0
- 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"
+ const-string v1, "allow"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -240,7 +154,7 @@
goto :goto_1
- :cond_2
+ :cond_1
const-string v1, "type"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -253,6 +167,19 @@
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"
@@ -323,13 +250,9 @@
goto :goto_2
:cond_8
- const/4 v0, 0x0
+ iget v0, p0, Lcom/discord/models/domain/ModelPermissionOverwrite;->type: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
+ invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextInt(I)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
deleted file mode 100644
index eb603f34a7..0000000000
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$Parser$parse$1$2.smali
+++ /dev/null
@@ -1,71 +0,0 @@
-.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 6f0f535ab9..aaecb9259d 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,19 +36,15 @@
.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;Lkotlin/jvm/internal/Ref$ObjectRef;Lkotlin/jvm/internal/Ref$ObjectRef;)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;)V
.locals 0
iput-object p1, p0, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;->$status:Lkotlin/jvm/internal/Ref$ObjectRef;
@@ -63,10 +59,6 @@
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
@@ -123,7 +115,7 @@
iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
- goto/16 :goto_1
+ goto :goto_1
:sswitch_1
const-string v0, "client_status"
@@ -146,34 +138,9 @@
iput-object v0, p1, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
- 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
+ :sswitch_2
const-string v0, "user"
invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -200,28 +167,7 @@
goto :goto_1
- :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
+ :sswitch_3
const-string v0, "status"
invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -248,7 +194,7 @@
goto :goto_1
- :sswitch_6
+ :sswitch_4
const-string v0, "guild_id"
invoke-virtual {p1, v0}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -286,13 +232,13 @@
:goto_1
return-void
+ nop
+
:sswitch_data_0
.sparse-switch
- -0x4de03319 -> :sswitch_6
- -0x3532300e -> :sswitch_5
- 0x339763 -> :sswitch_4
- 0x36ebcb -> :sswitch_3
- 0x67a8ebd -> :sswitch_2
+ -0x4de03319 -> :sswitch_4
+ -0x3532300e -> :sswitch_3
+ 0x36ebcb -> :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 b830d862c0..e553b2ed8c 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence$Parser.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence$Parser.smali
@@ -54,167 +54,121 @@
# virtual methods
.method public parse(Lcom/discord/models/domain/Model$JsonReader;)Lcom/discord/models/domain/ModelPresence;
- .locals 27
+ .locals 14
- move-object/from16 v9, p1
+ const/4 v0, 0x0
- const/4 v10, 0x0
-
- if-eqz v9, :cond_2
-
- new-instance v11, Lkotlin/jvm/internal/Ref$ObjectRef;
-
- invoke-direct {v11}, Lkotlin/jvm/internal/Ref$ObjectRef;->()V
-
- iput-object v10, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
- new-instance v12, Lkotlin/jvm/internal/Ref$ObjectRef;
-
- invoke-direct {v12}, Lkotlin/jvm/internal/Ref$ObjectRef;->()V
-
- iput-object v10, v12, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
- new-instance v13, Lkotlin/jvm/internal/Ref$ObjectRef;
-
- invoke-direct {v13}, Lkotlin/jvm/internal/Ref$ObjectRef;->()V
-
- iput-object v10, v13, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
- new-instance v14, Lkotlin/jvm/internal/Ref$ObjectRef;
-
- invoke-direct {v14}, Lkotlin/jvm/internal/Ref$ObjectRef;->()V
-
- iput-object v10, v14, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
-
- new-instance v15, Lkotlin/jvm/internal/Ref$LongRef;
-
- invoke-direct {v15}, Lkotlin/jvm/internal/Ref$LongRef;->()V
-
- const-wide/16 v0, 0x0
-
- iput-wide v0, v15, Lkotlin/jvm/internal/Ref$LongRef;->element:J
+ if-eqz p1, :cond_2
new-instance v8, Lkotlin/jvm/internal/Ref$ObjectRef;
invoke-direct {v8}, Lkotlin/jvm/internal/Ref$ObjectRef;->()V
- iput-object v10, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+ iput-object v0, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
- new-instance v7, Lkotlin/jvm/internal/Ref$ObjectRef;
+ new-instance v9, Lkotlin/jvm/internal/Ref$ObjectRef;
- invoke-direct {v7}, Lkotlin/jvm/internal/Ref$ObjectRef;->()V
+ invoke-direct {v9}, Lkotlin/jvm/internal/Ref$ObjectRef;->()V
- iput-object v10, v7, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+ iput-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
- new-instance v6, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;
+ new-instance v10, Lkotlin/jvm/internal/Ref$ObjectRef;
- move-object v0, v6
+ invoke-direct {v10}, Lkotlin/jvm/internal/Ref$ObjectRef;->()V
- move-object v1, v11
+ iput-object v0, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
- move-object/from16 v2, p1
+ new-instance v11, Lkotlin/jvm/internal/Ref$ObjectRef;
- move-object v3, v12
+ invoke-direct {v11}, Lkotlin/jvm/internal/Ref$ObjectRef;->()V
- move-object v4, v13
+ iput-object v0, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
- move-object v5, v14
+ new-instance v12, Lkotlin/jvm/internal/Ref$LongRef;
- move-object v10, v6
+ invoke-direct {v12}, Lkotlin/jvm/internal/Ref$LongRef;->()V
- move-object v6, v15
+ const-wide/16 v1, 0x0
- move-object/from16 v16, v7
+ iput-wide v1, v12, Lkotlin/jvm/internal/Ref$LongRef;->element:J
- move-object v7, v8
+ new-instance v13, Lcom/discord/models/domain/ModelPresence$Parser$parse$1;
- move-object/from16 v17, v8
+ move-object v1, v13
- move-object/from16 v8, v16
+ move-object v2, v8
- 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
+ move-object v3, p1
- invoke-virtual {v9, v10}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
+ move-object v4, v9
- new-instance v0, Lcom/discord/models/domain/ModelPresence;
+ move-object v5, v10
- iget-object v1, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+ move-object v6, v11
- move-object/from16 v19, v1
+ move-object v7, v12
- check-cast v19, Lcom/discord/models/domain/ModelPresence$Status;
+ 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
- if-eqz v19, :cond_1
+ invoke-virtual {p1, v13}, Lcom/discord/models/domain/Model$JsonReader;->nextObject(Lrx/functions/Action1;)V
- iget-object v1, v12, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+ new-instance p1, Lcom/discord/models/domain/ModelPresence;
- move-object/from16 v20, v1
+ iget-object v1, v8, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
- check-cast v20, Ljava/util/List;
+ move-object v2, v1
- iget-object v1, v13, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+ check-cast v2, Lcom/discord/models/domain/ModelPresence$Status;
- check-cast v1, Lcom/discord/models/domain/ModelPresence$ClientStatuses;
+ if-eqz v2, :cond_1
- if-eqz v1, :cond_0
+ iget-object v0, v9, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+ move-object v3, v0
+
+ check-cast v3, Ljava/util/List;
+
+ iget-object v0, v10, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+
+ check-cast v0, Lcom/discord/models/domain/ModelPresence$ClientStatuses;
+
+ if-eqz v0, :cond_0
goto :goto_0
:cond_0
- sget-object v1, 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 {v1}, 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 v1
+ move-result-object v0
:goto_0
- move-object/from16 v21, v1
+ move-object v4, v0
- iget-object v1, v14, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+ iget-object v0, v11, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
- move-object/from16 v22, v1
+ move-object v5, v0
- check-cast v22, Lcom/discord/models/domain/ModelUser;
+ check-cast v5, Lcom/discord/models/domain/ModelUser;
- iget-wide v1, v15, Lkotlin/jvm/internal/Ref$LongRef;->element:J
+ iget-wide v6, v12, Lkotlin/jvm/internal/Ref$LongRef;->element:J
- move-object/from16 v3, v17
+ move-object v1, p1
- iget-object v3, v3, Lkotlin/jvm/internal/Ref$ObjectRef;->element:Ljava/lang/Object;
+ 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 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
+ return-object p1
:cond_1
invoke-static {}, Lj0/n/c/h;->throwNpe()V
- const/4 v0, 0x0
-
throw v0
:cond_2
- move-object v0, v10
+ const-string p1, "reader"
- const-string v1, "reader"
-
- 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 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 3fc9d10916..bcb585ea4d 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;JLjava/lang/String;Ljava/util/List;)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;J)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 2fa030908c..1b3756ee9f 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;JLjava/lang/String;Ljava/util/List;)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;J)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 02414ac01f..d6db40f9fd 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;JLjava/lang/String;Ljava/util/List;)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;J)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 bf5c62f53b..f384a030dd 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;JLjava/lang/String;Ljava/util/List;)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;J)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 74f61f2e66..47fb560c73 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;JLjava/lang/String;Ljava/util/List;)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;J)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 a559e1a4e9..170a97d2f0 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;JLjava/lang/String;Ljava/util/List;)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;J)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 88f64360fe..00f091f35e 100644
--- a/com.discord/smali/com/discord/models/domain/ModelPresence.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelPresence.smali
@@ -32,22 +32,10 @@
.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;
@@ -58,7 +46,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;JLjava/lang/String;Ljava/util/List;)V
+.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
.locals 1
.annotation system Ldalvik/annotation/Signature;
value = {
@@ -70,11 +58,7 @@
">;",
"Lcom/discord/models/domain/ModelPresence$ClientStatuses;",
"Lcom/discord/models/domain/ModelUser;",
- "J",
- "Ljava/lang/String;",
- "Ljava/util/List<",
- "Ljava/lang/Long;",
- ">;)V"
+ "J)V"
}
.end annotation
@@ -96,10 +80,6 @@
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
@@ -177,86 +157,47 @@
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;JLjava/lang/String;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
- .locals 10
+.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
- and-int/lit8 v0, p9, 0x4
+ and-int/lit8 p8, p7, 0x4
- if-eqz v0, :cond_0
+ if-eqz p8, :cond_0
- sget-object v0, Lcom/discord/models/domain/ModelPresence$ClientStatuses;->Companion:Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;
+ sget-object p3, 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 {p3}, Lcom/discord/models/domain/ModelPresence$ClientStatuses$Companion;->empty()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
- move-result-object v0
-
- move-object v4, v0
-
- goto :goto_0
+ move-result-object p3
:cond_0
- move-object v4, p3
+ move-object v3, p3
- :goto_0
- and-int/lit8 v0, p9, 0x8
+ and-int/lit8 p3, p7, 0x8
- const/4 v1, 0x0
+ if-eqz p3, :cond_1
- if-eqz v0, :cond_1
-
- move-object v5, v1
-
- goto :goto_1
+ const/4 p4, 0x0
:cond_1
- move-object v5, p4
+ move-object v4, p4
- :goto_1
- and-int/lit8 v0, p9, 0x10
+ and-int/lit8 p3, p7, 0x10
- if-eqz v0, :cond_2
+ if-eqz p3, :cond_2
- const-wide/16 v2, 0x0
-
- move-wide v6, v2
-
- goto :goto_2
+ const-wide/16 p5, 0x0
:cond_2
- move-wide v6, p5
+ move-wide v5, p5
- :goto_2
- and-int/lit8 v0, p9, 0x20
+ move-object v0, p0
- if-eqz v0, :cond_3
+ move-object v1, p1
- move-object v8, v1
+ move-object v2, p2
- 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
+ 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
return-void
.end method
@@ -271,114 +212,69 @@
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;JLjava/lang/String;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/models/domain/ModelPresence;
- .locals 9
+.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
- move-object v0, p0
+ and-int/lit8 p8, p7, 0x1
- and-int/lit8 v1, p9, 0x1
+ if-eqz p8, :cond_0
- if-eqz v1, :cond_0
-
- iget-object v1, v0, Lcom/discord/models/domain/ModelPresence;->status:Lcom/discord/models/domain/ModelPresence$Status;
-
- goto :goto_0
+ iget-object p1, p0, Lcom/discord/models/domain/ModelPresence;->status:Lcom/discord/models/domain/ModelPresence$Status;
:cond_0
- move-object v1, p1
+ and-int/lit8 p8, p7, 0x2
- :goto_0
- and-int/lit8 v2, p9, 0x2
+ if-eqz p8, :cond_1
- if-eqz v2, :cond_1
-
- iget-object v2, v0, Lcom/discord/models/domain/ModelPresence;->activities:Ljava/util/List;
-
- goto :goto_1
+ iget-object p2, p0, Lcom/discord/models/domain/ModelPresence;->activities:Ljava/util/List;
:cond_1
- move-object v2, p2
+ move-object p8, p2
- :goto_1
- and-int/lit8 v3, p9, 0x4
+ and-int/lit8 p2, p7, 0x4
- if-eqz v3, :cond_2
+ if-eqz p2, :cond_2
- iget-object v3, v0, Lcom/discord/models/domain/ModelPresence;->clientStatuses:Lcom/discord/models/domain/ModelPresence$ClientStatuses;
-
- goto :goto_2
+ iget-object p3, p0, Lcom/discord/models/domain/ModelPresence;->clientStatuses:Lcom/discord/models/domain/ModelPresence$ClientStatuses;
:cond_2
- move-object v3, p3
+ move-object v0, p3
- :goto_2
- and-int/lit8 v4, p9, 0x8
+ and-int/lit8 p2, p7, 0x8
- if-eqz v4, :cond_3
+ if-eqz p2, :cond_3
- iget-object v4, v0, Lcom/discord/models/domain/ModelPresence;->user:Lcom/discord/models/domain/ModelUser;
-
- goto :goto_3
+ iget-object p4, p0, Lcom/discord/models/domain/ModelPresence;->user:Lcom/discord/models/domain/ModelUser;
:cond_3
- move-object v4, p4
+ move-object v1, p4
- :goto_3
- and-int/lit8 v5, p9, 0x10
+ and-int/lit8 p2, p7, 0x10
- if-eqz v5, :cond_4
+ if-eqz p2, :cond_4
- iget-wide v5, v0, Lcom/discord/models/domain/ModelPresence;->guildId:J
-
- goto :goto_4
+ iget-wide p5, p0, Lcom/discord/models/domain/ModelPresence;->guildId:J
:cond_4
- move-wide v5, p5
+ move-wide v2, p5
- :goto_4
- and-int/lit8 v7, p9, 0x20
+ move-object p2, p0
- if-eqz v7, :cond_5
+ move-object p3, p1
- iget-object v7, v0, Lcom/discord/models/domain/ModelPresence;->nick:Ljava/lang/String;
+ move-object p4, p8
- goto :goto_5
+ move-object p5, v0
- :cond_5
- move-object/from16 v7, p7
+ move-object p6, v1
- :goto_5
- and-int/lit8 v8, p9, 0x40
+ move-wide p7, v2
- if-eqz v8, :cond_6
+ 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;
- iget-object v8, v0, Lcom/discord/models/domain/ModelPresence;->roles:Ljava/util/List;
+ move-result-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
+ return-object p0
.end method
.method private final getActivityByType(I)Lcom/discord/models/domain/activity/ModelActivity;
@@ -484,32 +380,8 @@
return-wide v0
.end method
-.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
+.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
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
@@ -520,11 +392,7 @@
">;",
"Lcom/discord/models/domain/ModelPresence$ClientStatuses;",
"Lcom/discord/models/domain/ModelUser;",
- "J",
- "Ljava/lang/String;",
- "Ljava/util/List<",
- "Ljava/lang/Long;",
- ">;)",
+ "J)",
"Lcom/discord/models/domain/ModelPresence;"
}
.end annotation
@@ -549,31 +417,27 @@
move-wide v6, p5
- 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
+ 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
return-object v0
:cond_0
- const-string v1, "clientStatuses"
+ const-string p1, "clientStatuses"
- 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 v0
:cond_1
- const-string v1, "status"
+ const-string p1, "status"
- 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 v0
.end method
.method public equals(Ljava/lang/Object;)Z
- .locals 5
+ .locals 4
if-eq p0, p1, :cond_1
@@ -627,29 +491,9 @@
iget-wide v2, p1, Lcom/discord/models/domain/ModelPresence;->guildId:J
- cmp-long v4, v0, v2
+ cmp-long p1, v0, v2
- 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
+ if-nez p1, :cond_0
goto :goto_0
@@ -725,14 +569,6 @@
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
@@ -761,22 +597,6 @@
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
@@ -822,7 +642,7 @@
.end method
.method public hashCode()I
- .locals 6
+ .locals 5
iget-object v0, p0, Lcom/discord/models/domain/ModelPresence;->status:Lcom/discord/models/domain/ModelPresence$Status;
@@ -884,66 +704,30 @@
invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->hashCode()I
- move-result v2
-
- goto :goto_3
-
- :cond_3
- const/4 v2, 0x0
-
- :goto_3
- add-int/2addr v0, v2
-
- mul-int/lit8 v0, v0, 0x1f
-
- iget-wide v2, p0, Lcom/discord/models/domain/ModelPresence;->guildId:J
-
- const/16 v4, 0x20
-
- ushr-long v4, v2, v4
-
- xor-long/2addr v2, v4
-
- 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
+ :cond_3
add-int/2addr v0, v1
+ mul-int/lit8 v0, v0, 0x1f
+
+ iget-wide v1, p0, Lcom/discord/models/domain/ModelPresence;->guildId:J
+
+ const/16 v3, 0x20
+
+ ushr-long v3, v1, v3
+
+ xor-long/2addr v1, v3
+
+ long-to-int v2, v1
+
+ add-int/2addr v0, v2
+
return v0
.end method
.method public toString()Ljava/lang/String;
- .locals 3
+ .locals 4
const-string v0, "ModelPresence(status="
@@ -985,25 +769,9 @@
iget-wide v1, p0, Lcom/discord/models/domain/ModelPresence;->guildId:J
- invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+ const-string v3, ")"
- 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;
+ invoke-static {v0, v1, v2, v3}, Lf/e/b/a/a;->t(Ljava/lang/StringBuilder;JLjava/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 0a0a59fd47..40c21c100e 100644
--- a/com.discord/smali/com/discord/models/domain/ModelVoice$State.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelVoice$State.smali
@@ -948,6 +948,36 @@
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
new file mode 100644
index 0000000000..b25ba73ff7
--- /dev/null
+++ b/com.discord/smali/com/discord/models/messages/LocalAttachment.smali
@@ -0,0 +1,296 @@
+.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 5bc7eb2d5f..30e9cce168 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 = 0x7f0a025a
+.field public static final checkbox:I = 0x7f0a025f
-.field public static final checked:I = 0x7f0a025c
+.field public static final checked:I = 0x7f0a0261
-.field public static final chronometer:I = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final content:I = 0x7f0a0284
+.field public static final content:I = 0x7f0a0289
-.field public static final contentPanel:I = 0x7f0a0285
+.field public static final contentPanel:I = 0x7f0a028a
-.field public static final custom:I = 0x7f0a02af
+.field public static final custom:I = 0x7f0a02b4
-.field public static final customPanel:I = 0x7f0a02b0
+.field public static final customPanel:I = 0x7f0a02b5
-.field public static final decor_content_parent:I = 0x7f0a02b8
+.field public static final decor_content_parent:I = 0x7f0a02bd
-.field public static final default_activity_button:I = 0x7f0a02b9
+.field public static final default_activity_button:I = 0x7f0a02be
-.field public static final dialog_button:I = 0x7f0a02c7
+.field public static final dialog_button:I = 0x7f0a02cc
-.field public static final edit_query:I = 0x7f0a0317
+.field public static final edit_query:I = 0x7f0a031d
-.field public static final expand_activities_button:I = 0x7f0a0361
+.field public static final expand_activities_button:I = 0x7f0a0367
-.field public static final expanded_menu:I = 0x7f0a0362
+.field public static final expanded_menu:I = 0x7f0a0368
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final group_divider:I = 0x7f0a0409
+.field public static final group_divider:I = 0x7f0a0411
-.field public static final home:I = 0x7f0a04b8
+.field public static final home:I = 0x7f0a04c0
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final image:I = 0x7f0a04d6
+.field public static final image:I = 0x7f0a04de
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final listMode:I = 0x7f0a0580
+.field public static final listMode:I = 0x7f0a0588
-.field public static final list_item:I = 0x7f0a0581
+.field public static final list_item:I = 0x7f0a0589
-.field public static final message:I = 0x7f0a05d4
+.field public static final message:I = 0x7f0a05dc
-.field public static final multiply:I = 0x7f0a05f6
+.field public static final multiply:I = 0x7f0a05fe
-.field public static final none:I = 0x7f0a061d
+.field public static final none:I = 0x7f0a0625
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final off:I = 0x7f0a065e
+.field public static final off:I = 0x7f0a0666
-.field public static final on:I = 0x7f0a0662
+.field public static final on:I = 0x7f0a066a
-.field public static final parentPanel:I = 0x7f0a0677
+.field public static final parentPanel:I = 0x7f0a067f
-.field public static final progress_circular:I = 0x7f0a0722
+.field public static final progress_circular:I = 0x7f0a072a
-.field public static final progress_horizontal:I = 0x7f0a0725
+.field public static final progress_horizontal:I = 0x7f0a072d
-.field public static final radio:I = 0x7f0a0733
+.field public static final radio:I = 0x7f0a073b
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final screen:I = 0x7f0a0787
+.field public static final screen:I = 0x7f0a078f
-.field public static final scrollIndicatorDown:I = 0x7f0a078b
+.field public static final scrollIndicatorDown:I = 0x7f0a0793
-.field public static final scrollIndicatorUp:I = 0x7f0a078c
+.field public static final scrollIndicatorUp:I = 0x7f0a0794
-.field public static final scrollView:I = 0x7f0a078d
+.field public static final scrollView:I = 0x7f0a0795
-.field public static final search_badge:I = 0x7f0a0790
+.field public static final search_badge:I = 0x7f0a0798
-.field public static final search_bar:I = 0x7f0a0791
+.field public static final search_bar:I = 0x7f0a0799
-.field public static final search_button:I = 0x7f0a0792
+.field public static final search_button:I = 0x7f0a079a
-.field public static final search_close_btn:I = 0x7f0a0793
+.field public static final search_close_btn:I = 0x7f0a079b
-.field public static final search_edit_frame:I = 0x7f0a0794
+.field public static final search_edit_frame:I = 0x7f0a079c
-.field public static final search_go_btn:I = 0x7f0a0796
+.field public static final search_go_btn:I = 0x7f0a079e
-.field public static final search_mag_icon:I = 0x7f0a0797
+.field public static final search_mag_icon:I = 0x7f0a079f
-.field public static final search_plate:I = 0x7f0a0798
+.field public static final search_plate:I = 0x7f0a07a0
-.field public static final search_src_text:I = 0x7f0a079b
+.field public static final search_src_text:I = 0x7f0a07a3
-.field public static final search_voice_btn:I = 0x7f0a07a7
+.field public static final search_voice_btn:I = 0x7f0a07af
-.field public static final select_dialog_listview:I = 0x7f0a07aa
+.field public static final select_dialog_listview:I = 0x7f0a07b2
-.field public static final shortcut:I = 0x7f0a0906
+.field public static final shortcut:I = 0x7f0a090e
-.field public static final spacer:I = 0x7f0a0915
+.field public static final spacer:I = 0x7f0a091d
-.field public static final split_action_bar:I = 0x7f0a0919
+.field public static final split_action_bar:I = 0x7f0a0921
-.field public static final src_atop:I = 0x7f0a091d
+.field public static final src_atop:I = 0x7f0a0925
-.field public static final src_in:I = 0x7f0a091e
+.field public static final src_in:I = 0x7f0a0926
-.field public static final src_over:I = 0x7f0a091f
+.field public static final src_over:I = 0x7f0a0927
-.field public static final submenuarrow:I = 0x7f0a093c
+.field public static final submenuarrow:I = 0x7f0a0944
-.field public static final submit_area:I = 0x7f0a093d
+.field public static final submit_area:I = 0x7f0a0945
-.field public static final tabMode:I = 0x7f0a094c
+.field public static final tabMode:I = 0x7f0a0955
-.field public static final tag_accessibility_actions:I = 0x7f0a095a
+.field public static final tag_accessibility_actions:I = 0x7f0a0963
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
-.field public static final tag_accessibility_heading:I = 0x7f0a095c
+.field public static final tag_accessibility_heading:I = 0x7f0a0965
-.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
-.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final textSpacerNoButtons:I = 0x7f0a0970
+.field public static final textSpacerNoButtons:I = 0x7f0a0979
-.field public static final textSpacerNoTitle:I = 0x7f0a0971
+.field public static final textSpacerNoTitle:I = 0x7f0a097a
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
-.field public static final titleDividerNoCustom:I = 0x7f0a0984
+.field public static final titleDividerNoCustom:I = 0x7f0a098d
-.field public static final title_template:I = 0x7f0a0985
+.field public static final title_template:I = 0x7f0a098e
-.field public static final topPanel:I = 0x7f0a098b
+.field public static final topPanel:I = 0x7f0a0995
-.field public static final trash_wrap_icon:I = 0x7f0a0997
+.field public static final trash_wrap_icon:I = 0x7f0a09a1
-.field public static final trash_wrap_target_container:I = 0x7f0a0998
+.field public static final trash_wrap_target_container:I = 0x7f0a09a2
-.field public static final trash_wrap_target_zone:I = 0x7f0a0999
+.field public static final trash_wrap_target_zone:I = 0x7f0a09a3
-.field public static final unchecked:I = 0x7f0a09a1
+.field public static final unchecked:I = 0x7f0a09ab
-.field public static final uniform:I = 0x7f0a09a4
+.field public static final uniform:I = 0x7f0a09ae
-.field public static final up:I = 0x7f0a09a6
+.field public static final up:I = 0x7f0a09b0
-.field public static final wrap_content:I = 0x7f0a0aa5
+.field public static final wrap_content:I = 0x7f0a0aaf
# direct methods
diff --git a/com.discord/smali/com/discord/panels/OverlappingPanelsLayout.smali b/com.discord/smali/com/discord/panels/OverlappingPanelsLayout.smali
index 1b42df909d..a882273d6b 100644
--- a/com.discord/smali/com/discord/panels/OverlappingPanelsLayout.smali
+++ b/com.discord/smali/com/discord/panels/OverlappingPanelsLayout.smali
@@ -952,13 +952,13 @@
.end method
.method private final handleCenterPanelX(FF)V
- .locals 10
+ .locals 11
iget-object v0, p0, Lcom/discord/panels/OverlappingPanelsLayout;->startPanel:Landroid/view/View;
const/4 v1, 0x0
- if-eqz v0, :cond_19
+ if-eqz v0, :cond_1b
iget-boolean v2, p0, Lcom/discord/panels/OverlappingPanelsLayout;->isLeftToRight:Z
@@ -1029,7 +1029,7 @@
iget-object v0, p0, Lcom/discord/panels/OverlappingPanelsLayout;->endPanel:Landroid/view/View;
- if-eqz v0, :cond_18
+ if-eqz v0, :cond_1a
iget-boolean v2, p0, Lcom/discord/panels/OverlappingPanelsLayout;->isLeftToRight:Z
@@ -1077,7 +1077,7 @@
if-lez v2, :cond_9
:cond_7
- const/4 v3, 0x0
+ const/4 v2, 0x0
goto :goto_3
@@ -1087,8 +1087,10 @@
throw v1
:cond_9
+ const/4 v2, 0x4
+
:goto_3
- invoke-virtual {v0, v3}, Landroid/view/View;->setVisibility(I)V
+ invoke-virtual {v0, v2}, Landroid/view/View;->setVisibility(I)V
const/4 v0, 0x0
@@ -1096,98 +1098,112 @@
if-nez v2, :cond_a
- sget-object v3, Lcom/discord/panels/OverlappingPanelsLayout$Panel;->CENTER:Lcom/discord/panels/OverlappingPanelsLayout$Panel;
+ sget-object v6, Lcom/discord/panels/OverlappingPanelsLayout$Panel;->CENTER:Lcom/discord/panels/OverlappingPanelsLayout$Panel;
- iput-object v3, p0, Lcom/discord/panels/OverlappingPanelsLayout;->selectedPanel:Lcom/discord/panels/OverlappingPanelsLayout$Panel;
+ iput-object v6, p0, Lcom/discord/panels/OverlappingPanelsLayout;->selectedPanel:Lcom/discord/panels/OverlappingPanelsLayout$Panel;
goto :goto_4
:cond_a
- iget v3, p0, Lcom/discord/panels/OverlappingPanelsLayout;->startPanelOpenedCenterPanelX:F
+ iget v6, p0, Lcom/discord/panels/OverlappingPanelsLayout;->startPanelOpenedCenterPanelX:F
- cmpg-float v3, p2, v3
+ cmpg-float v6, p2, v6
- if-nez v3, :cond_b
+ if-nez v6, :cond_b
- sget-object v3, Lcom/discord/panels/OverlappingPanelsLayout$Panel;->START:Lcom/discord/panels/OverlappingPanelsLayout$Panel;
+ sget-object v6, Lcom/discord/panels/OverlappingPanelsLayout$Panel;->START:Lcom/discord/panels/OverlappingPanelsLayout$Panel;
- iput-object v3, p0, Lcom/discord/panels/OverlappingPanelsLayout;->selectedPanel:Lcom/discord/panels/OverlappingPanelsLayout$Panel;
+ iput-object v6, p0, Lcom/discord/panels/OverlappingPanelsLayout;->selectedPanel:Lcom/discord/panels/OverlappingPanelsLayout$Panel;
goto :goto_4
:cond_b
- iget v3, p0, Lcom/discord/panels/OverlappingPanelsLayout;->endPanelOpenedCenterPanelX:F
+ iget v6, p0, Lcom/discord/panels/OverlappingPanelsLayout;->endPanelOpenedCenterPanelX:F
- cmpg-float v3, p2, v3
+ cmpg-float v6, p2, v6
- if-nez v3, :cond_c
+ if-nez v6, :cond_c
- sget-object v3, Lcom/discord/panels/OverlappingPanelsLayout$Panel;->END:Lcom/discord/panels/OverlappingPanelsLayout$Panel;
+ sget-object v6, Lcom/discord/panels/OverlappingPanelsLayout$Panel;->END:Lcom/discord/panels/OverlappingPanelsLayout$Panel;
- iput-object v3, p0, Lcom/discord/panels/OverlappingPanelsLayout;->selectedPanel:Lcom/discord/panels/OverlappingPanelsLayout$Panel;
+ iput-object v6, p0, Lcom/discord/panels/OverlappingPanelsLayout;->selectedPanel:Lcom/discord/panels/OverlappingPanelsLayout$Panel;
:cond_c
:goto_4
- iget v3, p0, Lcom/discord/panels/OverlappingPanelsLayout;->endPanelOpenedCenterPanelX:F
+ iget v6, p0, Lcom/discord/panels/OverlappingPanelsLayout;->endPanelOpenedCenterPanelX:F
- const/4 v6, 0x1
+ const/4 v7, 0x1
- cmpg-float v3, p2, v3
+ cmpg-float v6, p2, v6
- if-eqz v3, :cond_e
+ if-eqz v6, :cond_e
- iget v3, p0, Lcom/discord/panels/OverlappingPanelsLayout;->startPanelOpenedCenterPanelX:F
+ iget v6, p0, Lcom/discord/panels/OverlappingPanelsLayout;->startPanelOpenedCenterPanelX:F
- cmpg-float v3, p2, v3
+ cmpg-float v6, p2, v6
- if-nez v3, :cond_d
+ if-nez v6, :cond_d
goto :goto_5
:cond_d
- const/4 v3, 0x0
+ const/4 v6, 0x0
goto :goto_6
:cond_e
:goto_5
- const/4 v3, 0x1
+ const/4 v6, 0x1
:goto_6
- iget-object v7, p0, Lcom/discord/panels/OverlappingPanelsLayout;->centerPanel:Landroid/view/View;
+ iget-object v8, p0, Lcom/discord/panels/OverlappingPanelsLayout;->centerPanel:Landroid/view/View;
- if-eqz v7, :cond_17
+ if-eqz v8, :cond_19
- xor-int/lit8 v8, v3, 0x1
+ xor-int/lit8 v9, v6, 0x1
- const/high16 v9, 0x3f000000 # 0.5f
+ const/high16 v10, 0x3f000000 # 0.5f
- if-eqz v7, :cond_16
+ if-eqz v8, :cond_18
- if-eqz v8, :cond_f
+ if-eqz v9, :cond_f
- const/high16 v9, 0x3f800000 # 1.0f
+ const/high16 v10, 0x3f800000 # 1.0f
:cond_f
- invoke-virtual {v7, v9}, Landroid/view/View;->setAlpha(F)V
+ invoke-virtual {v8, v10}, Landroid/view/View;->setAlpha(F)V
- if-eqz v2, :cond_10
+ iget-object v8, p0, Lcom/discord/panels/OverlappingPanelsLayout;->centerPanel:Landroid/view/View;
- if-eqz v3, :cond_11
+ if-eqz v8, :cond_17
- :cond_10
- const/4 v5, 0x1
-
- :cond_11
- iget-object v2, p0, Lcom/discord/panels/OverlappingPanelsLayout;->centerPanel:Landroid/view/View;
-
- if-eqz v2, :cond_15
-
- if-eqz v5, :cond_12
+ if-eqz v6, :cond_10
goto :goto_7
+ :cond_10
+ const/4 v3, 0x0
+
+ :goto_7
+ invoke-virtual {v8, v3}, Landroid/view/View;->setImportantForAccessibility(I)V
+
+ if-eqz v2, :cond_11
+
+ if-eqz v6, :cond_12
+
+ :cond_11
+ const/4 v5, 0x1
+
:cond_12
+ iget-object v2, p0, Lcom/discord/panels/OverlappingPanelsLayout;->centerPanel:Landroid/view/View;
+
+ if-eqz v2, :cond_16
+
+ if-eqz v5, :cond_13
+
+ goto :goto_8
+
+ :cond_13
invoke-virtual {p0}, Landroid/widget/FrameLayout;->getResources()Landroid/content/res/Resources;
move-result-object v0
@@ -1198,7 +1214,7 @@
move-result v0
- :goto_7
+ :goto_8
invoke-virtual {v2, v0}, Landroid/view/View;->setElevation(F)V
invoke-direct {p0, p1, p2}, Lcom/discord/panels/OverlappingPanelsLayout;->getStartPanelState(FF)Lcom/discord/panels/PanelState;
@@ -1213,12 +1229,12 @@
move-result-object v0
- :goto_8
+ :goto_9
invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
move-result v1
- if-eqz v1, :cond_13
+ if-eqz v1, :cond_14
invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
@@ -1230,9 +1246,9 @@
invoke-interface {v1, v2}, Lcom/discord/panels/OverlappingPanelsLayout$PanelStateListener;->onPanelStateChange(Lcom/discord/panels/PanelState;)V
- goto :goto_8
+ goto :goto_9
- :cond_13
+ :cond_14
invoke-direct {p0, p1, p2}, Lcom/discord/panels/OverlappingPanelsLayout;->getEndPanelState(FF)Lcom/discord/panels/PanelState;
move-result-object p1
@@ -1245,12 +1261,12 @@
move-result-object p1
- :goto_9
+ :goto_a
invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
move-result p2
- if-eqz p2, :cond_14
+ if-eqz p2, :cond_15
invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
@@ -1262,20 +1278,13 @@
invoke-interface {p2, v0}, Lcom/discord/panels/OverlappingPanelsLayout$PanelStateListener;->onPanelStateChange(Lcom/discord/panels/PanelState;)V
- goto :goto_9
-
- :cond_14
- return-void
+ goto :goto_a
:cond_15
- invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
- throw v1
+ return-void
:cond_16
- const-string p1, "$this$setEnabledAlpha"
-
- invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+ invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
throw v1
@@ -1285,13 +1294,25 @@
throw v1
:cond_18
+ const-string p1, "$this$setEnabledAlpha"
+
+ invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+
+ throw v1
+
+ :cond_19
+ invoke-static {v4}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+ throw v1
+
+ :cond_1a
const-string p1, "endPanel"
invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
throw v1
- :cond_19
+ :cond_1b
const-string p1, "startPanel"
invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
diff --git a/com.discord/smali/com/discord/restapi/R$drawable.smali b/com.discord/smali/com/discord/restapi/R$drawable.smali
index 3a39a2150e..a9e1adee9f 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 = 0x7f0801f9
+.field public static final googleg_disabled_color_18:I = 0x7f0801f8
-.field public static final googleg_standard_color_18:I = 0x7f0801fa
+.field public static final googleg_standard_color_18:I = 0x7f0801f9
.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 5d23ee1dc6..6715d33523 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 = 0x7f0a025a
+.field public static final checkbox:I = 0x7f0a025f
-.field public static final checked:I = 0x7f0a025c
+.field public static final checked:I = 0x7f0a0261
-.field public static final chip:I = 0x7f0a025d
+.field public static final chip:I = 0x7f0a0262
-.field public static final chip1:I = 0x7f0a025e
+.field public static final chip1:I = 0x7f0a0263
-.field public static final chip2:I = 0x7f0a025f
+.field public static final chip2:I = 0x7f0a0264
-.field public static final chip3:I = 0x7f0a0260
+.field public static final chip3:I = 0x7f0a0265
-.field public static final chip_group:I = 0x7f0a0261
+.field public static final chip_group:I = 0x7f0a0266
-.field public static final chip_image:I = 0x7f0a0262
+.field public static final chip_image:I = 0x7f0a0267
-.field public static final chip_text:I = 0x7f0a0263
+.field public static final chip_text:I = 0x7f0a0268
-.field public static final chronometer:I = 0x7f0a0264
+.field public static final chronometer:I = 0x7f0a0269
-.field public static final circular:I = 0x7f0a0266
+.field public static final circular:I = 0x7f0a026b
-.field public static final clear_text:I = 0x7f0a0267
+.field public static final clear_text:I = 0x7f0a026c
-.field public static final column:I = 0x7f0a0270
+.field public static final column:I = 0x7f0a0275
-.field public static final column_reverse:I = 0x7f0a0271
+.field public static final column_reverse:I = 0x7f0a0276
-.field public static final confirm_button:I = 0x7f0a0272
+.field public static final confirm_button:I = 0x7f0a0277
-.field public static final container:I = 0x7f0a0283
+.field public static final container:I = 0x7f0a0288
-.field public static final content:I = 0x7f0a0284
+.field public static final content:I = 0x7f0a0289
-.field public static final contentPanel:I = 0x7f0a0285
+.field public static final contentPanel:I = 0x7f0a028a
-.field public static final coordinator:I = 0x7f0a0289
+.field public static final coordinator:I = 0x7f0a028e
-.field public static final custom:I = 0x7f0a02af
+.field public static final custom:I = 0x7f0a02b4
-.field public static final customPanel:I = 0x7f0a02b0
+.field public static final customPanel:I = 0x7f0a02b5
-.field public static final cut:I = 0x7f0a02b1
+.field public static final cut:I = 0x7f0a02b6
-.field public static final dark:I = 0x7f0a02b2
+.field public static final dark:I = 0x7f0a02b7
-.field public static final date_picker_actions:I = 0x7f0a02b4
+.field public static final date_picker_actions:I = 0x7f0a02b9
-.field public static final decor_content_parent:I = 0x7f0a02b8
+.field public static final decor_content_parent:I = 0x7f0a02bd
-.field public static final default_activity_button:I = 0x7f0a02b9
+.field public static final default_activity_button:I = 0x7f0a02be
-.field public static final design_bottom_sheet:I = 0x7f0a02bd
+.field public static final design_bottom_sheet:I = 0x7f0a02c2
-.field public static final design_menu_item_action_area:I = 0x7f0a02be
+.field public static final design_menu_item_action_area:I = 0x7f0a02c3
-.field public static final design_menu_item_action_area_stub:I = 0x7f0a02bf
+.field public static final design_menu_item_action_area_stub:I = 0x7f0a02c4
-.field public static final design_menu_item_text:I = 0x7f0a02c0
+.field public static final design_menu_item_text:I = 0x7f0a02c5
-.field public static final design_navigation_view:I = 0x7f0a02c1
+.field public static final design_navigation_view:I = 0x7f0a02c6
-.field public static final dialog_button:I = 0x7f0a02c7
+.field public static final dialog_button:I = 0x7f0a02cc
-.field public static final dropdown_menu:I = 0x7f0a02f2
+.field public static final dropdown_menu:I = 0x7f0a02f8
-.field public static final edit_query:I = 0x7f0a0317
+.field public static final edit_query:I = 0x7f0a031d
-.field public static final end:I = 0x7f0a0344
+.field public static final end:I = 0x7f0a034a
-.field public static final end_padder:I = 0x7f0a0345
+.field public static final end_padder:I = 0x7f0a034b
-.field public static final expand_activities_button:I = 0x7f0a0361
+.field public static final expand_activities_button:I = 0x7f0a0367
-.field public static final expanded_menu:I = 0x7f0a0362
+.field public static final expanded_menu:I = 0x7f0a0368
-.field public static final fade:I = 0x7f0a0380
+.field public static final fade:I = 0x7f0a0386
-.field public static final fill:I = 0x7f0a0395
+.field public static final fill:I = 0x7f0a039d
-.field public static final filled:I = 0x7f0a0398
+.field public static final filled:I = 0x7f0a03a0
-.field public static final fitBottomStart:I = 0x7f0a039c
+.field public static final fitBottomStart:I = 0x7f0a03a4
-.field public static final fitCenter:I = 0x7f0a039d
+.field public static final fitCenter:I = 0x7f0a03a5
-.field public static final fitEnd:I = 0x7f0a039e
+.field public static final fitEnd:I = 0x7f0a03a6
-.field public static final fitStart:I = 0x7f0a039f
+.field public static final fitStart:I = 0x7f0a03a7
-.field public static final fitXY:I = 0x7f0a03a1
+.field public static final fitXY:I = 0x7f0a03a9
-.field public static final fixed:I = 0x7f0a03a2
+.field public static final fixed:I = 0x7f0a03aa
-.field public static final flex_end:I = 0x7f0a03a5
+.field public static final flex_end:I = 0x7f0a03ad
-.field public static final flex_start:I = 0x7f0a03b6
+.field public static final flex_start:I = 0x7f0a03be
-.field public static final floating:I = 0x7f0a03b7
+.field public static final floating:I = 0x7f0a03bf
-.field public static final focusCrop:I = 0x7f0a03b9
+.field public static final focusCrop:I = 0x7f0a03c1
-.field public static final forever:I = 0x7f0a03be
+.field public static final forever:I = 0x7f0a03c6
-.field public static final fragment_container_view_tag:I = 0x7f0a03bf
+.field public static final fragment_container_view_tag:I = 0x7f0a03c7
-.field public static final ghost_view:I = 0x7f0a03da
+.field public static final ghost_view:I = 0x7f0a03e2
-.field public static final ghost_view_holder:I = 0x7f0a03db
+.field public static final ghost_view_holder:I = 0x7f0a03e3
-.field public static final gone:I = 0x7f0a0407
+.field public static final gone:I = 0x7f0a040f
-.field public static final group_divider:I = 0x7f0a0409
+.field public static final group_divider:I = 0x7f0a0411
-.field public static final home:I = 0x7f0a04b8
+.field public static final home:I = 0x7f0a04c0
-.field public static final icon:I = 0x7f0a04ca
+.field public static final icon:I = 0x7f0a04d2
-.field public static final icon_frame:I = 0x7f0a04cb
+.field public static final icon_frame:I = 0x7f0a04d3
-.field public static final icon_group:I = 0x7f0a04cc
+.field public static final icon_group:I = 0x7f0a04d4
-.field public static final icon_only:I = 0x7f0a04cd
+.field public static final icon_only:I = 0x7f0a04d5
-.field public static final image:I = 0x7f0a04d6
+.field public static final image:I = 0x7f0a04de
-.field public static final incoming:I = 0x7f0a04de
+.field public static final incoming:I = 0x7f0a04e6
-.field public static final info:I = 0x7f0a04ee
+.field public static final info:I = 0x7f0a04f6
-.field public static final italic:I = 0x7f0a0527
+.field public static final italic:I = 0x7f0a052f
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0565
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a056d
-.field public static final labeled:I = 0x7f0a056d
+.field public static final labeled:I = 0x7f0a0575
-.field public static final largeLabel:I = 0x7f0a056f
+.field public static final largeLabel:I = 0x7f0a0577
-.field public static final left:I = 0x7f0a057a
+.field public static final left:I = 0x7f0a0582
-.field public static final light:I = 0x7f0a057b
+.field public static final light:I = 0x7f0a0583
-.field public static final line1:I = 0x7f0a057c
+.field public static final line1:I = 0x7f0a0584
-.field public static final line3:I = 0x7f0a057d
+.field public static final line3:I = 0x7f0a0585
-.field public static final linear:I = 0x7f0a057e
+.field public static final linear:I = 0x7f0a0586
-.field public static final listMode:I = 0x7f0a0580
+.field public static final listMode:I = 0x7f0a0588
-.field public static final list_item:I = 0x7f0a0581
+.field public static final list_item:I = 0x7f0a0589
-.field public static final masked:I = 0x7f0a0591
+.field public static final masked:I = 0x7f0a0599
-.field public static final media_actions:I = 0x7f0a0597
+.field public static final media_actions:I = 0x7f0a059f
-.field public static final message:I = 0x7f0a05d4
+.field public static final message:I = 0x7f0a05dc
-.field public static final mini:I = 0x7f0a05d9
+.field public static final mini:I = 0x7f0a05e1
-.field public static final month_grid:I = 0x7f0a05db
+.field public static final month_grid:I = 0x7f0a05e3
-.field public static final month_navigation_bar:I = 0x7f0a05dc
+.field public static final month_navigation_bar:I = 0x7f0a05e4
-.field public static final month_navigation_fragment_toggle:I = 0x7f0a05dd
+.field public static final month_navigation_fragment_toggle:I = 0x7f0a05e5
-.field public static final month_navigation_next:I = 0x7f0a05de
+.field public static final month_navigation_next:I = 0x7f0a05e6
-.field public static final month_navigation_previous:I = 0x7f0a05df
+.field public static final month_navigation_previous:I = 0x7f0a05e7
-.field public static final month_title:I = 0x7f0a05e0
+.field public static final month_title:I = 0x7f0a05e8
-.field public static final mtrl_calendar_day_selector_frame:I = 0x7f0a05e1
+.field public static final mtrl_calendar_day_selector_frame:I = 0x7f0a05e9
-.field public static final mtrl_calendar_days_of_week:I = 0x7f0a05e2
+.field public static final mtrl_calendar_days_of_week:I = 0x7f0a05ea
-.field public static final mtrl_calendar_frame:I = 0x7f0a05e3
+.field public static final mtrl_calendar_frame:I = 0x7f0a05eb
-.field public static final mtrl_calendar_main_pane:I = 0x7f0a05e4
+.field public static final mtrl_calendar_main_pane:I = 0x7f0a05ec
-.field public static final mtrl_calendar_months:I = 0x7f0a05e5
+.field public static final mtrl_calendar_months:I = 0x7f0a05ed
-.field public static final mtrl_calendar_selection_frame:I = 0x7f0a05e6
+.field public static final mtrl_calendar_selection_frame:I = 0x7f0a05ee
-.field public static final mtrl_calendar_text_input_frame:I = 0x7f0a05e7
+.field public static final mtrl_calendar_text_input_frame:I = 0x7f0a05ef
-.field public static final mtrl_calendar_year_selector_frame:I = 0x7f0a05e8
+.field public static final mtrl_calendar_year_selector_frame:I = 0x7f0a05f0
-.field public static final mtrl_card_checked_layer_id:I = 0x7f0a05e9
+.field public static final mtrl_card_checked_layer_id:I = 0x7f0a05f1
-.field public static final mtrl_child_content_container:I = 0x7f0a05ea
+.field public static final mtrl_child_content_container:I = 0x7f0a05f2
-.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a05eb
+.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a05f3
-.field public static final mtrl_motion_snapshot_view:I = 0x7f0a05ec
+.field public static final mtrl_motion_snapshot_view:I = 0x7f0a05f4
-.field public static final mtrl_picker_fullscreen:I = 0x7f0a05ed
+.field public static final mtrl_picker_fullscreen:I = 0x7f0a05f5
-.field public static final mtrl_picker_header:I = 0x7f0a05ee
+.field public static final mtrl_picker_header:I = 0x7f0a05f6
-.field public static final mtrl_picker_header_selection_text:I = 0x7f0a05ef
+.field public static final mtrl_picker_header_selection_text:I = 0x7f0a05f7
-.field public static final mtrl_picker_header_title_and_selection:I = 0x7f0a05f0
+.field public static final mtrl_picker_header_title_and_selection:I = 0x7f0a05f8
-.field public static final mtrl_picker_header_toggle:I = 0x7f0a05f1
+.field public static final mtrl_picker_header_toggle:I = 0x7f0a05f9
-.field public static final mtrl_picker_text_input_date:I = 0x7f0a05f2
+.field public static final mtrl_picker_text_input_date:I = 0x7f0a05fa
-.field public static final mtrl_picker_text_input_range_end:I = 0x7f0a05f3
+.field public static final mtrl_picker_text_input_range_end:I = 0x7f0a05fb
-.field public static final mtrl_picker_text_input_range_start:I = 0x7f0a05f4
+.field public static final mtrl_picker_text_input_range_start:I = 0x7f0a05fc
-.field public static final mtrl_picker_title_text:I = 0x7f0a05f5
+.field public static final mtrl_picker_title_text:I = 0x7f0a05fd
-.field public static final multiply:I = 0x7f0a05f6
+.field public static final multiply:I = 0x7f0a05fe
-.field public static final navigation_header_container:I = 0x7f0a0608
+.field public static final navigation_header_container:I = 0x7f0a0610
-.field public static final none:I = 0x7f0a061d
+.field public static final none:I = 0x7f0a0625
-.field public static final normal:I = 0x7f0a061e
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0628
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0629
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a062a
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final nowrap:I = 0x7f0a062e
+.field public static final nowrap:I = 0x7f0a0636
-.field public static final off:I = 0x7f0a065e
+.field public static final off:I = 0x7f0a0666
-.field public static final on:I = 0x7f0a0662
+.field public static final on:I = 0x7f0a066a
-.field public static final outgoing:I = 0x7f0a0664
+.field public static final outgoing:I = 0x7f0a066c
-.field public static final outline:I = 0x7f0a0665
+.field public static final outline:I = 0x7f0a066d
-.field public static final parallax:I = 0x7f0a0675
+.field public static final parallax:I = 0x7f0a067d
-.field public static final parentPanel:I = 0x7f0a0677
+.field public static final parentPanel:I = 0x7f0a067f
-.field public static final parent_matrix:I = 0x7f0a0678
+.field public static final parent_matrix:I = 0x7f0a0680
-.field public static final password_toggle:I = 0x7f0a0686
+.field public static final password_toggle:I = 0x7f0a068e
-.field public static final pin:I = 0x7f0a06b3
+.field public static final pin:I = 0x7f0a06bb
-.field public static final progress_circular:I = 0x7f0a0722
+.field public static final progress_circular:I = 0x7f0a072a
-.field public static final progress_horizontal:I = 0x7f0a0725
+.field public static final progress_horizontal:I = 0x7f0a072d
-.field public static final radio:I = 0x7f0a0733
+.field public static final radio:I = 0x7f0a073b
-.field public static final recycler_view:I = 0x7f0a0739
+.field public static final recycler_view:I = 0x7f0a0741
-.field public static final right:I = 0x7f0a0755
+.field public static final right:I = 0x7f0a075d
-.field public static final right_icon:I = 0x7f0a0756
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0757
+.field public static final right_side:I = 0x7f0a075f
-.field public static final rounded:I = 0x7f0a077f
+.field public static final rounded:I = 0x7f0a0787
-.field public static final row:I = 0x7f0a0780
+.field public static final row:I = 0x7f0a0788
-.field public static final row_index_key:I = 0x7f0a0781
+.field public static final row_index_key:I = 0x7f0a0789
-.field public static final row_reverse:I = 0x7f0a0782
+.field public static final row_reverse:I = 0x7f0a078a
-.field public static final save_non_transition_alpha:I = 0x7f0a0783
+.field public static final save_non_transition_alpha:I = 0x7f0a078b
-.field public static final save_overlay_view:I = 0x7f0a0784
+.field public static final save_overlay_view:I = 0x7f0a078c
-.field public static final scale:I = 0x7f0a0785
+.field public static final scale:I = 0x7f0a078d
-.field public static final screen:I = 0x7f0a0787
+.field public static final screen:I = 0x7f0a078f
-.field public static final scrollIndicatorDown:I = 0x7f0a078b
+.field public static final scrollIndicatorDown:I = 0x7f0a0793
-.field public static final scrollIndicatorUp:I = 0x7f0a078c
+.field public static final scrollIndicatorUp:I = 0x7f0a0794
-.field public static final scrollView:I = 0x7f0a078d
+.field public static final scrollView:I = 0x7f0a0795
-.field public static final scrollable:I = 0x7f0a078f
+.field public static final scrollable:I = 0x7f0a0797
-.field public static final search_badge:I = 0x7f0a0790
+.field public static final search_badge:I = 0x7f0a0798
-.field public static final search_bar:I = 0x7f0a0791
+.field public static final search_bar:I = 0x7f0a0799
-.field public static final search_button:I = 0x7f0a0792
+.field public static final search_button:I = 0x7f0a079a
-.field public static final search_close_btn:I = 0x7f0a0793
+.field public static final search_close_btn:I = 0x7f0a079b
-.field public static final search_edit_frame:I = 0x7f0a0794
+.field public static final search_edit_frame:I = 0x7f0a079c
-.field public static final search_go_btn:I = 0x7f0a0796
+.field public static final search_go_btn:I = 0x7f0a079e
-.field public static final search_mag_icon:I = 0x7f0a0797
+.field public static final search_mag_icon:I = 0x7f0a079f
-.field public static final search_plate:I = 0x7f0a0798
+.field public static final search_plate:I = 0x7f0a07a0
-.field public static final search_src_text:I = 0x7f0a079b
+.field public static final search_src_text:I = 0x7f0a07a3
-.field public static final search_voice_btn:I = 0x7f0a07a7
+.field public static final search_voice_btn:I = 0x7f0a07af
-.field public static final seekbar:I = 0x7f0a07a8
+.field public static final seekbar:I = 0x7f0a07b0
-.field public static final seekbar_value:I = 0x7f0a07a9
+.field public static final seekbar_value:I = 0x7f0a07b1
-.field public static final select_dialog_listview:I = 0x7f0a07aa
+.field public static final select_dialog_listview:I = 0x7f0a07b2
-.field public static final selected:I = 0x7f0a07ab
+.field public static final selected:I = 0x7f0a07b3
-.field public static final shortcut:I = 0x7f0a0906
+.field public static final shortcut:I = 0x7f0a090e
-.field public static final slide:I = 0x7f0a090b
+.field public static final slide:I = 0x7f0a0913
-.field public static final smallLabel:I = 0x7f0a090c
+.field public static final smallLabel:I = 0x7f0a0914
-.field public static final snackbar_action:I = 0x7f0a090d
+.field public static final snackbar_action:I = 0x7f0a0915
-.field public static final snackbar_text:I = 0x7f0a090e
+.field public static final snackbar_text:I = 0x7f0a0916
-.field public static final space_around:I = 0x7f0a0912
+.field public static final space_around:I = 0x7f0a091a
-.field public static final space_between:I = 0x7f0a0913
+.field public static final space_between:I = 0x7f0a091b
-.field public static final space_evenly:I = 0x7f0a0914
+.field public static final space_evenly:I = 0x7f0a091c
-.field public static final spacer:I = 0x7f0a0915
+.field public static final spacer:I = 0x7f0a091d
-.field public static final spinner:I = 0x7f0a0918
+.field public static final spinner:I = 0x7f0a0920
-.field public static final split_action_bar:I = 0x7f0a0919
+.field public static final split_action_bar:I = 0x7f0a0921
-.field public static final src_atop:I = 0x7f0a091d
+.field public static final src_atop:I = 0x7f0a0925
-.field public static final src_in:I = 0x7f0a091e
+.field public static final src_in:I = 0x7f0a0926
-.field public static final src_over:I = 0x7f0a091f
+.field public static final src_over:I = 0x7f0a0927
-.field public static final standard:I = 0x7f0a0921
+.field public static final standard:I = 0x7f0a0929
-.field public static final start:I = 0x7f0a0922
+.field public static final start:I = 0x7f0a092a
-.field public static final status_bar_latest_event_content:I = 0x7f0a0926
+.field public static final status_bar_latest_event_content:I = 0x7f0a092e
-.field public static final stretch:I = 0x7f0a093b
+.field public static final stretch:I = 0x7f0a0943
-.field public static final submenuarrow:I = 0x7f0a093c
+.field public static final submenuarrow:I = 0x7f0a0944
-.field public static final submit_area:I = 0x7f0a093d
+.field public static final submit_area:I = 0x7f0a0945
-.field public static final switchWidget:I = 0x7f0a094a
+.field public static final switchWidget:I = 0x7f0a0953
-.field public static final tabMode:I = 0x7f0a094c
+.field public static final tabMode:I = 0x7f0a0955
-.field public static final tag_accessibility_actions:I = 0x7f0a095a
+.field public static final tag_accessibility_actions:I = 0x7f0a0963
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a095b
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0964
-.field public static final tag_accessibility_heading:I = 0x7f0a095c
+.field public static final tag_accessibility_heading:I = 0x7f0a0965
-.field public static final tag_accessibility_pane_title:I = 0x7f0a095d
+.field public static final tag_accessibility_pane_title:I = 0x7f0a0966
-.field public static final tag_screen_reader_focusable:I = 0x7f0a095e
+.field public static final tag_screen_reader_focusable:I = 0x7f0a0967
-.field public static final tag_transition_group:I = 0x7f0a095f
+.field public static final tag_transition_group:I = 0x7f0a0968
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0960
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a0969
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0961
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096a
-.field public static final test_checkbox_android_button_tint:I = 0x7f0a0968
+.field public static final test_checkbox_android_button_tint:I = 0x7f0a0971
-.field public static final test_checkbox_app_button_tint:I = 0x7f0a0969
+.field public static final test_checkbox_app_button_tint:I = 0x7f0a0972
-.field public static final test_radiobutton_android_button_tint:I = 0x7f0a096a
+.field public static final test_radiobutton_android_button_tint:I = 0x7f0a0973
-.field public static final test_radiobutton_app_button_tint:I = 0x7f0a096b
+.field public static final test_radiobutton_app_button_tint:I = 0x7f0a0974
-.field public static final text:I = 0x7f0a096c
+.field public static final text:I = 0x7f0a0975
-.field public static final text2:I = 0x7f0a096e
+.field public static final text2:I = 0x7f0a0977
-.field public static final textSpacerNoButtons:I = 0x7f0a0970
+.field public static final textSpacerNoButtons:I = 0x7f0a0979
-.field public static final textSpacerNoTitle:I = 0x7f0a0971
+.field public static final textSpacerNoTitle:I = 0x7f0a097a
-.field public static final text_input_end_icon:I = 0x7f0a0973
+.field public static final text_input_end_icon:I = 0x7f0a097c
-.field public static final text_input_start_icon:I = 0x7f0a0974
+.field public static final text_input_start_icon:I = 0x7f0a097d
-.field public static final textinput_counter:I = 0x7f0a0977
+.field public static final textinput_counter:I = 0x7f0a0980
-.field public static final textinput_error:I = 0x7f0a0978
+.field public static final textinput_error:I = 0x7f0a0981
-.field public static final textinput_helper_text:I = 0x7f0a0979
+.field public static final textinput_helper_text:I = 0x7f0a0982
-.field public static final textinput_placeholder:I = 0x7f0a097a
+.field public static final textinput_placeholder:I = 0x7f0a0983
-.field public static final textinput_prefix_text:I = 0x7f0a097b
+.field public static final textinput_prefix_text:I = 0x7f0a0984
-.field public static final textinput_suffix_text:I = 0x7f0a097c
+.field public static final textinput_suffix_text:I = 0x7f0a0985
-.field public static final time:I = 0x7f0a0982
+.field public static final time:I = 0x7f0a098b
-.field public static final title:I = 0x7f0a0983
+.field public static final title:I = 0x7f0a098c
-.field public static final titleDividerNoCustom:I = 0x7f0a0984
+.field public static final titleDividerNoCustom:I = 0x7f0a098d
-.field public static final title_template:I = 0x7f0a0985
+.field public static final title_template:I = 0x7f0a098e
-.field public static final top:I = 0x7f0a098a
+.field public static final top:I = 0x7f0a0994
-.field public static final topPanel:I = 0x7f0a098b
+.field public static final topPanel:I = 0x7f0a0995
-.field public static final touch_outside:I = 0x7f0a098d
+.field public static final touch_outside:I = 0x7f0a0997
-.field public static final transition_current_scene:I = 0x7f0a098e
+.field public static final transition_current_scene:I = 0x7f0a0998
-.field public static final transition_layout_save:I = 0x7f0a098f
+.field public static final transition_layout_save:I = 0x7f0a0999
-.field public static final transition_position:I = 0x7f0a0990
+.field public static final transition_position:I = 0x7f0a099a
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a0991
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a099b
-.field public static final transition_transform:I = 0x7f0a0992
+.field public static final transition_transform:I = 0x7f0a099c
-.field public static final unchecked:I = 0x7f0a09a1
+.field public static final unchecked:I = 0x7f0a09ab
-.field public static final uniform:I = 0x7f0a09a4
+.field public static final uniform:I = 0x7f0a09ae
-.field public static final unlabeled:I = 0x7f0a09a5
+.field public static final unlabeled:I = 0x7f0a09af
-.field public static final up:I = 0x7f0a09a6
+.field public static final up:I = 0x7f0a09b0
-.field public static final view_offset_helper:I = 0x7f0a0a29
+.field public static final view_offset_helper:I = 0x7f0a0a33
-.field public static final visible:I = 0x7f0a0a3d
+.field public static final visible:I = 0x7f0a0a47
-.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a3e
+.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a48
-.field public static final wide:I = 0x7f0a0a6c
+.field public static final wide:I = 0x7f0a0a76
-.field public static final withinBounds:I = 0x7f0a0aa3
+.field public static final withinBounds:I = 0x7f0a0aad
-.field public static final wrap:I = 0x7f0a0aa4
+.field public static final wrap:I = 0x7f0a0aae
-.field public static final wrap_content:I = 0x7f0a0aa5
+.field public static final wrap_content:I = 0x7f0a0aaf
-.field public static final wrap_reverse:I = 0x7f0a0aa6
+.field public static final wrap_reverse:I = 0x7f0a0ab0
-.field public static final zero_corner_chip:I = 0x7f0a0aab
+.field public static final zero_corner_chip:I = 0x7f0a0ab5
# 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 b0a9733b17..532e3ccf10 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 = 0x7f0d0102
+.field public static final view_chip_default:I = 0x7f0d0104
# 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 ca3eb0bf98..5987fec8af 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 = 0x7f1000b2
+.field public static final mtrl_badge_content_description:I = 0x7f1000b3
# 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 a77d290878..d13c9bc070 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 = 0x7f120417
+.field public static final character_counter_content_description:I = 0x7f12041a
-.field public static final character_counter_overflowed_content_description:I = 0x7f120418
+.field public static final character_counter_overflowed_content_description:I = 0x7f12041b
-.field public static final character_counter_pattern:I = 0x7f120419
+.field public static final character_counter_pattern:I = 0x7f12041c
-.field public static final chip_text:I = 0x7f120423
+.field public static final chip_text:I = 0x7f120426
-.field public static final clear_text_end_icon_content_description:I = 0x7f120430
+.field public static final clear_text_end_icon_content_description:I = 0x7f120433
-.field public static final common_google_play_services_enable_button:I = 0x7f12045f
+.field public static final common_google_play_services_enable_button:I = 0x7f120462
-.field public static final common_google_play_services_enable_text:I = 0x7f120460
+.field public static final common_google_play_services_enable_text:I = 0x7f120463
-.field public static final common_google_play_services_enable_title:I = 0x7f120461
+.field public static final common_google_play_services_enable_title:I = 0x7f120464
-.field public static final common_google_play_services_install_button:I = 0x7f120462
+.field public static final common_google_play_services_install_button:I = 0x7f120465
-.field public static final common_google_play_services_install_text:I = 0x7f120463
+.field public static final common_google_play_services_install_text:I = 0x7f120466
-.field public static final common_google_play_services_install_title:I = 0x7f120464
+.field public static final common_google_play_services_install_title:I = 0x7f120467
-.field public static final common_google_play_services_notification_channel_name:I = 0x7f120465
+.field public static final common_google_play_services_notification_channel_name:I = 0x7f120468
-.field public static final common_google_play_services_notification_ticker:I = 0x7f120466
+.field public static final common_google_play_services_notification_ticker:I = 0x7f120469
-.field public static final common_google_play_services_unknown_issue:I = 0x7f120467
+.field public static final common_google_play_services_unknown_issue:I = 0x7f12046a
-.field public static final common_google_play_services_unsupported_text:I = 0x7f120468
+.field public static final common_google_play_services_unsupported_text:I = 0x7f12046b
-.field public static final common_google_play_services_update_button:I = 0x7f120469
+.field public static final common_google_play_services_update_button:I = 0x7f12046c
-.field public static final common_google_play_services_update_text:I = 0x7f12046a
+.field public static final common_google_play_services_update_text:I = 0x7f12046d
-.field public static final common_google_play_services_update_title:I = 0x7f12046b
+.field public static final common_google_play_services_update_title:I = 0x7f12046e
-.field public static final common_google_play_services_updating_text:I = 0x7f12046c
+.field public static final common_google_play_services_updating_text:I = 0x7f12046f
-.field public static final common_google_play_services_wear_update_text:I = 0x7f12046d
+.field public static final common_google_play_services_wear_update_text:I = 0x7f120470
-.field public static final common_open_on_phone:I = 0x7f12046e
+.field public static final common_open_on_phone:I = 0x7f120471
-.field public static final common_signin_button_text:I = 0x7f12046f
+.field public static final common_signin_button_text:I = 0x7f120472
-.field public static final common_signin_button_text_long:I = 0x7f120470
+.field public static final common_signin_button_text_long:I = 0x7f120473
-.field public static final copy:I = 0x7f1204ce
+.field public static final copy:I = 0x7f1204d1
-.field public static final error_icon_content_description:I = 0x7f120643
+.field public static final error_icon_content_description:I = 0x7f120648
-.field public static final expand_button_title:I = 0x7f12067a
+.field public static final expand_button_title:I = 0x7f12067f
-.field public static final exposed_dropdown_menu_content_description:I = 0x7f120688
+.field public static final exposed_dropdown_menu_content_description:I = 0x7f12068d
-.field public static final fab_transformation_scrim_behavior:I = 0x7f120691
+.field public static final fab_transformation_scrim_behavior:I = 0x7f120696
-.field public static final fab_transformation_sheet_behavior:I = 0x7f120692
+.field public static final fab_transformation_sheet_behavior:I = 0x7f120697
-.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120bc0
+.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120bcc
-.field public static final icon_content_description:I = 0x7f120c4d
+.field public static final icon_content_description:I = 0x7f120c59
-.field public static final item_view_role_description:I = 0x7f120d6f
+.field public static final item_view_role_description:I = 0x7f120d7d
-.field public static final mtrl_badge_numberless_content_description:I = 0x7f120eef
+.field public static final mtrl_badge_numberless_content_description:I = 0x7f120f01
-.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120ef0
+.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120f02
-.field public static final mtrl_exceed_max_badge_number_content_description:I = 0x7f120ef1
+.field public static final mtrl_exceed_max_badge_number_content_description:I = 0x7f120f03
-.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120ef2
+.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120f04
-.field public static final mtrl_picker_a11y_next_month:I = 0x7f120ef3
+.field public static final mtrl_picker_a11y_next_month:I = 0x7f120f05
-.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120ef4
+.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120f06
-.field public static final mtrl_picker_announce_current_selection:I = 0x7f120ef5
+.field public static final mtrl_picker_announce_current_selection:I = 0x7f120f07
-.field public static final mtrl_picker_cancel:I = 0x7f120ef6
+.field public static final mtrl_picker_cancel:I = 0x7f120f08
-.field public static final mtrl_picker_confirm:I = 0x7f120ef7
+.field public static final mtrl_picker_confirm:I = 0x7f120f09
-.field public static final mtrl_picker_date_header_selected:I = 0x7f120ef8
+.field public static final mtrl_picker_date_header_selected:I = 0x7f120f0a
-.field public static final mtrl_picker_date_header_title:I = 0x7f120ef9
+.field public static final mtrl_picker_date_header_title:I = 0x7f120f0b
-.field public static final mtrl_picker_date_header_unselected:I = 0x7f120efa
+.field public static final mtrl_picker_date_header_unselected:I = 0x7f120f0c
-.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120efb
+.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120f0d
-.field public static final mtrl_picker_invalid_format:I = 0x7f120efc
+.field public static final mtrl_picker_invalid_format:I = 0x7f120f0e
-.field public static final mtrl_picker_invalid_format_example:I = 0x7f120efd
+.field public static final mtrl_picker_invalid_format_example:I = 0x7f120f0f
-.field public static final mtrl_picker_invalid_format_use:I = 0x7f120efe
+.field public static final mtrl_picker_invalid_format_use:I = 0x7f120f10
-.field public static final mtrl_picker_invalid_range:I = 0x7f120eff
+.field public static final mtrl_picker_invalid_range:I = 0x7f120f11
-.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120f00
+.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120f12
-.field public static final mtrl_picker_out_of_range:I = 0x7f120f01
+.field public static final mtrl_picker_out_of_range:I = 0x7f120f13
-.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120f02
+.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120f14
-.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120f03
+.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120f15
-.field public static final mtrl_picker_range_header_selected:I = 0x7f120f04
+.field public static final mtrl_picker_range_header_selected:I = 0x7f120f16
-.field public static final mtrl_picker_range_header_title:I = 0x7f120f05
+.field public static final mtrl_picker_range_header_title:I = 0x7f120f17
-.field public static final mtrl_picker_range_header_unselected:I = 0x7f120f06
+.field public static final mtrl_picker_range_header_unselected:I = 0x7f120f18
-.field public static final mtrl_picker_save:I = 0x7f120f07
+.field public static final mtrl_picker_save:I = 0x7f120f19
-.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120f08
+.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120f1a
-.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120f09
+.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120f1b
-.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120f0a
+.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120f1c
-.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120f0b
+.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120f1d
-.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120f0c
+.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120f1e
-.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120f0d
+.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120f1f
-.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120f0e
+.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120f20
-.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120f0f
+.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120f21
-.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120f10
+.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120f22
-.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120f11
+.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120f23
-.field public static final mtrl_slider_range_content_description:I = 0x7f120f12
+.field public static final mtrl_slider_range_content_description:I = 0x7f120f24
-.field public static final not_set:I = 0x7f120f95
+.field public static final not_set:I = 0x7f120fa9
-.field public static final password_toggle_content_description:I = 0x7f1210bc
+.field public static final password_toggle_content_description:I = 0x7f1210ce
-.field public static final path_password_eye:I = 0x7f1210be
+.field public static final path_password_eye:I = 0x7f1210d0
-.field public static final path_password_eye_mask_strike_through:I = 0x7f1210bf
+.field public static final path_password_eye_mask_strike_through:I = 0x7f1210d1
-.field public static final path_password_eye_mask_visible:I = 0x7f1210c0
+.field public static final path_password_eye_mask_visible:I = 0x7f1210d2
-.field public static final path_password_strike_through:I = 0x7f1210c1
+.field public static final path_password_strike_through:I = 0x7f1210d3
-.field public static final preference_copied:I = 0x7f121131
+.field public static final preference_copied:I = 0x7f121143
-.field public static final search_menu_title:I = 0x7f1213f4
+.field public static final search_menu_title:I = 0x7f121408
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214b2
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214ca
-.field public static final summary_collapsed_preference_list:I = 0x7f121515
+.field public static final summary_collapsed_preference_list:I = 0x7f12152d
-.field public static final v7_preference_off:I = 0x7f121741
+.field public static final v7_preference_off:I = 0x7f12175a
-.field public static final v7_preference_on:I = 0x7f121742
+.field public static final v7_preference_on:I = 0x7f12175b
# direct methods
diff --git a/com.discord/smali/com/discord/restapi/RestAPIBuilder.smali b/com.discord/smali/com/discord/restapi/RestAPIBuilder.smali
index 48254aabb6..b7e331e949 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 = 0x6
+.field public static final API_VERSION:I = 0x8
.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, "v6/"
+ const-string/jumbo v2, "v8/"
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 58ecf72505..fb0eb2e18c 100644
--- a/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPermissionOverwrites$Companion.smali
+++ b/com.discord/smali/com/discord/restapi/RestAPIParams$ChannelPermissionOverwrites$Companion.smali
@@ -38,12 +38,16 @@
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
@@ -52,7 +56,7 @@
move-object v4, p4
- 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
+ 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
return-object v6
.end method
@@ -62,12 +66,16 @@
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
@@ -76,7 +84,7 @@
move-object v4, p4
- 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
+ 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
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 6b4c1b6631..58c86f21c6 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/String;
+.field public final type:Ljava/lang/Integer;
# direct methods
@@ -49,12 +49,12 @@
return-void
.end method
-.method public constructor (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;)V
+.method public constructor (Ljava/lang/Integer;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/String;
+ iput-object p1, p0, Lcom/discord/restapi/RestAPIParams$ChannelPermissionOverwrites;->type:Ljava/lang/Integer;
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/String;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+.method public synthetic constructor (Ljava/lang/Integer;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/String;Ljava/lang/String;Ljava/lang/Long;Ljava/lang/Long;)V
+ 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
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 0db4d43077..c72aaec8cc 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;->n(Lo0/u;)Lokio/BufferedSink;
+ invoke-static {v0}, Lf/n/a/k/a;->o(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 6f2afa5ed4..2897732d7f 100644
--- a/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection.smali
+++ b/com.discord/smali/com/discord/rtcconnection/mediaengine/MediaEngineConnection.smali
@@ -49,9 +49,6 @@
.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 96dc11e090..251e584476 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, 0x7f1203d8
+ const v2, 0x7f1203da
: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, 0x7f1203d9
+ const v2, 0x7f1203db
if-eqz p5, :cond_3
@@ -618,19 +618,19 @@
const-string v4, "context.getString(R.string.change_log_md_body)"
- const v5, 0x7f1203d8
+ const v5, 0x7f1203da
const-string v6, "context.getString(R.string.change_log_md_video)"
- const v7, 0x7f1203dc
+ const v7, 0x7f1203de
const-string v8, "context.getString(R.string.change_log_md_revision)"
- const v9, 0x7f1203db
+ const v9, 0x7f1203dd
const-string v10, "context.getString(R.string.change_log_md_date)"
- const v11, 0x7f1203d9
+ const v11, 0x7f1203db
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 51f003bf7a..da9f57ab30 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;->O(Ljava/lang/CharSequence;III)I
+ invoke-static {p1, v2, v1, v2}, Lf/n/a/k/a;->P(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 4374d02aa8..7fc233be6b 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, 0x7f12153a
+ const v6, 0x7f121552
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 9a980f5c57..ae1ef7ff76 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, 0x7f1203c6
+ const p1, 0x7f1203c8
goto :goto_0
:cond_0
- const p1, 0x7f1203f2
+ const p1, 0x7f1203f4
: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 ba99b74b83..379d725d3d 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, 0x4c9
+ const/16 v0, 0x4d3
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 c658a7a482..cae01a144a 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;->v(Lkotlin/sequences/Sequence;Lkotlin/jvm/functions/Function1;)Lkotlin/sequences/Sequence;
+ invoke-static {p1, v0}, Lf/n/a/k/a;->w(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 82a7781432..df7d4e9c79 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;->u(Ljava/lang/Iterable;Lkotlin/jvm/functions/Function1;Z)Z
+ invoke-static {v1, v2, p1}, Lf/n/a/k/a;->v(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$handleNewConnection$1.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$1.smali
index fe8429f054..749a8252c5 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$1.smali
@@ -17,20 +17,9 @@
.end annotation
-# instance fields
-.field public final synthetic this$0:Lcom/discord/stores/StoreMediaEngine;
-
-
# direct methods
-.method public constructor (Lcom/discord/stores/StoreMediaEngine;)V
+.method public constructor ()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
@@ -111,30 +100,13 @@
.end method
.method public onDestroy(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
- .locals 1
+ .locals 0
- if-eqz p1, :cond_1
+ if-eqz p1, :cond_0
- 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
+ :cond_0
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$handleNewConnection$1$onDestroy$1.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine$handleVoiceChannelSelected$1.smali
similarity index 66%
rename from com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$1$onDestroy$1.smali
rename to com.discord/smali/com/discord/stores/StoreMediaEngine$handleVoiceChannelSelected$1.smali
index 71c1df8120..0d9d513f7e 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine$handleNewConnection$1$onDestroy$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine$handleVoiceChannelSelected$1.smali
@@ -1,4 +1,4 @@
-.class public final Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1$onDestroy$1;
+.class public final Lcom/discord/stores/StoreMediaEngine$handleVoiceChannelSelected$1;
.super Lj0/n/c/i;
.source "StoreMediaEngine.kt"
@@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1;->onDestroy(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;)V
+ value = Lcom/discord/stores/StoreMediaEngine;->handleVoiceChannelSelected(J)V
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
@@ -29,14 +29,14 @@
# instance fields
-.field public final synthetic this$0:Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1;
+.field public final synthetic this$0:Lcom/discord/stores/StoreMediaEngine;
# direct methods
-.method public constructor (Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1;)V
+.method public constructor (Lcom/discord/stores/StoreMediaEngine;)V
.locals 0
- iput-object p1, p0, Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1$onDestroy$1;->this$0:Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1;
+ iput-object p1, p0, Lcom/discord/stores/StoreMediaEngine$handleVoiceChannelSelected$1;->this$0:Lcom/discord/stores/StoreMediaEngine;
const/4 p1, 0x1
@@ -52,7 +52,7 @@
check-cast p1, [Lco/discord/media_engine/VideoInputDeviceDescription;
- invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1$onDestroy$1;->invoke([Lco/discord/media_engine/VideoInputDeviceDescription;)V
+ invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaEngine$handleVoiceChannelSelected$1;->invoke([Lco/discord/media_engine/VideoInputDeviceDescription;)V
sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
@@ -60,25 +60,23 @@
.end method
.method public final invoke([Lco/discord/media_engine/VideoInputDeviceDescription;)V
- .locals 7
+ .locals 6
if-eqz p1, :cond_0
- iget-object v0, p0, Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1$onDestroy$1;->this$0:Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1;
+ iget-object v0, p0, Lcom/discord/stores/StoreMediaEngine$handleVoiceChannelSelected$1;->this$0:Lcom/discord/stores/StoreMediaEngine;
- iget-object v1, v0, Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1;->this$0:Lcom/discord/stores/StoreMediaEngine;
+ const/4 v2, 0x0
const/4 v3, 0x0
- const/4 v4, 0x0
+ const/4 v4, 0x4
- const/4 v5, 0x4
+ const/4 v5, 0x0
- const/4 v6, 0x0
+ move-object v1, p1
- 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
+ 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
return-void
diff --git a/com.discord/smali/com/discord/stores/StoreMediaEngine.smali b/com.discord/smali/com/discord/stores/StoreMediaEngine.smali
index 980e14db6a..9eca9d826a 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaEngine.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaEngine.smali
@@ -369,14 +369,6 @@
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
@@ -597,7 +589,7 @@
new-instance v0, Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1;
- invoke-direct {v0, p0}, Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1;->(Lcom/discord/stores/StoreMediaEngine;)V
+ invoke-direct {v0}, Lcom/discord/stores/StoreMediaEngine$handleNewConnection$1;->()V
invoke-interface {p1, v0}, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection;->f(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$b;)V
@@ -1235,6 +1227,42 @@
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 5aa34f4403..e2b1a88703 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, 0x7f1204a5
+ const p1, 0x7f1204a8
goto :goto_0
@@ -70,7 +70,7 @@
if-eqz p2, :cond_1
- const p1, 0x7f1204a2
+ const p1, 0x7f1204a5
goto :goto_0
@@ -83,7 +83,7 @@
if-eqz p2, :cond_2
- const p1, 0x7f1204a1
+ const p1, 0x7f1204a4
goto :goto_0
@@ -96,7 +96,7 @@
if-eqz p2, :cond_3
- const p1, 0x7f1204a4
+ const p1, 0x7f1204a7
goto :goto_0
@@ -109,7 +109,7 @@
if-eqz p2, :cond_4
- const p1, 0x7f1204a9
+ const p1, 0x7f1204ac
goto :goto_0
@@ -122,7 +122,7 @@
if-eqz p2, :cond_5
- const p1, 0x7f1204a8
+ const p1, 0x7f1204ab
goto :goto_0
@@ -135,7 +135,7 @@
if-eqz p2, :cond_6
- const p1, 0x7f1204a3
+ const p1, 0x7f1204a6
goto :goto_0
@@ -148,7 +148,7 @@
if-eqz p1, :cond_7
- const p1, 0x7f1204a7
+ const p1, 0x7f1204aa
: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 301119831a..8ea1191f75 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, 0x7f121744
+ const v1, 0x7f12175d
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 428a905dc3..61fde4e75c 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 $localMessage:Lcom/discord/models/domain/ModelMessage;
+.field public final synthetic $invalidAttachmentsMessage: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;->$localMessage:Lcom/discord/models/domain/ModelMessage;
+ iput-object p2, p0, Lcom/discord/stores/StoreMessages$sendMessage$1;->$invalidAttachmentsMessage: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;->$localMessage:Lcom/discord/models/domain/ModelMessage;
+ iget-object v1, p0, Lcom/discord/stores/StoreMessages$sendMessage$1;->$invalidAttachmentsMessage:Lcom/discord/models/domain/ModelMessage;
- const-string v2, "localMessage"
+ const-string v2, "invalidAttachmentsMessage"
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 f194bdeaeb..7b8bf2504c 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$2.smali
@@ -29,24 +29,26 @@
.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;
+# static fields
+.field public static final INSTANCE:Lcom/discord/stores/StoreMessages$sendMessage$2;
# direct methods
-.method public constructor (Lcom/discord/stores/StoreMessages;JLkotlin/jvm/functions/Function1;)V
+.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
.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
@@ -65,7 +67,7 @@
.end method
.method public final call(Lrx/Emitter;)V
- .locals 3
+ .locals 1
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
@@ -75,27 +77,11 @@
}
.end annotation
- iget-object v0, p0, Lcom/discord/stores/StoreMessages$sendMessage$2;->this$0:Lcom/discord/stores/StoreMessages;
+ sget-object v0, Lcom/discord/utilities/messagesend/MessageResult$NoValidContent;->INSTANCE:Lcom/discord/utilities/messagesend/MessageResult$NoValidContent;
- iget-wide v1, p0, Lcom/discord/stores/StoreMessages$sendMessage$2;->$channelId:J
+ invoke-interface {p1, v0}, Lr0/g;->onNext(Ljava/lang/Object;)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
+ invoke-interface {p1}, Lr0/g;->onCompleted()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
new file mode 100644
index 0000000000..dc3111b814
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$3.smali
@@ -0,0 +1,76 @@
+.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
new file mode 100644
index 0000000000..b14f178abd
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreMessages$sendMessage$4.smali
@@ -0,0 +1,101 @@
+.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 4d4cdc860a..09deedcae7 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 7
+ .locals 5
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/16 :goto_1
+ goto :goto_1
:cond_1
instance-of v1, v0, Lcom/discord/utilities/messagesend/MessageResult$RateLimited;
if-eqz v1, :cond_2
- goto/16 :goto_1
+ goto :goto_1
:cond_2
instance-of v1, v0, Lcom/discord/utilities/messagesend/MessageResult$UserCancelled;
@@ -209,25 +209,11 @@
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-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
+ invoke-static {v1, v0}, Lcom/discord/stores/StoreMessages;->access$handleLocalMessageDelete(Lcom/discord/stores/StoreMessages;Lcom/discord/models/domain/ModelMessage;)V
goto :goto_1
@@ -287,7 +273,7 @@
goto :goto_0
:cond_4
- const v0, 0x7f120f34
+ const v0, 0x7f120f46
: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 cccedb071d..ce6d4bdf46 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,29 +32,25 @@
# instance fields
.field public final synthetic $activity:Lcom/discord/models/domain/activity/ModelActivity;
-.field public final synthetic $attachments:Ljava/util/List;
-
-.field public final synthetic $channelId:J
-
.field public final synthetic $localMessage:Lcom/discord/models/domain/ModelMessage;
+.field public final synthetic $validAttachments:Lkotlin/jvm/internal/Ref$ObjectRef;
+
.field public final synthetic this$0:Lcom/discord/stores/StoreMessages;
# direct methods
-.method public constructor (Lcom/discord/stores/StoreMessages;Lcom/discord/models/domain/ModelMessage;Ljava/util/List;Lcom/discord/models/domain/activity/ModelActivity;J)V
+.method public constructor (Lcom/discord/stores/StoreMessages;Lcom/discord/models/domain/ModelMessage;Lkotlin/jvm/internal/Ref$ObjectRef;Lcom/discord/models/domain/activity/ModelActivity;)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;->$attachments:Ljava/util/List;
+ iput-object p3, p0, Lcom/discord/stores/StoreMessages$sendMessage$request$1;->$validAttachments:Lkotlin/jvm/internal/Ref$ObjectRef;
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
@@ -86,7 +82,13 @@
invoke-static {v1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- iget-object v3, p0, Lcom/discord/stores/StoreMessages$sendMessage$request$1;->$attachments:Ljava/util/List;
+ 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 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 adaa5f8a26..dcafa0a087 100644
--- a/com.discord/smali/com/discord/stores/StoreMessages.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessages.smali
@@ -159,14 +159,6 @@
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
@@ -460,7 +452,7 @@
.end method
.method private final handleSendMessageFailure(Lcom/discord/models/domain/ModelMessage;Ljava/lang/String;)V
- .locals 12
+ .locals 13
.annotation runtime Lcom/discord/stores/StoreThread;
.end annotation
@@ -485,14 +477,35 @@
:cond_0
invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessages;->deleteMessage(Lcom/discord/models/domain/ModelMessage;)V
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->isHasLocalUploads()Z
+ 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
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
@@ -511,7 +524,9 @@
const/4 v7, 0x1
- const/4 v8, 0x0
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->isHasLocalUploads()Z
+
+ move-result v8
invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getApplication()Lcom/discord/models/domain/ModelApplication;
@@ -523,17 +538,14 @@
iget-object v11, p0, Lcom/discord/stores/StoreMessages;->clock:Lcom/discord/utilities/time/Clock;
- 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;
+ 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;
move-result-object v0
- goto :goto_0
-
- :cond_1
- move-object v0, v1
-
- :goto_0
- if-eqz p2, :cond_2
+ :goto_1
+ if-eqz p2, :cond_3
invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J
@@ -553,13 +565,15 @@
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 .. 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;
+ 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;
move-result-object v1
- :cond_2
+ :cond_3
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;
@@ -570,15 +584,15 @@
move-result p1
- if-eqz p1, :cond_3
+ if-eqz p1, :cond_4
- if-eqz v0, :cond_3
+ if-eqz v0, :cond_4
invoke-direct {p0, v0}, Lcom/discord/stores/StoreMessages;->handleLocalMessageCreate(Lcom/discord/models/domain/ModelMessage;)V
- goto :goto_1
+ goto :goto_2
- :cond_3
+ :cond_4
const/4 p1, 0x2
new-array p1, p1, [Lcom/discord/models/domain/ModelMessage;
@@ -601,12 +615,12 @@
xor-int/2addr p2, v0
- if-eqz p2, :cond_4
+ if-eqz p2, :cond_5
invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessages;->handleMessageCreate(Ljava/util/List;)V
- :cond_4
- :goto_1
+ :cond_5
+ :goto_2
return-void
.end method
@@ -1306,13 +1320,17 @@
.end method
.method public final resendMessage(Lcom/discord/models/domain/ModelMessage;)V
- .locals 13
+ .locals 20
- const/4 v12, 0x0
+ move-object/from16 v12, p0
- if-eqz p1, :cond_1
+ move-object/from16 v0, p1
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getType()I
+ const/4 v13, 0x0
+
+ if-eqz v0, :cond_3
+
+ invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getType()I
move-result v1
@@ -1323,19 +1341,19 @@
return-void
:cond_0
- iget-object v1, p0, Lcom/discord/stores/StoreMessages;->dispatcher:Lcom/discord/stores/Dispatcher;
+ iget-object v1, v12, Lcom/discord/stores/StoreMessages;->dispatcher:Lcom/discord/stores/Dispatcher;
new-instance v2, Lcom/discord/stores/StoreMessages$resendMessage$1;
- invoke-direct {v2, p0, p1}, Lcom/discord/stores/StoreMessages$resendMessage$1;->(Lcom/discord/stores/StoreMessages;Lcom/discord/models/domain/ModelMessage;)V
+ invoke-direct {v2, v12, v0}, 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 {p1}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J
+ invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J
move-result-wide v1
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
+ invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
move-result-object v3
@@ -1343,7 +1361,7 @@
invoke-static {v3, v4}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getContent()Ljava/lang/String;
+ invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getContent()Ljava/lang/String;
move-result-object v4
@@ -1351,12 +1369,79 @@
invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getMentions()Ljava/util/List;
+ invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getMentions()Ljava/util/List;
move-result-object v5
- sget-object v6, Lj0/i/n;->d:Lj0/i/n;
+ iget-object v0, v0, Lcom/discord/models/domain/ModelMessage;->localAttachments:Ljava/util/List;
+ 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
@@ -1367,7 +1452,7 @@
const/4 v11, 0x0
- move-object v0, p0
+ move-object/from16 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;
@@ -1381,7 +1466,7 @@
const/4 v2, 0x2
- invoke-static {v1, v12, v2}, Lf/a/b/q;->j(Ljava/lang/Class;Lrx/functions/Action1;I)Lrx/Observable$c;
+ invoke-static {v1, v13, v2}, Lf/a/b/q;->j(Ljava/lang/Class;Lrx/functions/Action1;I)Lrx/Observable$c;
move-result-object v1
@@ -1389,12 +1474,12 @@
return-void
- :cond_1
+ :cond_3
const-string v0, "message"
invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
- throw v12
+ throw v13
.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;
@@ -1423,112 +1508,339 @@
}
.end annotation
- move-object/from16 v7, p0
+ move-object/from16 v0, p0
- const/4 v0, 0x0
+ move-wide/from16 v12, p1
- if-eqz p3, :cond_3
+ move-object/from16 v4, p3
- if-eqz p4, :cond_2
+ move-object/from16 v1, p4
- const/4 v13, 0x0
+ move-object/from16 v2, p6
- const/4 v0, 0x1
+ sget-object v14, Lrx/Emitter$BackpressureMode;->e:Lrx/Emitter$BackpressureMode;
- if-eqz p6, :cond_0
+ 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
invoke-interface/range {p6 .. p6}, Ljava/util/Collection;->isEmpty()Z
- move-result v1
+ move-result v5
- xor-int/2addr v1, v0
-
- if-ne v1, v0, :cond_0
-
- const/4 v14, 0x1
+ if-eqz v5, :cond_0
goto :goto_0
:cond_0
- const/4 v0, 0x0
+ const/4 v5, 0x0
- const/4 v14, 0x0
+ goto :goto_1
+ :cond_1
:goto_0
- iget-object v0, v7, Lcom/discord/stores/StoreMessages;->clock:Lcom/discord/utilities/time/Clock;
+ const/4 v5, 0x1
- move-object/from16 v8, p4
+ :goto_1
+ if-nez v5, :cond_8
- move-wide/from16 v9, p1
+ sget-object v5, Lcom/discord/utilities/rest/ProcessedMessageContent;->Companion:Lcom/discord/utilities/rest/ProcessedMessageContent$Companion;
- move-object/from16 v11, p3
+ iget-object v9, v0, Lcom/discord/stores/StoreMessages;->context:Landroid/content/Context;
- move-object/from16 v12, p5
+ if-eqz v9, :cond_7
- move-object/from16 v15, p7
+ 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-object/from16 v16, p9
+ move-result-object v1
- 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;
+ invoke-virtual {v1}, Lcom/discord/utilities/rest/ProcessedMessageContent;->getInvalidAttachments()Ljava/util/List;
move-result-object v2
- if-nez p9, :cond_1
+ invoke-interface {v2}, Ljava/util/Collection;->isEmpty()Z
- iget-object v0, v7, Lcom/discord/stores/StoreMessages;->dispatcher:Lcom/discord/stores/Dispatcher;
+ move-result v5
- new-instance v1, Lcom/discord/stores/StoreMessages$sendMessage$1;
+ xor-int/2addr v5, v8
- invoke-direct {v1, v7, v2}, Lcom/discord/stores/StoreMessages$sendMessage$1;->(Lcom/discord/stores/StoreMessages;Lcom/discord/models/domain/ModelMessage;)V
+ if-eqz v5, :cond_3
- invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
+ iget-object v5, v0, Lcom/discord/stores/StoreMessages;->clock:Lcom/discord/utilities/time/Clock;
- :cond_1
- new-instance v8, Lcom/discord/stores/StoreMessages$sendMessage$request$1;
+ new-instance v9, Ljava/util/ArrayList;
- move-object v0, v8
+ invoke-static {v2, v6}, Lf/n/a/k/a;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I
- move-object/from16 v1, p0
+ move-result v10
- move-object/from16 v3, p6
+ invoke-direct {v9, v10}, Ljava/util/ArrayList;->(I)V
- move-object/from16 v4, p8
+ invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
- move-wide/from16 v5, p1
+ move-result-object v2
- 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
+ :goto_2
+ invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
- new-instance v0, Lcom/discord/stores/StoreMessages$sendMessage$2;
+ move-result v10
- move-wide/from16 v1, p1
+ if-eqz v10, :cond_2
- invoke-direct {v0, v7, v1, v2, v8}, Lcom/discord/stores/StoreMessages$sendMessage$2;->(Lcom/discord/stores/StoreMessages;JLkotlin/jvm/functions/Function1;)V
+ invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
- sget-object v1, Lrx/Emitter$BackpressureMode;->e:Lrx/Emitter$BackpressureMode;
+ move-result-object v10
- invoke-static {v0, v1}, Lrx/Observable;->n(Lrx/functions/Action1;Lrx/Emitter$BackpressureMode;)Lrx/Observable;
+ check-cast v10, Lcom/lytefast/flexinput/model/Attachment;
- move-result-object v0
+ invoke-static {v10}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->toLocalAttachment(Lcom/lytefast/flexinput/model/Attachment;)Lcom/discord/models/messages/LocalAttachment;
- const-string v1, "Observable.create({ emit\u2026r.BackpressureMode.ERROR)"
+ move-result-object v10
- invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-interface {v9, v10}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z
- return-object v0
+ goto :goto_2
: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 v0
+ throw v3
- :cond_3
+ :cond_e
const-string v1, "author"
invoke-static {v1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
- throw v0
+ throw v3
.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 5eb5362814..b257d2d6b5 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, 0x7f12049c
+ const v0, 0x7f12049f
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 bf6a8634f5..4875ecfbf3 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, 0x7f1204a0
+ const v0, 0x7f1204a3
const/4 v1, 0x2
@@ -69,7 +69,7 @@
const/4 v2, 0x0
- const v3, 0x7f1214bb
+ const v3, 0x7f1214d3
invoke-virtual {p1, v3}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
@@ -79,7 +79,7 @@
const/4 v2, 0x1
- const v3, 0x7f1215e6
+ const v3, 0x7f121601
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 f34d0a8a71..e6a046101f 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;->L(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;->M(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 ea3c8fedf2..4a532cb52f 100644
--- a/com.discord/smali/com/discord/stores/StoreStream.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream.smali
@@ -4345,55 +4345,10 @@
.end method
.method private final handlePresenceUpdate(JLcom/discord/models/domain/ModelPresence;)V
- .locals 8
+ .locals 1
.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
@@ -4743,6 +4698,10 @@
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 54ac5a90ed..a22ade7622 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, 0x7f120405
+ const v1, 0x7f120408
- const v7, 0x7f120405
+ const v7, 0x7f120408
goto :goto_0
:cond_0
- const v1, 0x7f1203c9
+ const v1, 0x7f1203cb
- const v7, 0x7f1203c9
+ const v7, 0x7f1203cb
: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 e0211c65ad..20fdebd4ce 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, 0x7f120405
+ const v7, 0x7f120408
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, 0x7f120405
+ const v8, 0x7f120408
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, 0x7f121433
+ const v6, 0x7f12144b
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, 0x7f121433
+ const v5, 0x7f12144b
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, 0x7f121433
+ const v6, 0x7f12144b
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 1810ea7f79..e6882408c1 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 11
+ .locals 9
const/4 v0, 0x0
@@ -136,17 +136,13 @@
const-wide/16 v5, 0x0
- const/4 v7, 0x0
+ const/16 v7, 0x1c
const/4 v8, 0x0
- const/16 v9, 0x7c
-
- const/4 v10, 0x0
-
move-object v0, p1
- 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
+ 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
iput-object p1, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
@@ -289,297 +285,285 @@
.end method
.method private final flattenPresence(J)V
- .locals 16
+ .locals 13
.annotation runtime Lcom/discord/stores/StoreThread;
.end annotation
- move-object/from16 v0, p0
+ 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/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;
+ invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
move-result-object v1
- check-cast v1, Ljava/util/Map;
+ invoke-virtual {v0, v1}, Ljava/util/HashMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
- const/4 v2, 0x0
+ move-result-object v0
- if-eqz v1, :cond_4
+ check-cast v0, Ljava/util/Map;
- invoke-interface {v1}, Ljava/util/Map;->values()Ljava/util/Collection;
+ const/4 v1, 0x0
- move-result-object v1
+ if-eqz v0, :cond_4
- if-eqz v1, :cond_4
+ invoke-interface {v0}, Ljava/util/Map;->values()Ljava/util/Collection;
- invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
+ move-result-object v0
- move-result-object v1
+ if-eqz v0, :cond_4
- invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+ invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
- move-result v3
+ move-result-object v0
- if-nez v3, :cond_0
+ invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
- move-object v3, v2
+ move-result v2
+
+ if-nez v2, :cond_0
+
+ move-object v2, v1
goto :goto_0
:cond_0
- invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+ invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
- move-result-object v3
+ move-result-object v2
- invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
+ invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
- move-result v4
+ move-result v3
- if-nez v4, :cond_1
+ if-nez v3, :cond_1
goto :goto_0
:cond_1
- move-object v4, v3
+ move-object v3, v2
- check-cast v4, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;
-
- invoke-virtual {v4}, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;->getTimestamp()J
-
- move-result-wide v4
-
- :cond_2
- invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
- move-result-object v6
-
- move-object v7, v6
-
- check-cast v7, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;
-
- invoke-virtual {v7}, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;->getTimestamp()J
-
- move-result-wide v7
-
- cmp-long v9, v4, v7
-
- if-gez v9, :cond_3
-
- move-object v3, v6
-
- move-wide v4, v7
-
- :cond_3
- invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
-
- move-result v6
-
- if-nez v6, :cond_2
-
- :goto_0
check-cast v3, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;
- if-eqz v3, :cond_4
+ invoke-virtual {v3}, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;->getTimestamp()J
- invoke-virtual {v3}, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;->getPresence()Lcom/discord/models/domain/ModelPresence;
+ move-result-wide v3
- move-result-object v1
+ :cond_2
+ invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+ move-result-object v5
+
+ move-object v6, v5
+
+ check-cast v6, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;
+
+ invoke-virtual {v6}, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;->getTimestamp()J
+
+ move-result-wide v6
+
+ cmp-long v8, v3, v6
+
+ if-gez v8, :cond_3
+
+ move-object v2, v5
+
+ move-wide v3, v6
+
+ :cond_3
+ invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+ move-result v5
+
+ if-nez v5, :cond_2
+
+ :goto_0
+ check-cast v2, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;
+
+ if-eqz v2, :cond_4
+
+ invoke-virtual {v2}, Lcom/discord/stores/StoreUserPresence$TimestampedPresence;->getPresence()Lcom/discord/models/domain/ModelPresence;
+
+ move-result-object v0
goto :goto_1
:cond_4
- move-object v1, v2
+ move-object v0, v1
:goto_1
- if-eqz v1, :cond_5
+ if-eqz v0, :cond_5
- invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence;->getStatus()Lcom/discord/models/domain/ModelPresence$Status;
+ invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getStatus()Lcom/discord/models/domain/ModelPresence$Status;
- move-result-object v3
+ move-result-object v2
- if-eqz v3, :cond_5
+ if-eqz v2, :cond_5
goto :goto_2
:cond_5
- sget-object v3, Lcom/discord/models/domain/ModelPresence$Status;->OFFLINE:Lcom/discord/models/domain/ModelPresence$Status;
+ sget-object v2, Lcom/discord/models/domain/ModelPresence$Status;->OFFLINE:Lcom/discord/models/domain/ModelPresence$Status;
:goto_2
- move-object v5, v3
+ move-object v4, v2
- if-eqz v1, :cond_6
+ if-eqz v0, :cond_6
- invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
+ 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;
move-result-object v3
- if-eqz v3, :cond_6
+ invoke-static {v2, v3}, Lj0/i/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List;
- sget-object v4, Lcom/discord/utilities/presence/PresenceUtils;->INSTANCE:Lcom/discord/utilities/presence/PresenceUtils;
+ move-result-object v2
- invoke-virtual {v4}, Lcom/discord/utilities/presence/PresenceUtils;->getACTIVITY_COMPARATOR$app_productionDiscordExternalRelease()Ljava/util/Comparator;
+ invoke-static {v2}, Lj0/i/l;->reversed(Ljava/lang/Iterable;)Ljava/util/List;
- move-result-object v4
+ move-result-object 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
+ move-object v5, v2
goto :goto_3
:cond_6
- move-object v6, v2
+ move-object v5, v1
:goto_3
- if-eqz v1, :cond_7
+ if-eqz v0, :cond_7
- invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence;->getClientStatuses()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
+ invoke-virtual {v0}, Lcom/discord/models/domain/ModelPresence;->getClientStatuses()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
- move-result-object v1
+ move-result-object v0
goto :goto_4
:cond_7
- move-object v1, v2
+ move-object v0, v1
:goto_4
- sget-object v3, Lcom/discord/models/domain/ModelPresence$Status;->OFFLINE:Lcom/discord/models/domain/ModelPresence$Status;
+ sget-object v2, Lcom/discord/models/domain/ModelPresence$Status;->OFFLINE:Lcom/discord/models/domain/ModelPresence$Status;
- const/4 v15, 0x1
+ const/4 v12, 0x1
- if-ne v5, v3, :cond_8
+ if-ne v4, v2, :cond_8
- iget-object v1, v0, Lcom/discord/stores/StoreUserPresence;->userGuildPresences:Ljava/util/HashMap;
+ iget-object v0, p0, 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;->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;
+ invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
move-result-object v1
- check-cast v1, Lcom/discord/models/domain/ModelPresence;
+ invoke-virtual {v0, v1}, Ljava/util/HashMap;->remove(Ljava/lang/Object;)Ljava/lang/Object;
- if-eqz v1, :cond_c
+ iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
- iput-boolean v15, v0, Lcom/discord/stores/StoreUserPresence;->isDirty:Z
+ 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
goto :goto_6
:cond_8
- iget-object v3, v0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
+ iget-object v2, p0, 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 v4
-
- invoke-virtual {v3, v4}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
move-result-object v3
- 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;
+ invoke-virtual {v2, v3}, Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;->get(Ljava/lang/Object;)Ljava/lang/Object;
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 v2, v5, :cond_a
+ if-ne v1, v4, :cond_a
- invoke-virtual {v3}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
+ invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
- move-result-object v2
+ move-result-object v1
- invoke-static {v2, v6}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+ invoke-static {v1, v5}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
- move-result v2
+ move-result v1
- xor-int/2addr v2, v15
+ xor-int/2addr v1, v12
- if-nez v2, :cond_a
+ if-nez v1, :cond_a
- invoke-virtual {v3}, Lcom/discord/models/domain/ModelPresence;->getClientStatuses()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
+ invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence;->getClientStatuses()Lcom/discord/models/domain/ModelPresence$ClientStatuses;
- move-result-object v2
+ move-result-object v1
- invoke-static {v2, v1}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+ invoke-static {v1, v0}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
- move-result v2
+ move-result v1
- xor-int/2addr v2, v15
+ xor-int/2addr v1, v12
- if-eqz v2, :cond_c
+ if-eqz v1, :cond_c
:cond_a
- iget-object v2, v0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
+ iget-object v1, p0, Lcom/discord/stores/StoreUserPresence;->presences:Lcom/discord/utilities/collections/SnowflakePartitionMap$CopiablePartitionMap;
- invoke-static/range {p1 .. p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+ invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
- move-result-object v3
+ move-result-object p1
- new-instance v14, Lcom/discord/models/domain/ModelPresence;
+ new-instance p2, Lcom/discord/models/domain/ModelPresence;
- if-eqz v1, :cond_b
+ if-eqz v0, :cond_b
goto :goto_5
:cond_b
- sget-object v1, 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 {v1}, 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 v1
+ move-result-object v0
:goto_5
- move-object v7, v1
+ move-object v6, v0
- const/4 v8, 0x0
+ const/4 v7, 0x0
- const-wide/16 v9, 0x0
+ const-wide/16 v8, 0x0
+
+ const/16 v10, 0x18
const/4 v11, 0x0
- const/4 v12, 0x0
+ move-object v3, p2
- const/16 v13, 0x78
+ 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/4 v1, 0x0
+ invoke-interface {v1, p1, p2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- 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
+ iput-boolean v12, p0, Lcom/discord/stores/StoreUserPresence;->isDirty:Z
:cond_c
:goto_6
@@ -887,7 +871,7 @@
.end method
.method private final updateSelfPresence(Lcom/discord/models/domain/ModelUserSettings;Ljava/util/List;Z)V
- .locals 17
+ .locals 12
.annotation runtime Lcom/discord/stores/StoreThread;
.end annotation
@@ -902,271 +886,251 @@
}
.end annotation
- move-object/from16 v0, p0
+ iget-object v0, p0, Lcom/discord/stores/StoreUserPresence;->meUser:Lcom/discord/models/domain/ModelUser;
- iget-object v1, v0, Lcom/discord/stores/StoreUserPresence;->meUser:Lcom/discord/models/domain/ModelUser;
+ if-eqz v0, :cond_a
- if-eqz v1, :cond_a
+ invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
- invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
-
- move-result-wide v1
+ move-result-wide v0
if-eqz p1, :cond_0
- invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserSettings;->getPresenceStatus()Lcom/discord/models/domain/ModelPresence$Status;
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelUserSettings;->getPresenceStatus()Lcom/discord/models/domain/ModelPresence$Status;
- move-result-object v3
+ move-result-object v2
- if-eqz v3, :cond_0
+ if-eqz v2, :cond_0
goto :goto_0
:cond_0
- 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;
+ iget-object v2, p0, 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
- const/4 v15, 0x1
+ :goto_0
+ const-string v3, "userSettings?.presenceSt\u2026 ?: localPresence.status"
- if-ne v3, v2, :cond_8
+ invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- iget-object v2, v0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
+ const/4 v3, 0x0
- invoke-virtual {v2}, Lcom/discord/models/domain/ModelPresence;->getActivities()Ljava/util/List;
+ if-eqz p2, :cond_3
- move-result-object v2
+ invoke-interface {p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
- invoke-static {v6, v2}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+ move-result-object p2
- move-result v2
+ :cond_1
+ invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
- xor-int/2addr v2, v15
+ move-result v4
- if-eqz v2, :cond_9
+ 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
:cond_8
- new-instance v2, Lcom/discord/models/domain/ModelPresence;
+ new-instance p1, Lcom/discord/models/domain/ModelPresence;
+
+ const/4 v6, 0x0
const/4 v7, 0x0
- const/4 v8, 0x0
+ const-wide/16 v8, 0x0
- const-wide/16 v9, 0x0
+ const/16 v10, 0x1c
const/4 v11, 0x0
- const/4 v12, 0x0
-
- const/16 v13, 0x7c
-
- const/4 v14, 0x0
+ move-object v3, p1
move-object v4, v2
- 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
- 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
+ iput-object p1, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
- iput-object v2, v0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
+ iget-object v1, p0, Lcom/discord/stores/StoreUserPresence;->localPresenceSubject:Lrx/subjects/SerializedSubject;
- iget-object v4, v0, Lcom/discord/stores/StoreUserPresence;->localPresenceSubject:Lrx/subjects/SerializedSubject;
+ iget-object v1, v1, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
- iget-object v4, v4, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+ invoke-virtual {v1, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
- invoke-virtual {v4, v2}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
-
- iput-boolean v15, v0, Lcom/discord/stores/StoreUserPresence;->isLocalPresenceDirty:Z
+ iput-boolean v0, p0, Lcom/discord/stores/StoreUserPresence;->isLocalPresenceDirty:Z
:cond_9
- const-wide v14, 0x7fffffffffffffffL
+ const-wide v0, 0x7fffffffffffffffL
- new-instance v2, Lcom/discord/models/domain/ModelPresence;
+ new-instance p1, Lcom/discord/models/domain/ModelPresence;
- const/4 v7, 0x0
+ const/4 v6, 0x0
- iget-object v8, v0, Lcom/discord/stores/StoreUserPresence;->meUser:Lcom/discord/models/domain/ModelUser;
+ iget-object v7, p0, Lcom/discord/stores/StoreUserPresence;->meUser:Lcom/discord/models/domain/ModelUser;
- const-wide/16 v9, 0x0
+ const-wide/16 v8, 0x0
+
+ const/16 v10, 0x14
const/4 v11, 0x0
- const/4 v12, 0x0
-
- const/16 v13, 0x74
-
- const/16 v16, 0x0
+ move-object v3, p1
move-object v4, v2
- move-object v5, v3
+ move-object v5, p2
- move-object v6, v1
+ 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-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
+ invoke-virtual {p0, v0, v1, p1}, Lcom/discord/stores/StoreUserPresence;->handlePresenceUpdate(JLcom/discord/models/domain/ModelPresence;)V
if-nez p3, :cond_a
- iget-object v1, v0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
+ iget-object p1, p0, Lcom/discord/stores/StoreUserPresence;->localPresence:Lcom/discord/models/domain/ModelPresence;
- invoke-virtual {v1}, Lcom/discord/models/domain/ModelPresence;->getCustomStatusActivity()Lcom/discord/models/domain/activity/ModelActivity;
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getCustomStatusActivity()Lcom/discord/models/domain/activity/ModelActivity;
- move-result-object v1
+ move-result-object p1
- if-nez v1, :cond_a
+ if-nez p1, :cond_a
- const/4 v1, 0x0
+ const/4 p1, 0x0
- iput-boolean v1, v0, Lcom/discord/stores/StoreUserPresence;->isLocalPresenceDirty:Z
+ iput-boolean p1, p0, Lcom/discord/stores/StoreUserPresence;->isLocalPresenceDirty:Z
:cond_a
return-void
@@ -1545,7 +1509,7 @@
.end method
.method public final handleGuildMemberRemove(Lcom/discord/models/domain/ModelGuildMember;)V
- .locals 14
+ .locals 12
.annotation runtime Lcom/discord/stores/StoreThread;
.end annotation
@@ -1555,7 +1519,7 @@
move-result-wide v0
- new-instance v13, Lcom/discord/models/domain/ModelPresence;
+ new-instance v11, Lcom/discord/models/domain/ModelPresence;
sget-object v3, Lcom/discord/models/domain/ModelPresence$Status;->OFFLINE:Lcom/discord/models/domain/ModelPresence$Status;
@@ -1569,19 +1533,15 @@
const-wide/16 v7, 0x0
- const/4 v9, 0x0
+ const/16 v9, 0x14
const/4 v10, 0x0
- const/16 v11, 0x74
+ move-object v2, v11
- const/4 v12, 0x0
+ 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
- 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
+ invoke-virtual {p0, v0, v1, v11}, Lcom/discord/stores/StoreUserPresence;->handlePresenceUpdate(JLcom/discord/models/domain/ModelPresence;)V
return-void
@@ -1897,7 +1857,7 @@
.end method
.method public final updateActivity(ILcom/discord/models/domain/activity/ModelActivity;Z)V
- .locals 12
+ .locals 10
.annotation runtime Lcom/discord/stores/StoreThread;
.end annotation
@@ -2018,17 +1978,13 @@
const-wide/16 v6, 0x0
- const/4 v8, 0x0
+ const/16 v8, 0x1c
const/4 v9, 0x0
- const/16 v10, 0x7c
-
- const/4 v11, 0x0
-
move-object v1, p1
- 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
+ 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
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 961f0f2546..012c5d7b3d 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, 0x7f121598
+ const v1, 0x7f1215b0
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -1865,7 +1865,7 @@
move-result-object p2
- const v0, 0x7f120de1
+ const v0, 0x7f120def
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -2262,7 +2262,7 @@
move-result-object v0
- const v1, 0x7f121598
+ const v1, 0x7f1215b0
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -2293,7 +2293,7 @@
move-result-object v0
- const v1, 0x7f121597
+ const v1, 0x7f1215af
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
new file mode 100644
index 0000000000..b1a5b35f37
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected$Companion.smali
@@ -0,0 +1,32 @@
+.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 c136df89d3..ca415dd2b0 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceChannelSelected.smali
@@ -9,11 +9,18 @@
# annotations
.annotation system Ldalvik/annotation/MemberClasses;
value = {
- Lcom/discord/stores/StoreVoiceChannelSelected$JoinVoiceChannelResult;
+ Lcom/discord/stores/StoreVoiceChannelSelected$JoinVoiceChannelResult;,
+ Lcom/discord/stores/StoreVoiceChannelSelected$Companion;
}
.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;
@@ -73,6 +80,20 @@
# 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 2e506535bd..bf8ad51c7f 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/1225"
+ const-string v4, "Discord-Android/1235"
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, 0x4c9
+ const/16 v2, 0x4d3
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -205,7 +205,7 @@
const-string v3, "client_version"
- const-string v4, "34.7"
+ const-string v4, "35.0"
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 1e45988b7f..c7bfb780f6 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 2
+ .locals 4
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
@@ -2779,6 +2779,10 @@
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
@@ -2797,6 +2801,28 @@
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
@@ -3435,6 +3461,53 @@
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
@@ -7009,124 +7082,6 @@
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
new file mode 100644
index 0000000000..948061f10a
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt$appendLinks$1.smali
@@ -0,0 +1,122 @@
+.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 d167db48f0..5f459a6aff 100644
--- a/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt.smali
+++ b/com.discord/smali/com/discord/utilities/attachments/AttachmentUtilsKt.smali
@@ -48,6 +48,187 @@
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
@@ -515,6 +696,51 @@
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
@@ -601,3 +827,52 @@
: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 1ea831ed88..372539e163 100644
--- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings.smali
+++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings.smali
@@ -7,12 +7,10 @@
.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 7
+ .locals 6
invoke-static {}, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->values()[Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
@@ -34,67 +32,67 @@
sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$0:[I
- sget-object v3, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->GUILD:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+ sget-object v1, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->GUILD:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
- const/4 v3, 0x2
+ const/4 v1, 0x2
- aput v3, v0, v2
+ aput v1, v0, v2
sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$0:[I
- sget-object v4, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->CHANNEL:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+ sget-object v3, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->CHANNEL:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
- const/4 v4, 0x3
+ 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
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;->USER:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+ sget-object v5, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->ROLE:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
- const/4 v5, 0x4
+ const/4 v5, 0x5
aput v5, v0, v4
sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$0:[I
- sget-object v6, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->ROLE:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+ sget-object v4, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->INVITE:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
- const/4 v6, 0x5
+ const/4 v4, 0x6
- aput v6, v0, v5
+ aput v4, v0, v5
sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$0:[I
- sget-object v5, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->INVITE:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+ sget-object v5, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->WEBHOOK:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
- const/4 v5, 0x6
+ const/4 v5, 0x7
- aput v5, v0, v6
+ aput v5, v0, v4
sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$0:[I
- sget-object v6, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->WEBHOOK:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+ sget-object v4, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->EMOJI:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
- const/4 v6, 0x7
+ const/16 v4, 0x8
- aput v6, v0, v5
+ aput v4, v0, v5
sget-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$0:[I
- sget-object v5, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->EMOJI:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
+ sget-object v5, Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;->INTEGRATION:Lcom/discord/models/domain/ModelAuditLogEntry$TargetType;
- const/16 v5, 0x8
+ const/16 v5, 0x9
- 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
+ aput v5, v0, v4
invoke-static {}, Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;->values()[Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;
@@ -106,41 +104,21 @@
sput-object v0, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils$WhenMappings;->$EnumSwitchMapping$1:[I
- sget-object v5, Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;->CREATE:Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;
+ sget-object v4, 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 v5, Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;->UPDATE:Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;
+ sget-object v2, Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;->UPDATE:Lcom/discord/models/domain/ModelAuditLogEntry$ActionType;
- aput v3, v0, v3
+ aput v1, v0, v1
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;
+ sget-object v1, 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
+ aput v3, v0, v3
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 9982d26b51..422c186ea4 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, 0x7f12099b
+ const v0, 0x7f1209a2
- const v1, 0x7f12099a
+ const v1, 0x7f1209a1
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, 0x7f120999
+ const v0, 0x7f1209a0
- const v1, 0x7f120998
+ const v1, 0x7f12099f
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, 0x7f12099e
+ const v0, 0x7f1209a5
- const v1, 0x7f12099d
+ const v1, 0x7f1209a4
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, 0x7f120997
+ const p1, 0x7f12099e
goto/16 :goto_1
@@ -1540,7 +1540,7 @@
if-nez p1, :cond_1
- const p1, 0x7f120991
+ const p1, 0x7f120998
goto :goto_1
@@ -1549,7 +1549,7 @@
if-ne p1, v0, :cond_2
- const p1, 0x7f120992
+ const p1, 0x7f120999
goto :goto_1
@@ -1578,9 +1578,9 @@
if-eqz v0, :cond_4
- const v0, 0x7f120990
+ const v0, 0x7f120997
- const v1, 0x7f12098f
+ const v1, 0x7f120996
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, 0x7f120996
+ const p1, 0x7f12099d
goto :goto_1
@@ -1610,9 +1610,9 @@
if-eqz v0, :cond_4
- const v0, 0x7f12098c
+ const v0, 0x7f120993
- const v1, 0x7f12098b
+ const v1, 0x7f120992
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, 0x7f1209a3
+ const p1, 0x7f1209aa
goto :goto_1
@@ -1693,9 +1693,9 @@
if-eqz v0, :cond_3
- const v0, 0x7f1209a7
+ const v0, 0x7f1209ae
- const v1, 0x7f1209a6
+ const v1, 0x7f1209ad
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, 0x7f1209a3
+ const p1, 0x7f1209aa
goto :goto_1
@@ -1877,7 +1877,7 @@
goto :goto_0
:cond_5
- const p1, 0x7f120f86
+ const p1, 0x7f120f98
invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1944,14 +1944,14 @@
if-ne p1, v5, :cond_1
- const v1, 0x7f1209ce
+ const v1, 0x7f1209d5
goto/16 :goto_0
:cond_1
if-nez p1, :cond_2
- const v1, 0x7f1209cd
+ const v1, 0x7f1209d4
goto/16 :goto_0
@@ -1980,7 +1980,7 @@
if-eqz p1, :cond_14
- const v1, 0x7f1209b9
+ const v1, 0x7f1209c0
goto/16 :goto_0
@@ -1993,9 +1993,9 @@
if-eqz v0, :cond_14
- const v0, 0x7f1209cc
+ const v0, 0x7f1209d3
- const v1, 0x7f1209cb
+ const v1, 0x7f1209d2
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, 0x7f1209c5
+ const v0, 0x7f1209cc
- const v1, 0x7f1209c4
+ const v1, 0x7f1209cb
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, 0x7f1209ae
+ const v1, 0x7f1209b5
goto/16 :goto_0
:cond_5
- const v1, 0x7f1209ad
+ const v1, 0x7f1209b4
goto/16 :goto_0
@@ -2077,9 +2077,9 @@
if-eqz v0, :cond_14
- const v0, 0x7f1209c3
+ const v0, 0x7f1209ca
- const v1, 0x7f1209c2
+ const v1, 0x7f1209c9
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, 0x7f1209b7
+ const v1, 0x7f1209be
goto/16 :goto_0
:cond_8
- const v1, 0x7f1209b6
+ const v1, 0x7f1209bd
goto/16 :goto_0
@@ -2142,9 +2142,9 @@
if-eqz v0, :cond_14
- const v0, 0x7f1209bd
+ const v0, 0x7f1209c4
- const v1, 0x7f1209bc
+ const v1, 0x7f1209c3
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, 0x7f1209be
+ const v1, 0x7f1209c5
goto/16 :goto_0
@@ -2174,7 +2174,7 @@
if-eqz p1, :cond_14
- const v1, 0x7f1209b8
+ const v1, 0x7f1209bf
goto/16 :goto_0
@@ -2187,7 +2187,7 @@
if-eqz p1, :cond_14
- const v1, 0x7f1209ab
+ const v1, 0x7f1209b2
goto/16 :goto_0
@@ -2231,27 +2231,27 @@
goto/16 :goto_0
:cond_a
- const v1, 0x7f1209ca
+ const v1, 0x7f1209d1
goto/16 :goto_0
:cond_b
- const v1, 0x7f1209c6
+ const v1, 0x7f1209cd
goto/16 :goto_0
:cond_c
- const v1, 0x7f1209c8
+ const v1, 0x7f1209cf
goto/16 :goto_0
:cond_d
- const v1, 0x7f1209c7
+ const v1, 0x7f1209ce
goto/16 :goto_0
:cond_e
- const v1, 0x7f1209c9
+ const v1, 0x7f1209d0
goto/16 :goto_0
@@ -2271,7 +2271,7 @@
if-eqz p1, :cond_14
- const v1, 0x7f1209bb
+ const v1, 0x7f1209c2
goto/16 :goto_0
@@ -2284,7 +2284,7 @@
if-eqz p1, :cond_14
- const v1, 0x7f1209a3
+ const v1, 0x7f1209aa
goto/16 :goto_0
@@ -2297,9 +2297,9 @@
if-eqz v0, :cond_14
- const v0, 0x7f1209c0
+ const v0, 0x7f1209c7
- const v1, 0x7f1209bf
+ const v1, 0x7f1209c6
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, 0x7f1209b5
+ const v1, 0x7f1209bc
goto :goto_0
@@ -2329,9 +2329,9 @@
if-eqz v0, :cond_14
- const v0, 0x7f1209aa
+ const v0, 0x7f1209b1
- const v1, 0x7f1209a9
+ const v1, 0x7f1209b0
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, 0x7f1209b2
+ const v1, 0x7f1209b9
goto :goto_0
:cond_11
- const v1, 0x7f1209b4
+ const v1, 0x7f1209bb
goto :goto_0
:cond_12
- const v1, 0x7f1209b3
+ const v1, 0x7f1209ba
goto :goto_0
@@ -2401,7 +2401,7 @@
if-eqz p1, :cond_14
- const v1, 0x7f1209ac
+ const v1, 0x7f1209b3
:cond_14
:goto_0
@@ -2476,7 +2476,7 @@
if-eqz p1, :cond_a
- const v1, 0x7f1209d5
+ const v1, 0x7f1209dc
goto :goto_0
@@ -2510,12 +2510,12 @@
goto :goto_0
:cond_3
- const v1, 0x7f1209d3
+ const v1, 0x7f1209da
goto :goto_0
:cond_4
- const v1, 0x7f1209d4
+ const v1, 0x7f1209db
goto :goto_0
@@ -2551,14 +2551,14 @@
if-ne p1, v4, :cond_7
- const v1, 0x7f1209d2
+ const v1, 0x7f1209d9
goto :goto_0
:cond_7
if-nez p1, :cond_8
- const v1, 0x7f1209d1
+ const v1, 0x7f1209d8
goto :goto_0
@@ -2632,14 +2632,14 @@
if-ne p1, v0, :cond_1
- const p1, 0x7f1209e0
+ const p1, 0x7f1209e7
goto/16 :goto_1
:cond_1
if-nez p1, :cond_2
- const p1, 0x7f1209df
+ const p1, 0x7f1209e6
goto/16 :goto_1
@@ -2684,12 +2684,12 @@
if-eqz p1, :cond_4
- const p1, 0x7f1209db
+ const p1, 0x7f1209e2
goto :goto_1
:cond_4
- const p1, 0x7f1209dc
+ const p1, 0x7f1209e3
goto :goto_1
@@ -2725,12 +2725,12 @@
if-eqz p1, :cond_6
- const p1, 0x7f1209dd
+ const p1, 0x7f1209e4
goto :goto_1
:cond_6
- const p1, 0x7f1209de
+ const p1, 0x7f1209e5
goto :goto_1
@@ -2750,7 +2750,7 @@
if-eqz p1, :cond_8
- const p1, 0x7f1209d8
+ const p1, 0x7f1209df
goto :goto_1
@@ -2763,7 +2763,7 @@
if-eqz p1, :cond_8
- const p1, 0x7f1209a3
+ const p1, 0x7f1209aa
goto :goto_1
@@ -2776,7 +2776,7 @@
if-eqz p1, :cond_8
- const p1, 0x7f1209d7
+ const p1, 0x7f1209de
goto :goto_1
@@ -3011,7 +3011,7 @@
move-result-object v0
- if-eqz v0, :cond_a
+ if-eqz v0, :cond_b
check-cast v0, Ljava/util/Collection;
@@ -3023,7 +3023,11 @@
if-eqz v1, :cond_0
- invoke-virtual {v1}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getType()Lcom/discord/models/domain/ModelAuditLogEntry$OptionType;
+ 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;
move-result-object v1
@@ -3042,33 +3046,12 @@
goto :goto_1
:cond_1
- invoke-virtual {v1}, Ljava/lang/Enum;->ordinal()I
+ invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
- move-result v1
+ move-result v5
- if-eqz v1, :cond_3
+ if-ne v5, v4, :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;
@@ -3077,13 +3060,13 @@
check-cast p4, Ljava/util/Map;
- if-eqz p4, :cond_5
+ if-eqz p4, :cond_6
invoke-virtual {p3}, Lcom/discord/models/domain/ModelAuditLogEntry;->getOptions()Lcom/discord/models/domain/ModelAuditLogEntry$Options;
move-result-object p3
- if-eqz p3, :cond_4
+ if-eqz p3, :cond_2
invoke-virtual {p3}, Lcom/discord/models/domain/ModelAuditLogEntry$Options;->getId()J
@@ -3093,7 +3076,7 @@
move-result-object v2
- :cond_4
+ :cond_2
invoke-interface {p4, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
move-result-object p3
@@ -3102,17 +3085,48 @@
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_6
+ if-nez p2, :cond_7
- goto/16 :goto_3
+ goto/16 :goto_4
- :cond_6
+ :cond_7
invoke-virtual {p2}, Ljava/lang/String;->hashCode()I
move-result p3
@@ -3127,24 +3141,24 @@
const/4 v7, 0x0
- if-eq p3, p4, :cond_8
+ if-eq p3, p4, :cond_9
const p4, 0x589a349
- if-eq p3, p4, :cond_7
+ if-eq p3, p4, :cond_8
- goto :goto_3
+ goto :goto_4
- :cond_7
+ :cond_8
const-string p3, "allow"
invoke-virtual {p2, p3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
move-result p2
- if-eqz p2, :cond_9
+ if-eqz p2, :cond_a
- const p2, 0x7f120997
+ const p2, 0x7f12099e
new-array p3, v6, [Ljava/lang/Object;
@@ -3186,18 +3200,18 @@
invoke-static {v3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- goto :goto_3
+ goto :goto_4
- :cond_8
+ :cond_9
const-string p3, "deny"
invoke-virtual {p2, p3}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
move-result p2
- if-eqz p2, :cond_9
+ if-eqz p2, :cond_a
- const p2, 0x7f120996
+ const p2, 0x7f12099d
new-array p3, v6, [Ljava/lang/Object;
@@ -3239,11 +3253,11 @@
invoke-static {v3, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- :cond_9
- :goto_3
+ :cond_a
+ :goto_4
return-object v3
- :cond_a
+ :cond_b
new-instance p1, Lkotlin/TypeCastException;
const-string p2, "null cannot be cast to non-null type kotlin.collections.Collection<*>"
@@ -3253,13 +3267,13 @@
throw p1
.end method
-.method private final getPermissionBits(I)Ljava/util/HashSet;
- .locals 4
+.method private final getPermissionBits(J)Ljava/util/HashSet;
+ .locals 7
.annotation system Ldalvik/annotation/Signature;
value = {
- "(I)",
+ "(J)",
"Ljava/util/HashSet<",
- "Ljava/lang/Integer;",
+ "Ljava/lang/Long;",
">;"
}
.end annotation
@@ -3271,19 +3285,21 @@
const/4 v1, 0x0
:goto_0
- const/16 v2, 0x1f
+ const/16 v2, 0x3f
if-gt v1, v2, :cond_1
- const/4 v2, 0x1
+ const-wide/16 v2, 0x1
- shl-int/2addr v2, v1
+ shl-long/2addr v2, v1
- and-int v3, p1, v2
+ and-long v4, p1, v2
- if-ne v3, v2, :cond_0
+ cmp-long v6, v4, v2
- invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+ if-nez v6, :cond_0
+
+ invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
move-result-object v2
@@ -3564,14 +3580,14 @@
if-ne p1, v3, :cond_1
- const p1, 0x7f1209ff
+ const p1, 0x7f120a06
goto/16 :goto_1
:cond_1
if-nez p1, :cond_2
- const p1, 0x7f1209fe
+ const p1, 0x7f120a05
goto/16 :goto_1
@@ -3616,12 +3632,12 @@
if-nez p1, :cond_4
- const p1, 0x7f1209fb
+ const p1, 0x7f120a02
goto/16 :goto_1
:cond_4
- const p1, 0x7f1209f9
+ const p1, 0x7f120a00
goto/16 :goto_1
@@ -3643,7 +3659,7 @@
if-eqz p1, :cond_9
- const p1, 0x7f120a05
+ const p1, 0x7f120a0c
goto :goto_1
@@ -3670,14 +3686,14 @@
if-ne p1, v3, :cond_6
- const p1, 0x7f120a01
+ const p1, 0x7f120a08
goto :goto_1
:cond_6
if-nez p1, :cond_7
- const p1, 0x7f120a00
+ const p1, 0x7f120a07
goto :goto_1
@@ -3704,9 +3720,9 @@
if-eqz v0, :cond_9
- const v0, 0x7f120a03
+ const v0, 0x7f120a0a
- const v1, 0x7f120a02
+ const v1, 0x7f120a09
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
@@ -3723,7 +3739,7 @@
if-eqz p1, :cond_9
- const p1, 0x7f120a04
+ const p1, 0x7f120a0b
goto :goto_1
@@ -3736,7 +3752,7 @@
if-eqz p1, :cond_9
- const p1, 0x7f1209a3
+ const p1, 0x7f1209aa
goto :goto_1
@@ -3772,7 +3788,7 @@
if-nez v2, :cond_0
- const p1, 0x7f1204f5
+ const p1, 0x7f1204f9
goto/16 :goto_0
@@ -3783,7 +3799,7 @@
if-nez v2, :cond_1
- const p1, 0x7f120dd5
+ const p1, 0x7f120de3
goto/16 :goto_0
@@ -3824,12 +3840,12 @@
if-ne p1, p2, :cond_4
- const p1, 0x7f120e5c
+ const p1, 0x7f120e6b
goto/16 :goto_0
:cond_4
- const p1, 0x7f120e5e
+ const p1, 0x7f120e6d
goto/16 :goto_0
@@ -3840,7 +3856,7 @@
if-nez p3, :cond_6
- const p1, 0x7f120e6a
+ const p1, 0x7f120e79
goto/16 :goto_0
@@ -3851,7 +3867,7 @@
if-nez p3, :cond_7
- const p1, 0x7f1203dd
+ const p1, 0x7f1203df
goto/16 :goto_0
@@ -3862,7 +3878,7 @@
if-nez p3, :cond_8
- const p1, 0x7f120e64
+ const p1, 0x7f120e73
goto/16 :goto_0
@@ -3873,7 +3889,7 @@
if-nez p3, :cond_9
- const p1, 0x7f120e68
+ const p1, 0x7f120e77
goto/16 :goto_0
@@ -3884,7 +3900,7 @@
if-nez p3, :cond_a
- const p1, 0x7f120e6e
+ const p1, 0x7f120e7d
goto/16 :goto_0
@@ -3895,7 +3911,7 @@
if-nez p3, :cond_b
- const p1, 0x7f120e60
+ const p1, 0x7f120e6f
goto/16 :goto_0
@@ -3906,7 +3922,7 @@
if-nez p3, :cond_c
- const p1, 0x7f121787
+ const p1, 0x7f1217a0
goto/16 :goto_0
@@ -3917,7 +3933,7 @@
if-nez p3, :cond_d
- const p1, 0x7f1212eb
+ const p1, 0x7f1212fc
goto/16 :goto_0
@@ -3928,7 +3944,7 @@
if-nez p3, :cond_e
- const p1, 0x7f12141f
+ const p1, 0x7f121433
goto/16 :goto_0
@@ -3939,7 +3955,7 @@
if-nez p3, :cond_f
- const p1, 0x7f121421
+ const p1, 0x7f121435
goto/16 :goto_0
@@ -3950,7 +3966,7 @@
if-nez p3, :cond_10
- const p1, 0x7f120e61
+ const p1, 0x7f120e70
goto/16 :goto_0
@@ -3961,7 +3977,7 @@
if-nez p3, :cond_11
- const p1, 0x7f1205ea
+ const p1, 0x7f1205ef
goto/16 :goto_0
@@ -3983,7 +3999,7 @@
if-nez p3, :cond_13
- const p1, 0x7f1212ea
+ const p1, 0x7f1212fb
goto/16 :goto_0
@@ -3994,7 +4010,7 @@
if-nez p3, :cond_14
- const p1, 0x7f120ea6
+ const p1, 0x7f120eb5
goto/16 :goto_0
@@ -4005,7 +4021,7 @@
if-nez p3, :cond_15
- const p1, 0x7f121685
+ const p1, 0x7f12169e
goto :goto_0
@@ -4027,7 +4043,7 @@
if-nez p3, :cond_17
- const p1, 0x7f120484
+ const p1, 0x7f120487
goto :goto_0
@@ -4038,7 +4054,7 @@
if-nez p3, :cond_18
- const p1, 0x7f121494
+ const p1, 0x7f1214ac
goto :goto_0
@@ -4049,7 +4065,7 @@
if-nez p3, :cond_19
- const p1, 0x7f120f1e
+ const p1, 0x7f120f30
goto :goto_0
@@ -4060,7 +4076,7 @@
if-nez p3, :cond_1a
- const p1, 0x7f120553
+ const p1, 0x7f120557
goto :goto_0
@@ -4071,7 +4087,7 @@
if-nez p3, :cond_1b
- const p1, 0x7f120eeb
+ const p1, 0x7f120efd
goto :goto_0
@@ -4082,7 +4098,7 @@
if-nez p3, :cond_1c
- const p1, 0x7f121689
+ const p1, 0x7f1216a2
goto :goto_0
@@ -4093,7 +4109,7 @@
if-nez p3, :cond_1d
- const p1, 0x7f121280
+ const p1, 0x7f121292
goto :goto_0
@@ -4104,7 +4120,7 @@
if-nez p3, :cond_1e
- const p1, 0x7f121777
+ const p1, 0x7f121790
goto :goto_0
@@ -4216,7 +4232,7 @@
if-eqz p1, :cond_7
- const p1, 0x7f1209f3
+ const p1, 0x7f1209fa
goto/16 :goto_1
@@ -4229,19 +4245,19 @@
if-eqz v0, :cond_7
- const v0, 0x7f1209ec
+ const v0, 0x7f1209f3
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
move-result-object v3
- const v0, 0x7f1209ed
+ const v0, 0x7f1209f4
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
move-result-object v4
- const v0, 0x7f1209ee
+ const v0, 0x7f1209f5
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -4286,14 +4302,14 @@
if-ne p1, v3, :cond_1
- const p1, 0x7f1209eb
+ const p1, 0x7f1209f2
goto :goto_1
:cond_1
if-nez p1, :cond_2
- const p1, 0x7f1209ea
+ const p1, 0x7f1209f1
goto :goto_1
@@ -4334,14 +4350,14 @@
if-ne p1, v3, :cond_4
- const p1, 0x7f1209e6
+ const p1, 0x7f1209ed
goto :goto_1
:cond_4
if-nez p1, :cond_5
- const p1, 0x7f1209e5
+ const p1, 0x7f1209ec
goto :goto_1
@@ -4368,7 +4384,7 @@
if-eqz p1, :cond_7
- const p1, 0x7f1209f2
+ const p1, 0x7f1209f9
goto :goto_1
@@ -4381,7 +4397,7 @@
if-eqz p1, :cond_7
- const p1, 0x7f1209a3
+ const p1, 0x7f1209aa
goto :goto_1
@@ -4394,7 +4410,7 @@
if-eqz p1, :cond_7
- const p1, 0x7f1209f0
+ const p1, 0x7f1209f7
goto :goto_1
@@ -4448,7 +4464,7 @@
if-eqz p1, :cond_1
- const p1, 0x7f120a09
+ const p1, 0x7f120a10
goto :goto_1
@@ -4461,9 +4477,9 @@
if-eqz v0, :cond_1
- const v0, 0x7f120a0f
+ const v0, 0x7f120a16
- const v1, 0x7f120a0e
+ const v1, 0x7f120a15
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
@@ -4480,7 +4496,7 @@
if-eqz p1, :cond_1
- const p1, 0x7f1209a3
+ const p1, 0x7f1209aa
goto :goto_1
@@ -4493,9 +4509,9 @@
if-eqz v0, :cond_1
- const v0, 0x7f120a0b
+ const v0, 0x7f120a12
- const v1, 0x7f120a0a
+ const v1, 0x7f120a11
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
@@ -5121,7 +5137,7 @@
.end method
.method private final transformPermissionChange(Lcom/discord/models/domain/ModelAuditLogEntry$Change;)Ljava/util/List;
- .locals 8
+ .locals 13
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
@@ -5137,7 +5153,7 @@
move-result-object v0
- instance-of v1, v0, Ljava/lang/Long;
+ instance-of v1, v0, Ljava/lang/String;
const/4 v2, 0x0
@@ -5146,142 +5162,139 @@
move-object v0, v2
:cond_0
- check-cast v0, Ljava/lang/Long;
+ check-cast v0, Ljava/lang/String;
- const/4 v1, 0x0
+ const-wide/16 v3, 0x0
if-eqz v0, :cond_1
- invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+ invoke-static {v0}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
- move-result-wide v3
-
- long-to-int v0, v3
+ move-result-wide v0
goto :goto_0
:cond_1
- const/4 v0, 0x0
+ move-wide v0, v3
:goto_0
invoke-virtual {p1}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getNewValue()Ljava/lang/Object;
move-result-object p1
- instance-of v3, p1, Ljava/lang/Long;
+ instance-of v5, p1, Ljava/lang/String;
- if-nez v3, :cond_2
+ if-nez v5, :cond_2
move-object p1, v2
:cond_2
- check-cast p1, Ljava/lang/Long;
+ check-cast p1, Ljava/lang/String;
if-eqz p1, :cond_3
- invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
+ invoke-static {p1}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
move-result-wide v3
- long-to-int p1, 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
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 p1, Ljava/util/ArrayList;
+ new-instance v0, Ljava/util/ArrayList;
- invoke-direct {p1}, Ljava/util/ArrayList;->()V
+ invoke-direct {v0}, Ljava/util/ArrayList;->()V
- invoke-interface {v0}, Ljava/util/Collection;->isEmpty()Z
+ invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
move-result v1
- xor-int/2addr v1, v6
+ xor-int/lit8 v1, v1, 0x1
if-eqz v1, :cond_7
new-instance v1, Lcom/discord/models/domain/ModelAuditLogEntry$Change;
- const-string v3, "allow"
+ const-string v4, "allow"
- invoke-direct {v1, v3, v2, v0}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
+ invoke-direct {v1, v4, v2, p1}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
- invoke-virtual {p1, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+ invoke-virtual {v0, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
:cond_7
- invoke-interface {v4}, Ljava/util/Collection;->isEmpty()Z
+ invoke-interface {v3}, Ljava/util/Collection;->isEmpty()Z
- move-result v0
+ move-result p1
- xor-int/2addr v0, v6
+ xor-int/lit8 p1, p1, 0x1
- if-eqz v0, :cond_8
+ if-eqz p1, :cond_8
- new-instance v0, Lcom/discord/models/domain/ModelAuditLogEntry$Change;
+ new-instance p1, Lcom/discord/models/domain/ModelAuditLogEntry$Change;
const-string v1, "deny"
- invoke-direct {v0, v1, v2, v4}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
+ invoke-direct {p1, v1, v2, v3}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->(Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;)V
- invoke-virtual {p1, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+ invoke-virtual {v0, p1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
:cond_8
- return-object p1
+ return-object v0
.end method
.method private final transformPermissionOverride(Lcom/discord/models/domain/ModelAuditLogEntry$Change;)Ljava/util/List;
@@ -5301,7 +5314,7 @@
move-result-object v0
- instance-of v1, v0, Ljava/lang/Long;
+ instance-of v1, v0, Ljava/lang/String;
const/4 v2, 0x0
@@ -5310,58 +5323,56 @@
move-object v0, v2
:cond_0
- check-cast v0, Ljava/lang/Long;
+ check-cast v0, Ljava/lang/String;
- const-wide/16 v3, 0x0
+ const-string v1, "0"
if-eqz v0, :cond_1
- invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
-
- move-result-wide v0
-
goto :goto_0
:cond_1
- move-wide v0, v3
+ move-object v0, v1
:goto_0
- sget-object v5, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
+ sget-object v3, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->INSTANCE:Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;
- long-to-int v1, v0
+ invoke-static {v0}, Ljava/lang/Long;->parseLong(Ljava/lang/String;)J
- invoke-direct {v5, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getPermissionBits(I)Ljava/util/HashSet;
+ move-result-wide v4
+
+ invoke-direct {v3, v4, v5}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getPermissionBits(J)Ljava/util/HashSet;
move-result-object v0
invoke-virtual {p1}, Lcom/discord/models/domain/ModelAuditLogEntry$Change;->getNewValue()Ljava/lang/Object;
- move-result-object v1
+ move-result-object v3
- instance-of v5, v1, Ljava/lang/Long;
+ instance-of v4, v3, Ljava/lang/String;
- if-nez v5, :cond_2
+ if-nez v4, :cond_2
goto :goto_1
:cond_2
- move-object v2, v1
+ move-object v2, v3
:goto_1
- check-cast v2, Ljava/lang/Long;
+ check-cast v2, Ljava/lang/String;
if-eqz v2, :cond_3
- invoke-virtual {v2}, Ljava/lang/Long;->longValue()J
+ 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
move-result-wide v3
- :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;
+ invoke-direct {v2, v3, v4}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getPermissionBits(J)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 80c00bdc4a..610a59ff7d 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, 0x7f120a08
+ const p1, 0x7f120a0f
goto/16 :goto_0
:pswitch_0
- const p1, 0x7f120994
+ const p1, 0x7f12099b
goto/16 :goto_0
:pswitch_1
- const p1, 0x7f120995
+ const p1, 0x7f12099c
goto/16 :goto_0
:pswitch_2
- const p1, 0x7f120993
+ const p1, 0x7f12099a
goto/16 :goto_0
:pswitch_3
- const p1, 0x7f12098e
+ const p1, 0x7f120995
goto/16 :goto_0
:pswitch_4
- const p1, 0x7f1209a1
+ const p1, 0x7f1209a8
goto/16 :goto_0
@@ -203,17 +203,17 @@
if-eq p1, v0, :cond_4
- const p1, 0x7f12099c
+ const p1, 0x7f1209a3
goto/16 :goto_0
:cond_4
- const p1, 0x7f12098d
+ const p1, 0x7f120994
goto/16 :goto_0
:cond_5
- const p1, 0x7f1209a2
+ const p1, 0x7f1209a9
goto/16 :goto_0
@@ -227,147 +227,147 @@
throw p1
:pswitch_6
- const p1, 0x7f12098a
+ const p1, 0x7f120991
goto/16 :goto_0
:pswitch_7
- const p1, 0x7f1209e7
+ const p1, 0x7f1209ee
goto/16 :goto_0
:pswitch_8
- const p1, 0x7f1209e9
+ const p1, 0x7f1209f0
goto/16 :goto_0
:pswitch_9
- const p1, 0x7f1209f1
+ const p1, 0x7f1209f8
goto/16 :goto_0
:pswitch_a
- const p1, 0x7f1209f4
+ const p1, 0x7f1209fb
goto/16 :goto_0
:pswitch_b
- const p1, 0x7f1209e4
+ const p1, 0x7f1209eb
goto/16 :goto_0
:pswitch_c
- const p1, 0x7f1209e3
+ const p1, 0x7f1209ea
goto/16 :goto_0
:pswitch_d
- const p1, 0x7f1209ef
-
- goto :goto_0
-
- :pswitch_e
- const p1, 0x7f1209e8
-
- goto :goto_0
-
- :pswitch_f
- const p1, 0x7f1209fd
-
- goto :goto_0
-
- :pswitch_10
- const p1, 0x7f120a06
-
- goto :goto_0
-
- :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_e
+ const p1, 0x7f1209ef
+
+ goto :goto_0
+
+ :pswitch_f
+ const p1, 0x7f120a04
+
+ goto :goto_0
+
+ :pswitch_10
+ const p1, 0x7f120a0d
+
+ goto :goto_0
+
+ :pswitch_11
+ const p1, 0x7f120a03
+
+ goto :goto_0
+
+ :pswitch_12
+ const p1, 0x7f1209e1
+
+ goto :goto_0
+
+ :pswitch_13
+ const p1, 0x7f1209e8
+
+ goto :goto_0
+
+ :pswitch_14
+ const p1, 0x7f1209e0
+
+ goto :goto_0
+
+ :pswitch_15
+ const p1, 0x7f120a14
+
+ goto :goto_0
+
+ :pswitch_16
+ const p1, 0x7f120a17
+
+ goto :goto_0
+
+ :pswitch_17
+ const p1, 0x7f120a13
+
+ goto :goto_0
+
+ :pswitch_18
+ const p1, 0x7f1209ac
+
+ goto :goto_0
+
+ :pswitch_19
+ const p1, 0x7f1209af
+
+ goto :goto_0
+
+ :pswitch_1a
+ const p1, 0x7f1209ab
+
+ goto :goto_0
+
+ :pswitch_1b
+ const p1, 0x7f1209ff
+
+ goto :goto_0
+
+ :pswitch_1c
+ const p1, 0x7f1209fe
+
+ goto :goto_0
+
+ :pswitch_1d
+ const p1, 0x7f1209fc
+
+ goto :goto_0
+
+ :pswitch_1e
+ const p1, 0x7f1209fd
+
+ goto :goto_0
+
:pswitch_1f
- const p1, 0x7f1209d0
+ const p1, 0x7f1209d7
goto :goto_0
:pswitch_20
- const p1, 0x7f1209d6
+ const p1, 0x7f1209dd
goto :goto_0
:pswitch_21
- const p1, 0x7f1209cf
+ const p1, 0x7f1209d6
goto :goto_0
:cond_7
- const p1, 0x7f1209c1
+ const p1, 0x7f1209c8
:goto_0
return p1
@@ -1133,7 +1133,7 @@
if-gez v5, :cond_0
- const v1, 0x7f120a07
+ const v1, 0x7f120a0e
const/4 v2, 0x2
@@ -1226,182 +1226,182 @@
goto/16 :goto_0
:pswitch_0
- const p1, 0x7f120973
+ const p1, 0x7f12097a
goto/16 :goto_0
:pswitch_1
- const p1, 0x7f120974
+ const p1, 0x7f12097b
goto/16 :goto_0
:pswitch_2
- const p1, 0x7f120972
+ const p1, 0x7f120979
goto/16 :goto_0
:pswitch_3
- const p1, 0x7f120983
+ const p1, 0x7f12098a
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, 0x7f120988
-
- goto/16 :goto_0
-
- :pswitch_b
const p1, 0x7f120989
goto/16 :goto_0
- :pswitch_c
+ :pswitch_5
const p1, 0x7f120987
goto/16 :goto_0
- :pswitch_d
+ :pswitch_6
+ const p1, 0x7f120988
+
+ goto/16 :goto_0
+
+ :pswitch_7
const p1, 0x7f120976
goto/16 :goto_0
- :pswitch_e
+ :pswitch_8
const p1, 0x7f120977
- goto :goto_0
+ goto/16 :goto_0
- :pswitch_f
+ :pswitch_9
const p1, 0x7f120975
- goto :goto_0
+ goto/16 :goto_0
- :pswitch_10
- const p1, 0x7f120985
+ :pswitch_a
+ const p1, 0x7f12098f
- goto :goto_0
+ goto/16 :goto_0
- :pswitch_11
- const p1, 0x7f120986
+ :pswitch_b
+ const p1, 0x7f120990
- goto :goto_0
+ goto/16 :goto_0
- :pswitch_12
- const p1, 0x7f120984
+ :pswitch_c
+ const p1, 0x7f12098e
- goto :goto_0
+ goto/16 :goto_0
- :pswitch_13
- const p1, 0x7f120967
+ :pswitch_d
+ const p1, 0x7f12097d
- goto :goto_0
+ goto/16 :goto_0
- :pswitch_14
- const p1, 0x7f12097a
-
- goto :goto_0
-
- :pswitch_15
- const p1, 0x7f12097c
-
- goto :goto_0
-
- :pswitch_16
+ :pswitch_e
const p1, 0x7f12097e
goto :goto_0
+ :pswitch_f
+ const p1, 0x7f12097c
+
+ goto :goto_0
+
+ :pswitch_10
+ const p1, 0x7f12098c
+
+ goto :goto_0
+
+ :pswitch_11
+ const p1, 0x7f12098d
+
+ goto :goto_0
+
+ :pswitch_12
+ const p1, 0x7f12098b
+
+ goto :goto_0
+
+ :pswitch_13
+ const p1, 0x7f12096e
+
+ goto :goto_0
+
+ :pswitch_14
+ const p1, 0x7f120981
+
+ goto :goto_0
+
+ :pswitch_15
+ const p1, 0x7f120983
+
+ goto :goto_0
+
+ :pswitch_16
+ const p1, 0x7f120985
+
+ goto :goto_0
+
:pswitch_17
- const p1, 0x7f12097f
+ const p1, 0x7f120986
goto :goto_0
:pswitch_18
- const p1, 0x7f120979
+ const p1, 0x7f120980
goto :goto_0
:pswitch_19
- const p1, 0x7f120978
+ const p1, 0x7f12097f
goto :goto_0
:pswitch_1a
- const p1, 0x7f12097d
+ const p1, 0x7f120984
goto :goto_0
:pswitch_1b
- const p1, 0x7f12097b
+ const p1, 0x7f120982
goto :goto_0
:pswitch_1c
- const p1, 0x7f12096b
+ const p1, 0x7f120972
goto :goto_0
:pswitch_1d
- const p1, 0x7f12096c
+ const p1, 0x7f120973
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
+ :pswitch_1f
+ const p1, 0x7f120970
+
+ goto :goto_0
+
+ :pswitch_20
+ const p1, 0x7f120974
+
+ goto :goto_0
+
+ :pswitch_21
+ const p1, 0x7f12096f
+
+ goto :goto_0
+
+ :cond_0
+ const p1, 0x7f120978
+
+ goto :goto_0
+
:cond_1
- const p1, 0x7f120a88
+ const p1, 0x7f120a90
: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 fbb1a955b1..3f07d49b36 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, 0x7f1203bc
+ const v1, 0x7f1203be
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 ffb21d0bc8..73d3099423 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, 0x7f1203bb
+ const v1, 0x7f1203bd
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 745db073ab..13f1e48310 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, 0x7f1203bd
+ const p2, 0x7f1203bf
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, 0x7f1203c0
+ const v2, 0x7f1203c2
invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
move-result-object v1
- const v2, 0x7f1203c1
+ const v2, 0x7f1203c3
invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
move-result-object v1
- const v2, 0x7f1203bf
+ const v2, 0x7f1203c1
new-instance v3, Lcom/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1;
@@ -320,7 +320,7 @@
move-result-object p1
- const p2, 0x7f1203b1
+ const p2, 0x7f1203b3
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 06a46dfe08..b8ada5876f 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, 0x7f12163f
+ const p2, 0x7f121657
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, 0x7f120cde
+ const p2, 0x7f120ceb
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, 0x7f12058c
+ const p2, 0x7f120590
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, 0x7f120cdd
+ const p2, 0x7f120cea
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 ad5cff6001..0d24dca112 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/FileUtils$DownloadState;",
+ "Lcom/discord/utilities/file/DownloadUtils$DownloadState;",
">;"
}
.end annotation
@@ -60,7 +60,7 @@
if-eq v0, v1, :cond_0
- new-instance p1, Lcom/discord/utilities/file/FileUtils$DownloadState$Failure;
+ new-instance p1, Lcom/discord/utilities/file/DownloadUtils$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/FileUtils$DownloadState$Failure;->(Ljava/lang/Exception;)V
+ invoke-direct {p1, v0}, Lcom/discord/utilities/file/DownloadUtils$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/FileUtils$DownloadState$Completed;
+ new-instance p1, Lcom/discord/utilities/file/DownloadUtils$DownloadState$Completed;
- invoke-direct {p1, v0}, Lcom/discord/utilities/file/FileUtils$DownloadState$Completed;->(Ljava/io/File;)V
+ invoke-direct {p1, v0}, Lcom/discord/utilities/file/DownloadUtils$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(FileUtil\u2026oadState.Completed(file))"
+ const-string p1, "Observable.just(Download\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/FileUtils;->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/DownloadUtils;->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 0a14e9f883..f46567e2b1 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, 0x7f120bce
+ const p1, 0x7f120bda
invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -48,11 +48,11 @@
if-gtz v5, :cond_1
- const v1, 0x7f120bd2
+ const v1, 0x7f120bde
new-array v2, v4, [Ljava/lang/Object;
- const v5, 0x7f10009a
+ const v5, 0x7f10009b
const-wide/16 v6, 0x3e8
@@ -92,11 +92,11 @@
if-gtz v7, :cond_2
- const v5, 0x7f120bd1
+ const v5, 0x7f120bdd
new-array v6, v4, [Ljava/lang/Object;
- const v7, 0x7f100099
+ const v7, 0x7f10009a
div-long/2addr p1, v1
@@ -131,11 +131,11 @@
if-gtz v7, :cond_3
- const v1, 0x7f120bd0
+ const v1, 0x7f120bdc
new-array v2, v4, [Ljava/lang/Object;
- const v7, 0x7f100098
+ const v7, 0x7f100099
div-long/2addr p1, v5
@@ -164,11 +164,11 @@
goto :goto_0
:cond_3
- const v5, 0x7f120bcf
+ const v5, 0x7f120bdb
new-array v6, v4, [Ljava/lang/Object;
- const v7, 0x7f100097
+ const v7, 0x7f100098
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 cd921462e9..73b03610c5 100644
--- a/com.discord/smali/com/discord/utilities/error/Error$Response.smali
+++ b/com.discord/smali/com/discord/utilities/error/Error$Response.smali
@@ -44,6 +44,11 @@
.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
@@ -117,7 +122,7 @@
.end method
.method private getMessageToast(Landroid/content/Context;I)Ljava/lang/String;
- .locals 3
+ .locals 4
.param p2 # I
.annotation build Landroidx/annotation/StringRes;
.end annotation
@@ -147,14 +152,46 @@
return-object p1
:cond_0
- iget-object v0, p0, Lcom/discord/utilities/error/Error$Response;->message:Ljava/lang/String;
+ iget-object v0, p0, Lcom/discord/utilities/error/Error$Response;->skemaError:Lcom/discord/utilities/error/Error$SkemaError;
- if-eqz v0, :cond_1
+ if-eqz v0, :cond_3
- return-object v0
+ 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
:cond_1
- iget-object v0, p0, Lcom/discord/utilities/error/Error$Response;->messages:Ljava/util/Map;
+ 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
invoke-interface {v0}, Ljava/util/Map;->values()Ljava/util/Collection;
@@ -167,9 +204,66 @@
: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_4
+ if-eqz v1, :cond_7
invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
@@ -181,12 +275,12 @@
move-result-object v1
- :cond_3
+ :cond_6
invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z
move-result v2
- if-eqz v2, :cond_2
+ if-eqz v2, :cond_5
invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
@@ -194,11 +288,11 @@
check-cast v2, Ljava/lang/String;
- if-eqz v2, :cond_3
+ if-eqz v2, :cond_6
return-object v2
- :cond_4
+ :cond_7
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
move-result-object p1
@@ -209,7 +303,7 @@
# virtual methods
.method public assignField(Lcom/discord/models/domain/Model$JsonReader;)V
- .locals 5
+ .locals 6
.annotation system Ldalvik/annotation/Throws;
value = {
Ljava/io/IOException;
@@ -224,11 +318,13 @@
move-result v1
- const/4 v2, 0x3
+ const/4 v2, 0x4
- const/4 v3, 0x2
+ const/4 v3, 0x3
- const/4 v4, 0x1
+ const/4 v4, 0x2
+
+ const/4 v5, 0x1
sparse-switch v1, :sswitch_data_0
@@ -286,16 +382,31 @@
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_4
+ if-eqz v1, :cond_8
- if-eq v1, v4, :cond_3
+ if-eq v1, v5, :cond_7
- if-eq v1, v3, :cond_2
+ if-eq v1, v4, :cond_6
+
+ if-eq v1, v3, :cond_5
if-eq v1, v2, :cond_1
@@ -311,9 +422,176 @@
invoke-interface {v1, v0, p1}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- goto :goto_2
+ 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
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
@@ -322,9 +600,9 @@
iput-boolean p1, p0, Lcom/discord/utilities/error/Error$Response;->global:Z
- goto :goto_2
+ goto :goto_5
- :cond_2
+ :cond_6
iget v0, p0, Lcom/discord/utilities/error/Error$Response;->retryAfter:I
invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextInt(I)I
@@ -333,9 +611,9 @@
iput p1, p0, Lcom/discord/utilities/error/Error$Response;->retryAfter:I
- goto :goto_2
+ goto :goto_5
- :cond_3
+ :cond_7
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;
@@ -344,9 +622,9 @@
iput-object p1, p0, Lcom/discord/utilities/error/Error$Response;->message:Ljava/lang/String;
- goto :goto_2
+ goto :goto_5
- :cond_4
+ :cond_8
iget v0, p0, Lcom/discord/utilities/error/Error$Response;->code:I
invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextInt(I)I
@@ -355,13 +633,15 @@
iput p1, p0, Lcom/discord/utilities/error/Error$Response;->code:I
- :goto_2
+ :cond_9
+ :goto_5
return-void
nop
:sswitch_data_0
.sparse-switch
+ -0x4d2a9095 -> :sswitch_4
-0x4a16fc5d -> :sswitch_3
-0x3771127b -> :sswitch_2
0x2eaded -> :sswitch_1
@@ -454,13 +734,9 @@
return v2
:cond_6
- invoke-virtual {p0}, Lcom/discord/utilities/error/Error$Response;->getMessages()Ljava/util/Map;
+ iget-object v1, p0, 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
+ iget-object v3, p1, Lcom/discord/utilities/error/Error$Response;->skemaError:Lcom/discord/utilities/error/Error$SkemaError;
if-nez v1, :cond_7
@@ -469,7 +745,7 @@
goto :goto_1
:cond_7
- invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+ invoke-virtual {v1, v3}, Lcom/discord/utilities/error/Error$SkemaError;->equals(Ljava/lang/Object;)Z
move-result v1
@@ -479,6 +755,31 @@
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
@@ -487,23 +788,23 @@
move-result-object p1
- if-nez v1, :cond_9
+ if-nez v1, :cond_b
- if-eqz p1, :cond_a
+ if-eqz p1, :cond_c
- goto :goto_2
+ goto :goto_3
- :cond_9
+ :cond_b
invoke-virtual {v1, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
move-result p1
- if-nez p1, :cond_a
+ if-nez p1, :cond_c
- :goto_2
+ :goto_3
return v2
- :cond_a
+ :cond_c
return v0
.end method
@@ -615,9 +916,7 @@
:goto_1
add-int/2addr v0, v1
- invoke-virtual {p0}, Lcom/discord/utilities/error/Error$Response;->getMessages()Ljava/util/Map;
-
- move-result-object v1
+ iget-object v1, p0, Lcom/discord/utilities/error/Error$Response;->skemaError:Lcom/discord/utilities/error/Error$SkemaError;
mul-int/lit8 v0, v0, 0x3b
@@ -628,29 +927,49 @@
goto :goto_2
:cond_2
- invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
+ 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
+ add-int/2addr v0, v1
+
invoke-virtual {p0}, Lcom/discord/utilities/error/Error$Response;->getMessage()Ljava/lang/String;
move-result-object v1
mul-int/lit8 v0, v0, 0x3b
- if-nez v1, :cond_3
+ if-nez v1, :cond_4
- goto :goto_3
+ goto :goto_4
- :cond_3
+ :cond_4
invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
move-result v2
- :goto_3
+ :goto_4
add-int/2addr v0, v2
return v0
@@ -719,6 +1038,14 @@
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
new file mode 100644
index 0000000000..d2e5ddd806
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/error/Error$SkemaError.smali
@@ -0,0 +1,319 @@
+.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
new file mode 100644
index 0000000000..d4246ea9e3
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/error/Error$SkemaErrorItem.smali
@@ -0,0 +1,293 @@
+.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 926d8370f2..addae99141 100644
--- a/com.discord/smali/com/discord/utilities/error/Error.smali
+++ b/com.discord/smali/com/discord/utilities/error/Error.smali
@@ -7,6 +7,8 @@
.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
@@ -669,7 +671,7 @@
packed-switch v0, :pswitch_data_0
:pswitch_0
- const v0, 0x7f120f34
+ const v0, 0x7f120f46
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -682,7 +684,7 @@
return-object p1
:pswitch_1
- const v0, 0x7f120cd7
+ const v0, 0x7f120ce3
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -695,7 +697,7 @@
return-object p1
:pswitch_2
- const v0, 0x7f120f33
+ const v0, 0x7f120f45
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -708,7 +710,7 @@
return-object p1
:pswitch_3
- const v0, 0x7f120f30
+ const v0, 0x7f120f42
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -721,7 +723,7 @@
return-object p1
:pswitch_4
- const v0, 0x7f1215a4
+ const v0, 0x7f1215bd
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -734,7 +736,7 @@
return-object p1
:pswitch_5
- const v0, 0x7f120f32
+ const v0, 0x7f120f44
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -747,7 +749,7 @@
return-object p1
:pswitch_6
- const v0, 0x7f120f2e
+ const v0, 0x7f120f40
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -762,7 +764,7 @@
:pswitch_7
iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response;
- const v1, 0x7f120f2b
+ const v1, 0x7f120f3d
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;
@@ -777,7 +779,7 @@
:pswitch_8
iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response;
- const v1, 0x7f120f2f
+ const v1, 0x7f120f41
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;
@@ -790,7 +792,7 @@
return-object p1
:pswitch_9
- const v0, 0x7f1212dd
+ const v0, 0x7f1212ee
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -803,7 +805,7 @@
return-object p1
:pswitch_a
- const v0, 0x7f120f2d
+ const v0, 0x7f120f3f
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -816,7 +818,7 @@
return-object p1
:pswitch_b
- const v0, 0x7f120f2c
+ const v0, 0x7f120f3e
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -831,7 +833,7 @@
:pswitch_c
iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response;
- const v1, 0x7f120f31
+ const v1, 0x7f120f43
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 7683821b67..c3f91d8df0 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, 0x7f120bca
+ const p2, 0x7f120bd6
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 b0857ce8f1..f09c5e1b69 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, 0x7f120d73
+ const v1, 0x7f120d81
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -1427,7 +1427,7 @@
goto :goto_0
:cond_1
- const v1, 0x7f120558
+ const v1, 0x7f12055c
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -1572,7 +1572,7 @@
if-eqz v0, :cond_c
- const v0, 0x7f121081
+ const v0, 0x7f121093
new-array v1, v7, [Ljava/lang/Object;
@@ -1632,7 +1632,7 @@
if-ne v1, v5, :cond_1
- const v0, 0x7f120fd5
+ const v0, 0x7f120fe8
new-array v1, v5, [Ljava/lang/Object;
@@ -1653,7 +1653,7 @@
:cond_1
if-ne v1, v7, :cond_2
- const v0, 0x7f120fd3
+ const v0, 0x7f120fe6
new-array v1, v5, [Ljava/lang/Object;
@@ -1723,7 +1723,7 @@
if-ne v1, v5, :cond_6
- const v0, 0x7f120fdb
+ const v0, 0x7f120fee
new-array v1, v5, [Ljava/lang/Object;
@@ -1744,7 +1744,7 @@
:cond_6
if-ne v1, v7, :cond_7
- const v0, 0x7f120fd9
+ const v0, 0x7f120fec
new-array v1, v5, [Ljava/lang/Object;
@@ -1801,7 +1801,7 @@
if-nez v0, :cond_c
- const v0, 0x7f120fd0
+ const v0, 0x7f120fe4
new-array v1, v5, [Ljava/lang/Object;
@@ -1828,7 +1828,7 @@
if-eqz v0, :cond_c
- const v0, 0x7f120815
+ const v0, 0x7f12081a
new-array v1, v7, [Ljava/lang/Object;
@@ -1860,7 +1860,7 @@
goto :goto_2
:cond_a
- const v0, 0x7f120fde
+ const v0, 0x7f120ff1
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1869,7 +1869,7 @@
goto :goto_1
:cond_b
- const v0, 0x7f120fce
+ const v0, 0x7f120fe2
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, 0x7f12141d
+ const v0, 0x7f121431
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -2256,7 +2256,7 @@
const v3, 0x7f0803e9
- const v4, 0x7f120fdf
+ const v4, 0x7f120ff2
invoke-virtual {p1, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -2726,7 +2726,7 @@
const v2, 0x7f080286
- const v3, 0x7f120e71
+ const v3, 0x7f120e80
invoke-virtual {p1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -3141,7 +3141,7 @@
goto :goto_0
:cond_0
- const v1, 0x7f1205a5
+ const v1, 0x7f1205ab
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -3509,7 +3509,7 @@
const v0, 0x7f08038a
- const v1, 0x7f120fdc
+ const v1, 0x7f120fef
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -3579,7 +3579,7 @@
goto :goto_0
:cond_0
- const v0, 0x7f120c59
+ const v0, 0x7f120c65
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -3701,7 +3701,7 @@
if-nez v0, :cond_4
- const v0, 0x7f120fe4
+ const v0, 0x7f120ff7
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -3718,7 +3718,7 @@
if-eqz v0, :cond_4
- const v0, 0x7f120816
+ const v0, 0x7f12081b
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 d32814e5a7..0abccfd79c 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, 0x7f120e9a
+ const v1, 0x7f120ea9
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1167,12 +1167,12 @@
if-eqz p5, :cond_0
- const v2, 0x7f120fe1
+ const v2, 0x7f120ff4
goto :goto_0
:cond_0
- const v2, 0x7f120fe0
+ const v2, 0x7f120ff3
: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, 0x7f121792
+ const v3, 0x7f1217ab
invoke-virtual {p1, v3}, Landroid/app/Application;->getString(I)Ljava/lang/String;
@@ -1328,7 +1328,7 @@
new-instance v3, Landroid/app/NotificationChannel;
- const v5, 0x7f120ec8
+ const v5, 0x7f120ed9
invoke-virtual {p1, v5}, Landroid/app/Application;->getString(I)Ljava/lang/String;
@@ -1340,7 +1340,7 @@
new-instance v5, Landroid/app/NotificationChannel;
- const v7, 0x7f12058d
+ const v7, 0x7f120593
invoke-virtual {p1, v7}, Landroid/app/Application;->getString(I)Ljava/lang/String;
@@ -1352,7 +1352,7 @@
new-instance v7, Landroid/app/NotificationChannel;
- const v8, 0x7f1207ac
+ const v8, 0x7f1207b1
invoke-virtual {p1, v8}, Landroid/app/Application;->getString(I)Ljava/lang/String;
@@ -1364,7 +1364,7 @@
new-instance v8, Landroid/app/NotificationChannel;
- const v9, 0x7f1207f5
+ const v9, 0x7f1207fa
invoke-virtual {p1, v9}, Landroid/app/Application;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/file/FileUtils$DownloadState$Completed.smali b/com.discord/smali/com/discord/utilities/file/DownloadUtils$DownloadState$Completed.smali
similarity index 51%
rename from com.discord/smali/com/discord/utilities/file/FileUtils$DownloadState$Completed.smali
rename to com.discord/smali/com/discord/utilities/file/DownloadUtils$DownloadState$Completed.smali
index 1450f4144a..d01b831b97 100644
--- a/com.discord/smali/com/discord/utilities/file/FileUtils$DownloadState$Completed.smali
+++ b/com.discord/smali/com/discord/utilities/file/DownloadUtils$DownloadState$Completed.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/utilities/file/FileUtils$DownloadState$Completed;
-.super Lcom/discord/utilities/file/FileUtils$DownloadState;
-.source "FileUtils.kt"
+.class public final Lcom/discord/utilities/file/DownloadUtils$DownloadState$Completed;
+.super Lcom/discord/utilities/file/DownloadUtils$DownloadState;
+.source "DownloadUtils.kt"
# annotations
.annotation system Ldalvik/annotation/EnclosingClass;
- value = Lcom/discord/utilities/file/FileUtils$DownloadState;
+ value = Lcom/discord/utilities/file/DownloadUtils$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/FileUtils$DownloadState;->(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+ invoke-direct {p0, v0}, Lcom/discord/utilities/file/DownloadUtils$DownloadState;->(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
- iput-object p1, p0, Lcom/discord/utilities/file/FileUtils$DownloadState$Completed;->file:Ljava/io/File;
+ iput-object p1, p0, Lcom/discord/utilities/file/DownloadUtils$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/FileUtils$DownloadState$Completed;->file:Ljava/io/File;
+ iget-object v0, p0, Lcom/discord/utilities/file/DownloadUtils$DownloadState$Completed;->file:Ljava/io/File;
return-object v0
.end method
diff --git a/com.discord/smali/com/discord/utilities/file/FileUtils$DownloadState$Failure.smali b/com.discord/smali/com/discord/utilities/file/DownloadUtils$DownloadState$Failure.smali
similarity index 51%
rename from com.discord/smali/com/discord/utilities/file/FileUtils$DownloadState$Failure.smali
rename to com.discord/smali/com/discord/utilities/file/DownloadUtils$DownloadState$Failure.smali
index 04cb8ebca6..1e0f05109d 100644
--- a/com.discord/smali/com/discord/utilities/file/FileUtils$DownloadState$Failure.smali
+++ b/com.discord/smali/com/discord/utilities/file/DownloadUtils$DownloadState$Failure.smali
@@ -1,11 +1,11 @@
-.class public final Lcom/discord/utilities/file/FileUtils$DownloadState$Failure;
-.super Lcom/discord/utilities/file/FileUtils$DownloadState;
-.source "FileUtils.kt"
+.class public final Lcom/discord/utilities/file/DownloadUtils$DownloadState$Failure;
+.super Lcom/discord/utilities/file/DownloadUtils$DownloadState;
+.source "DownloadUtils.kt"
# annotations
.annotation system Ldalvik/annotation/EnclosingClass;
- value = Lcom/discord/utilities/file/FileUtils$DownloadState;
+ value = Lcom/discord/utilities/file/DownloadUtils$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/FileUtils$DownloadState;->(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+ invoke-direct {p0, v0}, Lcom/discord/utilities/file/DownloadUtils$DownloadState;->(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
- iput-object p1, p0, Lcom/discord/utilities/file/FileUtils$DownloadState$Failure;->exception:Ljava/lang/Exception;
+ iput-object p1, p0, Lcom/discord/utilities/file/DownloadUtils$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/FileUtils$DownloadState$Failure;->exception:Ljava/lang/Exception;
+ iget-object v0, p0, Lcom/discord/utilities/file/DownloadUtils$DownloadState$Failure;->exception:Ljava/lang/Exception;
return-object v0
.end method
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
new file mode 100644
index 0000000000..3dbe004f47
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/file/DownloadUtils$DownloadState$InProgress.smali
@@ -0,0 +1,42 @@
+.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/FileUtils$DownloadState.smali b/com.discord/smali/com/discord/utilities/file/DownloadUtils$DownloadState.smali
similarity index 56%
rename from com.discord/smali/com/discord/utilities/file/FileUtils$DownloadState.smali
rename to com.discord/smali/com/discord/utilities/file/DownloadUtils$DownloadState.smali
index 756af936de..fafd890a20 100644
--- a/com.discord/smali/com/discord/utilities/file/FileUtils$DownloadState.smali
+++ b/com.discord/smali/com/discord/utilities/file/DownloadUtils$DownloadState.smali
@@ -1,11 +1,11 @@
-.class public abstract Lcom/discord/utilities/file/FileUtils$DownloadState;
+.class public abstract Lcom/discord/utilities/file/DownloadUtils$DownloadState;
.super Ljava/lang/Object;
-.source "FileUtils.kt"
+.source "DownloadUtils.kt"
# annotations
.annotation system Ldalvik/annotation/EnclosingClass;
- value = Lcom/discord/utilities/file/FileUtils;
+ value = Lcom/discord/utilities/file/DownloadUtils;
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
@@ -15,9 +15,9 @@
.annotation system Ldalvik/annotation/MemberClasses;
value = {
- Lcom/discord/utilities/file/FileUtils$DownloadState$InProgress;,
- Lcom/discord/utilities/file/FileUtils$DownloadState$Completed;,
- Lcom/discord/utilities/file/FileUtils$DownloadState$Failure;
+ Lcom/discord/utilities/file/DownloadUtils$DownloadState$InProgress;,
+ Lcom/discord/utilities/file/DownloadUtils$DownloadState$Completed;,
+ Lcom/discord/utilities/file/DownloadUtils$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/FileUtils$DownloadState;->()V
+ invoke-direct {p0}, Lcom/discord/utilities/file/DownloadUtils$DownloadState;->()V
return-void
.end method
diff --git a/com.discord/smali/com/discord/utilities/file/FileUtils$downloadFile$1$1.smali b/com.discord/smali/com/discord/utilities/file/DownloadUtils$downloadFile$1$1.smali
similarity index 55%
rename from com.discord/smali/com/discord/utilities/file/FileUtils$downloadFile$1$1.smali
rename to com.discord/smali/com/discord/utilities/file/DownloadUtils$downloadFile$1$1.smali
index 746ca151b0..724c408bc7 100644
--- a/com.discord/smali/com/discord/utilities/file/FileUtils$downloadFile$1$1.smali
+++ b/com.discord/smali/com/discord/utilities/file/DownloadUtils$downloadFile$1$1.smali
@@ -1,6 +1,6 @@
-.class public final Lcom/discord/utilities/file/FileUtils$downloadFile$1$1;
+.class public final Lcom/discord/utilities/file/DownloadUtils$downloadFile$1$1;
.super Ljava/lang/Object;
-.source "FileUtils.kt"
+.source "DownloadUtils.kt"
# interfaces
.implements Lrx/functions/Action1;
@@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/utilities/file/FileUtils$downloadFile$1;->call(Lrx/Emitter;)V
+ value = Lcom/discord/utilities/file/DownloadUtils$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/FileUtils$downloadFile$1;
+.field public final synthetic this$0:Lcom/discord/utilities/file/DownloadUtils$downloadFile$1;
# direct methods
-.method public constructor (Lcom/discord/utilities/file/FileUtils$downloadFile$1;Lrx/Emitter;)V
+.method public constructor (Lcom/discord/utilities/file/DownloadUtils$downloadFile$1;Lrx/Emitter;)V
.locals 0
- iput-object p1, p0, Lcom/discord/utilities/file/FileUtils$downloadFile$1$1;->this$0:Lcom/discord/utilities/file/FileUtils$downloadFile$1;
+ iput-object p1, p0, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1$1;->this$0:Lcom/discord/utilities/file/DownloadUtils$downloadFile$1;
- iput-object p2, p0, Lcom/discord/utilities/file/FileUtils$downloadFile$1$1;->$emitter:Lrx/Emitter;
+ iput-object p2, p0, Lcom/discord/utilities/file/DownloadUtils$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/FileUtils$downloadFile$1$1;->call(Lokhttp3/ResponseBody;)V
+ invoke-virtual {p0, p1}, Lcom/discord/utilities/file/DownloadUtils$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/FileUtils$downloadFile$1$1;->this$0:Lcom/discord/utilities/file/FileUtils$downloadFile$1;
+ iget-object v1, p0, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1$1;->this$0:Lcom/discord/utilities/file/DownloadUtils$downloadFile$1;
- iget-object v1, v1, Lcom/discord/utilities/file/FileUtils$downloadFile$1;->$downloadDirectory:Ljava/io/File;
+ iget-object v1, v1, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1;->$downloadDirectory:Ljava/io/File;
- iget-object v2, p0, Lcom/discord/utilities/file/FileUtils$downloadFile$1$1;->this$0:Lcom/discord/utilities/file/FileUtils$downloadFile$1;
+ iget-object v2, p0, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1$1;->this$0:Lcom/discord/utilities/file/DownloadUtils$downloadFile$1;
- iget-object v2, v2, Lcom/discord/utilities/file/FileUtils$downloadFile$1;->$fileName:Ljava/lang/String;
+ iget-object v2, v2, Lcom/discord/utilities/file/DownloadUtils$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/FileUtils$downloadFile$1$1;->$emitter:Lrx/Emitter;
+ iget-object v1, p0, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1$1;->$emitter:Lrx/Emitter;
- new-instance v2, Lcom/discord/utilities/file/FileUtils$DownloadState$Completed;
+ new-instance v2, Lcom/discord/utilities/file/DownloadUtils$DownloadState$Completed;
- invoke-direct {v2, v0}, Lcom/discord/utilities/file/FileUtils$DownloadState$Completed;->(Ljava/io/File;)V
+ invoke-direct {v2, v0}, Lcom/discord/utilities/file/DownloadUtils$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/FileUtils$downloadFile$1$1;->$emitter:Lrx/Emitter;
+ iget-object v0, p0, Lcom/discord/utilities/file/DownloadUtils$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/FileUtils$downloadFile$1$1;->$emitter:Lrx/Emitter;
+ iget-object v7, p0, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1$1;->$emitter:Lrx/Emitter;
- new-instance v8, Lcom/discord/utilities/file/FileUtils$DownloadState$InProgress;
+ new-instance v8, Lcom/discord/utilities/file/DownloadUtils$DownloadState$InProgress;
int-to-float v9, v5
div-float/2addr v9, v3
- invoke-direct {v8, v9}, Lcom/discord/utilities/file/FileUtils$DownloadState$InProgress;->(F)V
+ invoke-direct {v8, v9}, Lcom/discord/utilities/file/DownloadUtils$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/FileUtils$downloadFile$1$1;->$emitter:Lrx/Emitter;
+ iget-object v1, p0, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1$1;->$emitter:Lrx/Emitter;
- new-instance v2, Lcom/discord/utilities/file/FileUtils$DownloadState$Failure;
+ new-instance v2, Lcom/discord/utilities/file/DownloadUtils$DownloadState$Failure;
- invoke-direct {v2, v0}, Lcom/discord/utilities/file/FileUtils$DownloadState$Failure;->(Ljava/lang/Exception;)V
+ invoke-direct {v2, v0}, Lcom/discord/utilities/file/DownloadUtils$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/FileUtils$downloadFile$1.smali b/com.discord/smali/com/discord/utilities/file/DownloadUtils$downloadFile$1.smali
similarity index 60%
rename from com.discord/smali/com/discord/utilities/file/FileUtils$downloadFile$1.smali
rename to com.discord/smali/com/discord/utilities/file/DownloadUtils$downloadFile$1.smali
index bd86bc745a..6932112d21 100644
--- a/com.discord/smali/com/discord/utilities/file/FileUtils$downloadFile$1.smali
+++ b/com.discord/smali/com/discord/utilities/file/DownloadUtils$downloadFile$1.smali
@@ -1,6 +1,6 @@
-.class public final Lcom/discord/utilities/file/FileUtils$downloadFile$1;
+.class public final Lcom/discord/utilities/file/DownloadUtils$downloadFile$1;
.super Ljava/lang/Object;
-.source "FileUtils.kt"
+.source "DownloadUtils.kt"
# interfaces
.implements Lrx/functions/Action1;
@@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/utilities/file/FileUtils;->downloadFile(Landroid/content/Context;Ljava/lang/String;Ljava/lang/String;Ljava/io/File;)Lrx/Observable;
+ value = Lcom/discord/utilities/file/DownloadUtils;->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/FileUtils$downloadFile$1;->$fileUrl:Ljava/lang/String;
+ iput-object p1, p0, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1;->$fileUrl:Ljava/lang/String;
- iput-object p2, p0, Lcom/discord/utilities/file/FileUtils$downloadFile$1;->$downloadDirectory:Ljava/io/File;
+ iput-object p2, p0, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1;->$downloadDirectory:Ljava/io/File;
- iput-object p3, p0, Lcom/discord/utilities/file/FileUtils$downloadFile$1;->$fileName:Ljava/lang/String;
+ iput-object p3, p0, Lcom/discord/utilities/file/DownloadUtils$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/FileUtils$downloadFile$1;->call(Lrx/Emitter;)V
+ invoke-virtual {p0, p1}, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1;->call(Lrx/Emitter;)V
return-void
.end method
@@ -70,18 +70,18 @@
value = {
"(",
"Lrx/Emitter<",
- "Lcom/discord/utilities/file/FileUtils$DownloadState;",
+ "Lcom/discord/utilities/file/DownloadUtils$DownloadState;",
">;)V"
}
.end annotation
if-eqz p1, :cond_0
- new-instance v0, Lcom/discord/utilities/file/FileUtils$DownloadState$InProgress;
+ new-instance v0, Lcom/discord/utilities/file/DownloadUtils$DownloadState$InProgress;
const/4 v1, 0x0
- invoke-direct {v0, v1}, Lcom/discord/utilities/file/FileUtils$DownloadState$InProgress;->(F)V
+ invoke-direct {v0, v1}, Lcom/discord/utilities/file/DownloadUtils$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/FileUtils$downloadFile$1;->$fileUrl:Ljava/lang/String;
+ iget-object v1, p0, Lcom/discord/utilities/file/DownloadUtils$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/FileUtils$downloadFile$1$1;
+ new-instance v1, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1$1;
- invoke-direct {v1, p0, p1}, Lcom/discord/utilities/file/FileUtils$downloadFile$1$1;->(Lcom/discord/utilities/file/FileUtils$downloadFile$1;Lrx/Emitter;)V
+ invoke-direct {v1, p0, p1}, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1$1;->(Lcom/discord/utilities/file/DownloadUtils$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/FileUtils.smali b/com.discord/smali/com/discord/utilities/file/DownloadUtils.smali
similarity index 78%
rename from com.discord/smali/com/discord/utilities/file/FileUtils.smali
rename to com.discord/smali/com/discord/utilities/file/DownloadUtils.smali
index 7efc49113f..8074338ced 100644
--- a/com.discord/smali/com/discord/utilities/file/FileUtils.smali
+++ b/com.discord/smali/com/discord/utilities/file/DownloadUtils.smali
@@ -1,29 +1,29 @@
-.class public final Lcom/discord/utilities/file/FileUtils;
+.class public final Lcom/discord/utilities/file/DownloadUtils;
.super Ljava/lang/Object;
-.source "FileUtils.kt"
+.source "DownloadUtils.kt"
# annotations
.annotation system Ldalvik/annotation/MemberClasses;
value = {
- Lcom/discord/utilities/file/FileUtils$DownloadState;
+ Lcom/discord/utilities/file/DownloadUtils$DownloadState;
}
.end annotation
# static fields
-.field public static final INSTANCE:Lcom/discord/utilities/file/FileUtils;
+.field public static final INSTANCE:Lcom/discord/utilities/file/DownloadUtils;
# direct methods
.method public static constructor ()V
.locals 1
- new-instance v0, Lcom/discord/utilities/file/FileUtils;
+ new-instance v0, Lcom/discord/utilities/file/DownloadUtils;
- invoke-direct {v0}, Lcom/discord/utilities/file/FileUtils;->()V
+ invoke-direct {v0}, Lcom/discord/utilities/file/DownloadUtils;->()V
- sput-object v0, Lcom/discord/utilities/file/FileUtils;->INSTANCE:Lcom/discord/utilities/file/FileUtils;
+ sput-object v0, Lcom/discord/utilities/file/DownloadUtils;->INSTANCE:Lcom/discord/utilities/file/DownloadUtils;
return-void
.end method
@@ -52,7 +52,7 @@
"Ljava/io/File;",
")",
"Lrx/Observable<",
- "Lcom/discord/utilities/file/FileUtils$DownloadState;",
+ "Lcom/discord/utilities/file/DownloadUtils$DownloadState;",
">;"
}
.end annotation
@@ -67,9 +67,9 @@
if-eqz p3, :cond_0
- new-instance p0, Lcom/discord/utilities/file/FileUtils$downloadFile$1;
+ new-instance p0, Lcom/discord/utilities/file/DownloadUtils$downloadFile$1;
- invoke-direct {p0, p1, p3, p2}, Lcom/discord/utilities/file/FileUtils$downloadFile$1;->(Ljava/lang/String;Ljava/io/File;Ljava/lang/String;)V
+ invoke-direct {p0, p1, p3, p2}, Lcom/discord/utilities/file/DownloadUtils$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/FileUtils;->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/DownloadUtils;->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/FileUtils$DownloadState$InProgress.smali b/com.discord/smali/com/discord/utilities/file/FileUtils$DownloadState$InProgress.smali
deleted file mode 100644
index d643d40a67..0000000000
--- a/com.discord/smali/com/discord/utilities/file/FileUtils$DownloadState$InProgress.smali
+++ /dev/null
@@ -1,42 +0,0 @@
-.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/FileUtilsKt.smali b/com.discord/smali/com/discord/utilities/file/FileUtilsKt.smali
new file mode 100644
index 0000000000..f1b08984d9
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/file/FileUtilsKt.smali
@@ -0,0 +1,183 @@
+.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 55e2716fe6..15ce3c874d 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, 0x7f1205a5
+ const v3, 0x7f1205ab
invoke-virtual {p1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -124,7 +124,7 @@
if-nez p2, :cond_0
- const p2, 0x7f1207f5
+ const p2, 0x7f1207fa
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -133,7 +133,7 @@
goto :goto_0
:cond_0
- const v3, 0x7f1207f2
+ const v3, 0x7f1207f7
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 8ae151ea30..7fb5055efc 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, 0x7f121625
+ const v3, 0x7f121640
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 77cb575dad..1b59f54cfc 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, 0x7f121462
+ const p2, 0x7f12147a
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
new file mode 100644
index 0000000000..a1fe1df8a7
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageResult$NoValidContent.smali
@@ -0,0 +1,42 @@
+.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 10f4a6f28d..ce3a68cce7 100644
--- a/com.discord/smali/com/discord/utilities/messagesend/MessageResult.smali
+++ b/com.discord/smali/com/discord/utilities/messagesend/MessageResult.smali
@@ -11,7 +11,8 @@
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$ValidationError;,
+ Lcom/discord/utilities/messagesend/MessageResult$NoValidContent;
}
.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 3463d44db3..64252fc0e3 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, 0x7f1205a2
+ const v1, 0x7f1205a8
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, 0x7f1205a1
+ const v0, 0x7f1205a7
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, 0x7f0a0626
+ const v0, 0x7f0a062e
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -188,13 +188,13 @@
move-result-object v7
- const p2, 0x7f1203b1
+ const p2, 0x7f1203b3
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
move-result-object v6
- const p2, 0x7f12059f
+ const p2, 0x7f1205a5
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, 0x7f1212df
+ const v0, 0x7f1212f0
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, 0x7f1212de
+ const v0, 0x7f1212ef
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, 0x7f0d0125
+ const v0, 0x7f0d0127
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -266,7 +266,7 @@
const/4 v3, 0x1
- const v4, 0x7f0a0626
+ const v4, 0x7f0a062e
invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -282,7 +282,7 @@
const/4 v3, 0x2
- const v4, 0x7f0a0621
+ const v4, 0x7f0a0629
invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -300,13 +300,13 @@
move-result-object v5
- const v0, 0x7f121060
+ const v0, 0x7f121072
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
move-result-object v3
- const v0, 0x7f120f85
+ const v0, 0x7f120f97
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
new file mode 100644
index 0000000000..2ad1378a42
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/permissions/PermissionsManager.smali
@@ -0,0 +1,25 @@
+.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
new file mode 100644
index 0000000000..b38eaa6459
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/permissions/VideoPermissionsManager.smali
@@ -0,0 +1,110 @@
+.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 a64d6442c7..96b17cc864 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, 0x7f08020d
+ const v1, 0x7f08020c
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -141,7 +141,7 @@
move-result-object v18
- const v2, 0x7f0801fb
+ const v2, 0x7f0801fa
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -187,7 +187,7 @@
move-result-object v7
- const v2, 0x7f080200
+ const v2, 0x7f0801ff
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -231,7 +231,7 @@
move-result-object v7
- const v2, 0x7f080202
+ const v2, 0x7f080201
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -273,7 +273,7 @@
move-result-object v7
- const v2, 0x7f080203
+ const v2, 0x7f080202
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, 0x7f080205
+ const v2, 0x7f080204
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, 0x7f080206
+ const v2, 0x7f080205
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -363,7 +363,7 @@
move-result-object v7
- const v2, 0x7f080207
+ const v2, 0x7f080206
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -433,7 +433,7 @@
move-result-object v7
- const v2, 0x7f080208
+ const v2, 0x7f080207
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -473,7 +473,7 @@
move-result-object v7
- const v2, 0x7f080209
+ const v2, 0x7f080208
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -515,7 +515,7 @@
move-result-object v7
- const v2, 0x7f08020a
+ const v2, 0x7f080209
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -555,7 +555,7 @@
move-result-object v7
- const v2, 0x7f08020b
+ const v2, 0x7f08020a
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -591,7 +591,7 @@
move-result-object v7
- const v2, 0x7f08020c
+ const v2, 0x7f08020b
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, 0x7f08020e
+ const v2, 0x7f08020d
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -659,7 +659,7 @@
move-result-object v7
- const v2, 0x7f08020f
+ const v2, 0x7f08020e
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -699,7 +699,7 @@
move-result-object v7
- const v2, 0x7f080201
+ const v2, 0x7f080200
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 26eb356af0..df7d75be94 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, 0x7f1216a4
+ const v1, 0x7f1216bd
const/4 v2, 0x0
@@ -104,7 +104,7 @@
goto :goto_1
:cond_0
- const v0, 0x7f1216a7
+ const v0, 0x7f1216c0
new-array v1, v3, [Ljava/lang/Object;
@@ -121,7 +121,7 @@
goto :goto_1
:cond_1
- const v0, 0x7f1216a2
+ const v0, 0x7f1216bb
new-array v1, v3, [Ljava/lang/Object;
@@ -138,7 +138,7 @@
goto :goto_1
:cond_2
- const v0, 0x7f1216a3
+ const v0, 0x7f1216bc
new-array v1, v3, [Ljava/lang/Object;
@@ -185,7 +185,7 @@
:goto_0
if-eqz p1, :cond_5
- const v0, 0x7f1216a5
+ const v0, 0x7f1216be
new-array v3, v3, [Ljava/lang/Object;
@@ -267,7 +267,7 @@
goto :goto_2
:cond_1
- const v1, 0x7f1217af
+ const v1, 0x7f1217c8
new-array v3, v3, [Ljava/lang/Object;
@@ -294,7 +294,7 @@
goto :goto_2
:cond_3
- const v1, 0x7f120e02
+ const v1, 0x7f120e11
new-array v3, v3, [Ljava/lang/Object;
@@ -311,7 +311,7 @@
goto :goto_2
:cond_4
- const v1, 0x7f12150d
+ const v1, 0x7f121525
new-array v3, v3, [Ljava/lang/Object;
@@ -338,7 +338,7 @@
goto :goto_2
:cond_6
- const v1, 0x7f12112b
+ const v1, 0x7f12113d
new-array v3, v3, [Ljava/lang/Object;
@@ -376,7 +376,7 @@
if-eqz p2, :cond_0
- const v0, 0x7f12150d
+ const v0, 0x7f121525
const/4 v1, 0x1
@@ -399,7 +399,7 @@
goto :goto_0
:cond_0
- const p2, 0x7f12150e
+ const p2, 0x7f121526
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, 0x7f1214b8
+ const p1, 0x7f1214d0
goto :goto_2
:cond_2
- const p1, 0x7f1214b3
+ const p1, 0x7f1214cb
goto :goto_2
:cond_3
- const p1, 0x7f1214b5
+ const p1, 0x7f1214cd
goto :goto_2
:cond_4
- const p1, 0x7f1214b9
+ const p1, 0x7f1214d1
: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 e116305e7c..7e0dfb6450 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;->W(Ljava/io/InputStream;)Lo0/w;
+ invoke-static {v1}, Lf/n/a/k/a;->X(Ljava/io/InputStream;)Lo0/w;
move-result-object v2
:try_end_1
diff --git a/com.discord/smali/com/discord/utilities/rest/ProcessedMessageContent$Companion.smali b/com.discord/smali/com/discord/utilities/rest/ProcessedMessageContent$Companion.smali
new file mode 100644
index 0000000000..1985972883
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/rest/ProcessedMessageContent$Companion.smali
@@ -0,0 +1,185 @@
+.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;->()V
+
+ return-void
+.end method
+
+.method public synthetic constructor (Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+ .locals 0
+
+ invoke-direct {p0}, Lcom/discord/utilities/rest/ProcessedMessageContent$Companion;->()V
+
+ return-void
+.end method
+
+.method private final isUriValid(Landroid/net/Uri;Landroid/content/ContentResolver;)Z
+ .locals 0
+
+ :try_start_0
+ invoke-virtual {p2, p1}, Landroid/content/ContentResolver;->openInputStream(Landroid/net/Uri;)Ljava/io/InputStream;
+
+ move-result-object p1
+
+ if-eqz p1, :cond_0
+
+ const/4 p2, 0x0
+
+ invoke-static {p1, p2}, Lf/n/a/k/a;->closeFinally(Ljava/io/Closeable;Ljava/lang/Throwable;)V
+ :try_end_0
+ .catch Ljava/io/IOException; {:try_start_0 .. :try_end_0} :catch_0
+
+ :cond_0
+ const/4 p1, 0x1
+
+ goto :goto_0
+
+ :catch_0
+ const/4 p1, 0x0
+
+ :goto_0
+ return p1
+.end method
+
+
+# virtual methods
+.method public final fromAttachments(Ljava/util/List;Ljava/lang/String;Landroid/content/Context;)Lcom/discord/utilities/rest/ProcessedMessageContent;
+ .locals 6
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Ljava/util/List<",
+ "+",
+ "Lcom/lytefast/flexinput/model/Attachment<",
+ "*>;>;",
+ "Ljava/lang/String;",
+ "Landroid/content/Context;",
+ ")",
+ "Lcom/discord/utilities/rest/ProcessedMessageContent;"
+ }
+ .end annotation
+
+ const/4 v0, 0x0
+
+ if-eqz p1, :cond_4
+
+ if-eqz p2, :cond_3
+
+ if-eqz p3, :cond_2
+
+ new-instance v0, Ljava/util/ArrayList;
+
+ invoke-direct {v0}, Ljava/util/ArrayList;->()V
+
+ new-instance v1, Ljava/util/ArrayList;
+
+ invoke-direct {v1}, Ljava/util/ArrayList;->()V
+
+ invoke-virtual {p3}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
+
+ move-result-object v2
+
+ const-string v3, "context.contentResolver"
+
+ invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ invoke-static {p1, v2}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->extractLinks(Ljava/util/List;Landroid/content/ContentResolver;)Ljava/util/List;
+
+ move-result-object v2
+
+ invoke-static {p2, v2}, Lcom/discord/utilities/attachments/AttachmentUtilsKt;->appendLinks(Ljava/lang/String;Ljava/util/List;)Ljava/lang/String;
+
+ move-result-object p2
+
+ invoke-static {p1, v2}, Lj0/i/l;->minus(Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/List;
+
+ move-result-object p1
+
+ invoke-interface {p1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+ move-result-object p1
+
+ :goto_0
+ invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
+
+ move-result v2
+
+ if-eqz v2, :cond_1
+
+ invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+ move-result-object v2
+
+ check-cast v2, Lcom/lytefast/flexinput/model/Attachment;
+
+ invoke-virtual {v2}, Lcom/lytefast/flexinput/model/Attachment;->getUri()Landroid/net/Uri;
+
+ move-result-object v4
+
+ invoke-virtual {p3}, Landroid/content/Context;->getContentResolver()Landroid/content/ContentResolver;
+
+ move-result-object v5
+
+ invoke-static {v5, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ invoke-direct {p0, v4, v5}, Lcom/discord/utilities/rest/ProcessedMessageContent$Companion;->isUriValid(Landroid/net/Uri;Landroid/content/ContentResolver;)Z
+
+ move-result v4
+
+ if-eqz v4, :cond_0
+
+ invoke-virtual {v0, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+ goto :goto_0
+
+ :cond_0
+ invoke-virtual {v1, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+
+ goto :goto_0
+
+ :cond_1
+ new-instance p1, Lcom/discord/utilities/rest/ProcessedMessageContent;
+
+ invoke-direct {p1, v0, v1, p2}, Lcom/discord/utilities/rest/ProcessedMessageContent;->(Ljava/util/List;Ljava/util/List;Ljava/lang/String;)V
+
+ return-object p1
+
+ :cond_2
+ const-string p1, "context"
+
+ invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+
+ throw v0
+
+ :cond_3
+ const-string p1, "content"
+
+ invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+
+ throw v0
+
+ :cond_4
+ const-string p1, "attachments"
+
+ invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+
+ throw v0
+.end method
diff --git a/com.discord/smali/com/discord/utilities/rest/ProcessedMessageContent.smali b/com.discord/smali/com/discord/utilities/rest/ProcessedMessageContent.smali
new file mode 100644
index 0000000000..f94c2d9814
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/rest/ProcessedMessageContent.smali
@@ -0,0 +1,425 @@
+.class public final Lcom/discord/utilities/rest/ProcessedMessageContent;
+.super Ljava/lang/Object;
+.source "SendUtils.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+ value = {
+ Lcom/discord/utilities/rest/ProcessedMessageContent$Companion;
+ }
+.end annotation
+
+
+# static fields
+.field public static final Companion:Lcom/discord/utilities/rest/ProcessedMessageContent$Companion;
+
+
+# instance fields
+.field public final content:Ljava/lang/String;
+
+.field public final invalidAttachments:Ljava/util/List;
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Ljava/util/List<",
+ "Lcom/lytefast/flexinput/model/Attachment<",
+ "*>;>;"
+ }
+ .end annotation
+.end field
+
+.field public final validAttachments:Ljava/util/List;
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Ljava/util/List<",
+ "Lcom/lytefast/flexinput/model/Attachment<",
+ "*>;>;"
+ }
+ .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor