diff --git a/com.discord/AndroidManifest.xml b/com.discord/AndroidManifest.xml
index 5b59dde4c2..24b26e7074 100644
--- a/com.discord/AndroidManifest.xml
+++ b/com.discord/AndroidManifest.xml
@@ -96,6 +96,11 @@
+
+
+
+
+
diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml
index c2695f43d8..919427a64e 100644
--- a/com.discord/apktool.yml
+++ b/com.discord/apktool.yml
@@ -1,5 +1,5 @@
!!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-1246.apk
+apkFileName: com.discord-1247.apk
compressionType: false
doNotCompress:
- resources.arsc
@@ -3106,5 +3106,5 @@ usesFramework:
tag: null
version: 2.4.2-83a459-SNAPSHOT
versionInfo:
- versionCode: '1246'
- versionName: '36.5'
+ versionCode: '1247'
+ versionName: '37'
diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml
index f04342716f..bdf23b38bf 100644
Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ
diff --git a/com.discord/res/drawable-anydpi-v24/$video_call_illustration__0.xml b/com.discord/res/drawable-anydpi-v24/$video_call_illustration__0.xml
new file mode 100644
index 0000000000..344ccc48e9
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v24/$video_call_illustration__0.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v24/video_call_illustration.xml b/com.discord/res/drawable-anydpi-v24/video_call_illustration.xml
new file mode 100644
index 0000000000..87ba8a813a
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v24/video_call_illustration.xml
@@ -0,0 +1,73 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable-hdpi/video_call_illustration.png b/com.discord/res/drawable-hdpi/video_call_illustration.png
new file mode 100644
index 0000000000..a152df1050
Binary files /dev/null and b/com.discord/res/drawable-hdpi/video_call_illustration.png differ
diff --git a/com.discord/res/drawable-ldpi/video_call_illustration.png b/com.discord/res/drawable-ldpi/video_call_illustration.png
new file mode 100644
index 0000000000..fa6d6f75d3
Binary files /dev/null and b/com.discord/res/drawable-ldpi/video_call_illustration.png differ
diff --git a/com.discord/res/drawable-mdpi/video_call_illustration.png b/com.discord/res/drawable-mdpi/video_call_illustration.png
new file mode 100644
index 0000000000..29619ad019
Binary files /dev/null and b/com.discord/res/drawable-mdpi/video_call_illustration.png differ
diff --git a/com.discord/res/drawable-xhdpi/video_call_illustration.png b/com.discord/res/drawable-xhdpi/video_call_illustration.png
new file mode 100644
index 0000000000..6dc9596eba
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/video_call_illustration.png differ
diff --git a/com.discord/res/drawable-xxhdpi/video_call_illustration.png b/com.discord/res/drawable-xxhdpi/video_call_illustration.png
new file mode 100644
index 0000000000..70973771b7
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/video_call_illustration.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/video_call_illustration.png b/com.discord/res/drawable-xxxhdpi/video_call_illustration.png
new file mode 100644
index 0000000000..d2c6a85e6b
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/video_call_illustration.png differ
diff --git a/com.discord/res/layout-v22/widget_call_fullscreen.xml b/com.discord/res/layout-v22/widget_call_fullscreen.xml
new file mode 100644
index 0000000000..5b7f1400f0
--- /dev/null
+++ b/com.discord/res/layout-v22/widget_call_fullscreen.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_call_fullscreen.xml b/com.discord/res/layout/widget_call_fullscreen.xml
index 5230f2b6d9..0d019faa08 100644
--- a/com.discord/res/layout/widget_call_fullscreen.xml
+++ b/com.discord/res/layout/widget_call_fullscreen.xml
@@ -2,6 +2,11 @@
+
+
+
+
+
@@ -9,7 +14,7 @@
-
+
diff --git a/com.discord/res/layout/widget_channels_list.xml b/com.discord/res/layout/widget_channels_list.xml
index e4207a9f8a..fc542b0dbc 100644
--- a/com.discord/res/layout/widget_channels_list.xml
+++ b/com.discord/res/layout/widget_channels_list.xml
@@ -14,7 +14,7 @@
-
+
diff --git a/com.discord/res/layout/widget_friends_list_adapter_item_friend.xml b/com.discord/res/layout/widget_friends_list_adapter_item_friend.xml
index d908794430..da707950db 100644
--- a/com.discord/res/layout/widget_friends_list_adapter_item_friend.xml
+++ b/com.discord/res/layout/widget_friends_list_adapter_item_friend.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/com.discord/res/layout/widget_guild_invite_share.xml b/com.discord/res/layout/widget_guild_invite_share.xml
index ed7ea3492b..7c016ce9a5 100644
--- a/com.discord/res/layout/widget_guild_invite_share.xml
+++ b/com.discord/res/layout/widget_guild_invite_share.xml
@@ -20,7 +20,7 @@
-
+
diff --git a/com.discord/res/layout/widget_voice_settings_bottom_sheet.xml b/com.discord/res/layout/widget_voice_settings_bottom_sheet.xml
new file mode 100644
index 0000000000..2ec0ff5b46
--- /dev/null
+++ b/com.discord/res/layout/widget_voice_settings_bottom_sheet.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/menu/menu_call_fullscreen.xml b/com.discord/res/menu/menu_call_fullscreen.xml
index c448741e60..f7d12c9d5c 100644
--- a/com.discord/res/menu/menu_call_fullscreen.xml
+++ b/com.discord/res/menu/menu_call_fullscreen.xml
@@ -4,9 +4,5 @@
-
-
-
-
-
+
\ 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 9aa3020de0..c48fde8a9c 100644
--- a/com.discord/res/values-bg/strings.xml
+++ b/com.discord/res/values-bg/strings.xml
@@ -4657,7 +4657,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
Това съобщение ще бъде изпратено до всички сървъри, следващи този канал. Можеш да редактираш или изтриеш това съобщение по-късно и то ще се актуализира на всеки следващ сървър.
Това съобщение ще бъде изпратено до **%1$s сървъри**, следващи този канал. Можеш да редактираш или изтриеш това съобщение по-късно и то ще се актуализира на всеки следващ сървър.
Виж повече статистики в настройките на сървъра.
- О последната ти публикация си получил %1$s нови сървъра и си изгубил %2$s сървъра.
Достигнал си лимита от 10 публикувани съобщения на час. Но ентусиазмът ти ни харесва, за това опитай пак след %1$s.
О не, изскачащ прозорец.
Извинявай, нещо се обърка.
diff --git a/com.discord/res/values-cs/strings.xml b/com.discord/res/values-cs/strings.xml
index c9b30b1d60..46e35cbc38 100644
--- a/com.discord/res/values-cs/strings.xml
+++ b/com.discord/res/values-cs/strings.xml
@@ -4632,7 +4632,6 @@ stažení desktopové aplikace."
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.
- Od svého posledního příspěvku jsi nějaké nové servery získal/a (%1$s) a nějaké ztratil/a (%2$s).
Dosáhl jsi svého limitu 10 zveřejněných zpráv za hodinu. Líbí se nám ale tvůj zápal, tak to prosím zkus zase za %1$s.
Ajaj, vyskakovací okno.
Je nám líto, něco se pokazilo.
diff --git a/com.discord/res/values-da/strings.xml b/com.discord/res/values-da/strings.xml
index 71dd9a00c9..7957733603 100644
--- a/com.discord/res/values-da/strings.xml
+++ b/com.discord/res/values-da/strings.xml
@@ -4593,7 +4593,6 @@ mens spillet er i fokus."
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.
- Også, siden din sidste opdatering, har du fået %1$s nye servere og mistet %2$s servere.
Du har nået din grænse på max. 10 beskeder i timen. Men vi er vilde med du er så dedikeret, så prøv venligst igen om %1$s.
Åh, crap - Et popup vindue.
Beklager, noget gik galt.
diff --git a/com.discord/res/values-de/strings.xml b/com.discord/res/values-de/strings.xml
index bc9bcfa650..241c3087d7 100644
--- a/com.discord/res/values-de/strings.xml
+++ b/com.discord/res/values-de/strings.xml
@@ -4609,7 +4609,6 @@ Push-to-Talk-Erkennung zu ermöglichen, während du dich im Spiel befindest."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.
- Außerdem hast du seit deinem letzten Post %1$s neue Server gewonnen und %2$s Server verloren.
Du hast dein Limit von 10 veröffentlichten Nachrichten pro Stunde erreicht. Aber wir lieben deinen Enthusiasmus, also versuch es bitte in %1$s erneut.
Oh-oh, ein Popup-Fenster.
Sorry, da ist etwas schiefgelaufen.
diff --git a/com.discord/res/values-el/strings.xml b/com.discord/res/values-el/strings.xml
index a2c9a46c53..d53a4946ab 100644
--- a/com.discord/res/values-el/strings.xml
+++ b/com.discord/res/values-el/strings.xml
@@ -4642,7 +4642,6 @@ Avatar"
Αυτό το μήνυμα θα σταλεί σε όλους τους διακομιστές που ακολουθούν αυτό το κανάλι. Μπορείτε να επεξεργαστείτε ή να διαγράψετε αυτό το μήνυμα αργότερα, και θα ενημερωθεί αντίστοιχα ο κάθε διακομιστής που ακολουθεί.
Αυτό το μήνυμα θα σταλεί σε **%1$s διακομιστές** που ακολουθούν αυτό το κανάλι. Μπορείτε να επεξεργαστείτε ή να διαγράψετε αυτό το μήνυμα αργότερα, και θα ενημερωθεί αντίστοιχα ο κάθε διακομιστής που ακολουθεί.
Δείτε περισσότερα στατιστικά στις Ρυθμίσεις διακομιστή.
- Επίσης, συγκριτικά με την τελευταία σας δημοσίευση, κερδίσατε %1$s νέους διακομιστές και χάσατε %2$s διακομιστές.
"Έχεις φτάσει το όριο των 10 δημοσιευμένων μηνυμάτων ανά ώρα. Μας αρέσει, όμως, ο ενθουσιασμός σου, γι' αυτό προσπαθήστε ξανά σε %1$s."
Ωχ, ένα αναδυόμενο παράθυρο.
Συγγνώμη, κάτι πήγε στραβά.
diff --git a/com.discord/res/values-es-rES/strings.xml b/com.discord/res/values-es-rES/strings.xml
index d29ee235bd..96a1859baf 100644
--- a/com.discord/res/values-es-rES/strings.xml
+++ b/com.discord/res/values-es-rES/strings.xml
@@ -4556,7 +4556,6 @@ la detección de Pulsar para hablar mientras el juego está activo."
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.
- Además, desde tu última publicación has ganado %1$s servidores nuevos y has perdido %2$s.
Has alcanzado el límite de 10 mensajes publicados por hora, pero nos encanta tu entusiasmo, así que vuelve a intentarlo en %1$s.
Oh, no, una ventana emergente.
Lo sentimos, algo ha fallado.
diff --git a/com.discord/res/values-fi/strings.xml b/com.discord/res/values-fi/strings.xml
index 3a8bbd1a6d..1632aa0973 100644
--- a/com.discord/res/values-fi/strings.xml
+++ b/com.discord/res/values-fi/strings.xml
@@ -4661,7 +4661,6 @@ jotta radiopuhelintila toimii, kun pelin ikkuna on aktiivisena."
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.
- Olet saanut edellisen julkaisusi jälkeen %1$s uutta palvelinta ja menettänyt %2$s palvelinta.
10 julkaistun viestin raja tunnissa on täyttynyt. Intosi on kuitenkin ihailtavaa, joten yritä uudelleen %1$s kuluttua.
Oho, ponnahdusruutu.
Jokin meni valitettavasti vikaan.
diff --git a/com.discord/res/values-fr/strings.xml b/com.discord/res/values-fr/strings.xml
index 62dcca4a58..86d05dcd53 100644
--- a/com.discord/res/values-fr/strings.xml
+++ b/com.discord/res/values-fr/strings.xml
@@ -4639,7 +4639,6 @@ puisse être utilisée même quand le jeu est à l'avant-plan."
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.
- En outre, depuis ton dernier post, tu as gagné %1$s nouveaux serveurs et tu en as perdu %2$s.
Tu as atteint ta limite de 10 messages par heure. Nous apprécions ton enthousiasme, merci de réessayer dans %1$s.
Oh, oh. Une boîte de dialogue.
"Désolé, une erreur s'est produite."
diff --git a/com.discord/res/values-hr/strings.xml b/com.discord/res/values-hr/strings.xml
index 2f21b3aaac..3849f147ac 100644
--- a/com.discord/res/values-hr/strings.xml
+++ b/com.discord/res/values-hr/strings.xml
@@ -4577,7 +4577,6 @@ aktivira se tipkama **%1$s**."
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.
- Također, od svog posljednjeg posta stekao si %1$s novih servera i izgubio %2$s servera.
Čini se da te ograničava pravilo da se objavljuje najviše deset poruka na sat. Ali sviđa nam se taj entuzijazam pa te molimo da pokušaj opet za %1$s.
Opa, vidi pa to je pop-up box.
Sorry, ali nešto je pošlo krivo.
diff --git a/com.discord/res/values-hu/strings.xml b/com.discord/res/values-hu/strings.xml
index b40696a29f..f48e840091 100644
--- a/com.discord/res/values-hu/strings.xml
+++ b/com.discord/res/values-hu/strings.xml
@@ -4644,7 +4644,6 @@ miközben a játékablak aktív."
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.
- Az utolsó posztod óta %1$s új szervert szereztél és %2$s szervert vesztettél.
Elérted az óránkénti 10 nyilvános üzenetben meghúzott határt. De mivel imádjuk a lelkesedésedet, ezért próbálkozz újra %1$s.
O-ó, egy felugró üzenet.
Sajnáljuk, valami félrement.
diff --git a/com.discord/res/values-it/strings.xml b/com.discord/res/values-it/strings.xml
index 661afae71e..7691243687 100644
--- a/com.discord/res/values-it/strings.xml
+++ b/com.discord/res/values-it/strings.xml
@@ -4626,7 +4626,6 @@ quando il gioco è in primo piano."
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.
- Inoltre, dal tuo ultimo post, hai guadagnato %1$s nuovi server e hai perso %2$s server.
"Hai raggiunto il limite massimo di 10 messaggi pubblicati in un'ora. Tuttavia apprezziamo il tuo entusiasmo; pertanto potrai inviare di nuovo messaggi tra %1$s."
Ops, è apparsa una finestra pop-up selvatica.
Mi dispiace, qualcosa è andato storto.
diff --git a/com.discord/res/values-ja/strings.xml b/com.discord/res/values-ja/strings.xml
index 8cfe236869..3ff63a9e62 100644
--- a/com.discord/res/values-ja/strings.xml
+++ b/com.discord/res/values-ja/strings.xml
@@ -4686,7 +4686,6 @@ Discordについて詳しい情報が必要ですか?"
このチャンネルをフォローしている全てのサーバーにこのメッセージが送信されます。後でこのメッセージの編集と削除ができ、各サーバーでその部分が更新されます。
このチャンネルをフォローしている**%1$sサーバー**にこのメッセージが送信されます。後でこのメッセージの編集と削除ができ、各サーバーでその部分が更新されます。
サーバー設定でさらに統計を見ることができます。
- また、前回の投稿以来、%1$sの新しいサーバーを獲得し、%2$sのサーバーを損失しました。
1時間にメッセージを10通公開したため、制限に達しました。 でもその熱意は最高です。%1$s後にお試しください。
おや、ポップアップボックスです。
すみません、問題が発生しました。
diff --git a/com.discord/res/values-ko/strings.xml b/com.discord/res/values-ko/strings.xml
index 4e258b3002..fcf042f747 100644
--- a/com.discord/res/values-ko/strings.xml
+++ b/com.discord/res/values-ko/strings.xml
@@ -4674,7 +4674,6 @@ PC 앱을 받아주세요. [다운로드](onDownloadClick)"
이 채널을 팔로우하는 모든 서버에 메시지가 전송돼요. 메시지는 나중에 수정하거나 삭제할 수 있고, 팔로우하는 서버에도 마찬가지로 적용될 거예요.
이 채널을 팔로우하는 서버 **%1$s개**에 메시지가 전송돼요. 메시지는 나중에 수정하거나 삭제할 수 있고, 팔로우하는 서버에도 마찬가지로 적용될 거예요.
서버 설정에서 다른 통계도 살펴보세요.
- 마지막 포스트 이후 새로 팔로우한 서버는 %1$s개, 취소한 서버는 %2$s개예요.
메시지는 시간당 10개까지만 발행할 수 있어요. 하지만 저희는 열정을 높이 사죠. %1$s 후에 다시 해보세요.
이런, 팝업이 떴어요.
죄송해요, 무언가가 잘못됐어요.
diff --git a/com.discord/res/values-lt/strings.xml b/com.discord/res/values-lt/strings.xml
index a5d40fa803..b155ba1a76 100644
--- a/com.discord/res/values-lt/strings.xml
+++ b/com.discord/res/values-lt/strings.xml
@@ -4646,7 +4646,6 @@ galėtum Kalbėti visoje sistemoje."
Š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.
- Be to, nuo paskutinio įrašo gavai %1$s naujus (-ų) serverius (-ių) ir praradai %2$s serverius (-ių).
Pasiekei 10 paskelbtų pranešimų per valandą apribojimą. Tačiau džiaugiamės tavo entuziazmu, todėl pabandyk dar kartą po %1$s.
Oi, iškilo langas.
Apgailestaujame, kažkas įvyko ne taip.
diff --git a/com.discord/res/values-nl/strings.xml b/com.discord/res/values-nl/strings.xml
index 28ad3958ad..ce563ccc3c 100644
--- a/com.discord/res/values-nl/strings.xml
+++ b/com.discord/res/values-nl/strings.xml
@@ -4590,7 +4590,6 @@ detectie in te schakelen terwijl de game focus heeft."
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.
- Daarnaast heb je sinds je laatste post %1$s nieuwe servers erbij gekregen en %2$s servers verloren.
Je hebt je limiet van 10 gepubliceerde berichten per uur bereikt. We waarderen je enthousiasme, maar probeer het over %1$s nog eens.
O jee, een pop-up.
Sorry, er ging iets fout.
diff --git a/com.discord/res/values-no/strings.xml b/com.discord/res/values-no/strings.xml
index 50d4c6e3d7..1f4c60dc6d 100644
--- a/com.discord/res/values-no/strings.xml
+++ b/com.discord/res/values-no/strings.xml
@@ -4506,7 +4506,6 @@ til datamaskinen din hvis du ønsker å bruke denne funksjonen uten å ha nettle
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.
- Siden det forrige innlegget ditt har du også fått %1$s nye servere og mistet %2$s servere.
Du har nådd grensen på 10 publiserte meldinger i timen. Men vi digger entusiasmen, så prøv igjen om %1$s.
Hoppsann, en pop up-boks.
Beklager, noe gikk galt.
diff --git a/com.discord/res/values-pl/strings.xml b/com.discord/res/values-pl/strings.xml
index 9ccd86b2bd..b761784abc 100644
--- a/com.discord/res/values-pl/strings.xml
+++ b/com.discord/res/values-pl/strings.xml
@@ -4656,7 +4656,6 @@ podczas rozgrywki."
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.
- Przy okazji: od ostatniego posta zyskano %1$s nowe(-ych) serwery(-ów) i utracono %2$s serwery(-ów).
Osiągnięto limit 10 opublikowanych wiadomości na godzinę. Ale podoba nam się twój entuzjazm, więc spróbuj ponownie za %1$s.
O nie, wyskakujące okienko.
Przykro nam, coś poszło nie tak.
diff --git a/com.discord/res/values-pt-rBR/strings.xml b/com.discord/res/values-pt-rBR/strings.xml
index 57e199d717..b7103b3eac 100644
--- a/com.discord/res/values-pt-rBR/strings.xml
+++ b/com.discord/res/values-pt-rBR/strings.xml
@@ -4601,7 +4601,6 @@ Aperte para Falar possa ser usado enquanto o jogo estiver em primeiro plano."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.
- Além disso, desde sua última postagem, você ganhou %1$s novos servidores e perdeu %2$s servidores.
Você atingiu seu limite de 10 mensagens publicadas por hora. Adoramos seu entusiasmo, então tente novamente em %1$s.
Eita, um pop-up.
Sentimos muito, mas tem algo de errado que não está certo.
diff --git a/com.discord/res/values-ro/strings.xml b/com.discord/res/values-ro/strings.xml
index 0f18fd4a07..412c6b6421 100644
--- a/com.discord/res/values-ro/strings.xml
+++ b/com.discord/res/values-ro/strings.xml
@@ -4605,7 +4605,6 @@ detectarea modului Push-to-talk în timpul jocului."
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.
- În plus, de la ultima ta postare ai câștigat %1$s servere noi și ai pierdut %2$s servere.
Ai atins deja limita de 10 mesaje publicate pe oră. Însă ne place entuziasmul tău, așa că te rugăm să încerci din nou în %1$s.
Vai, o casetă pop-up.
Ne pare rău, ceva nu a mers bine.
diff --git a/com.discord/res/values-ru/strings.xml b/com.discord/res/values-ru/strings.xml
index 39fdf67e48..35d9a2c10c 100644
--- a/com.discord/res/values-ru/strings.xml
+++ b/com.discord/res/values-ru/strings.xml
@@ -4702,7 +4702,6 @@ Black Lives Matter {fixed}
Это сообщение будет отправлено на все сервера, подписанные на этот канал. Если вы удалите или отредактируете это сообщение, оно будет автоматически изменено на всех подписанных серверах.
Это сообщение будет отправлено на все сервера (**%1$s**), подписанные на этот канал. Если вы удалите или отредактируете это сообщение, оно будет автоматически изменено на всех подписанных серверах.
Подробную статистику можно найти в настройках сервера.
- Кроме того, с момента публикации последнего сообщения вы получили и потеряли несколько серверов — %1$s и %2$s соответственно.
Вы достигли лимита в 10 опубликованных сообщений в час. Но нам по душе ваш энтузиазм, так что попробуйте ещё раз через %1$s.
Ой-ой, всплывающее окно.
Ой, что-то пошло не так.
diff --git a/com.discord/res/values-sv-rSE/strings.xml b/com.discord/res/values-sv-rSE/strings.xml
index d199c4d7af..28dc0a7e4b 100644
--- a/com.discord/res/values-sv-rSE/strings.xml
+++ b/com.discord/res/values-sv-rSE/strings.xml
@@ -4537,7 +4537,6 @@ medan spelet är i fokus."
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.
- Sedan din senaste post har du dessutom fått %1$s nya servrar och förlorat %2$s servrar.
Du har nått gränsen på 10 publicerade meddelanden per timme. Men vi älskar din entusiasm, så försök igen om %1$s.
Åh nej, en pop-up-ruta.
Tyvärr, något gick snett.
diff --git a/com.discord/res/values-th/strings.xml b/com.discord/res/values-th/strings.xml
index 3cc3e6720c..b964195a0b 100644
--- a/com.discord/res/values-th/strings.xml
+++ b/com.discord/res/values-th/strings.xml
@@ -4653,7 +4653,6 @@ URL แบบย่อใช้ได้เฉพาะตัวอักษร
ข้อความเหล่านี้จะถูกส่งถึงเซิร์ฟเวอร์ทั้งหมดที่ติดตามช่องนี้ คุณสามารถแก้ไขหรือลบข้อความนี้ภายหลัง และคุณจะอัพเดทแต่ละเซิร์ฟเวอร์ตามลำดับต่อไป
ข้อความเหล่านี้จะถูกส่งถึง **%1$s เซิร์ฟเวอร์** ที่ติดตามช่องนี้ คุณสามารถแก้ไขหรือลบข้อความนี้ภายหลัง และคุณจะอัพเดทแต่ละเซิร์ฟเวอร์ตามลำดับต่อไป
ดูสถิติในตั้งค่าเซิร์ฟเวอร์
- นอกจากนั้น หลังจากโพสต์ล่าสุด คุณได้รับ %1$s เซิร์ฟเวอร์ใหม่และเสีย %2$s เซิร์ฟเวอร์
คุณถึงขีดจำกัดการเผยแพร่ข้อความสาธารณะ 10 ข้อความต่อชั่วโมงแล้ว แต่เราชอบความกระตือรือร้น โปรดลองใหม่อีกครั้งใน %1$s
อ๊ะ! กล่องป๊อปอัพ
ขออภัย บางอย่างผิดพลาด…
diff --git a/com.discord/res/values-tr/strings.xml b/com.discord/res/values-tr/strings.xml
index 0ba0540533..ea908919c0 100644
--- a/com.discord/res/values-tr/strings.xml
+++ b/com.discord/res/values-tr/strings.xml
@@ -4645,7 +4645,6 @@ algılamasını etkinleştirmek için lütfen oyun odakta iken Discord'u yöneti
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."
- Ayrıca, son gönderinden beri %1$s yeni sunucu kazandın ve %2$s sunucu kaybettin.
Saatlik 10 mesaj gönderme sınırına ulaştın, ama coşkunu beğendik, lütfen %1$s sonra tekrar dene.
Olamaz, bir açılır pencere.
Üzgünüz, bir hata oluştu.
diff --git a/com.discord/res/values-uk/strings.xml b/com.discord/res/values-uk/strings.xml
index b5b674cc3f..6aea859e0a 100644
--- a/com.discord/res/values-uk/strings.xml
+++ b/com.discord/res/values-uk/strings.xml
@@ -4671,7 +4671,6 @@
Це повідомлення буде відправлено на всі сервери, які підписані на цей канал. Ти можеш редагувати або видалити це повідомлення пізніше, і такі зміни відобразяться на всіх підписаних серверах.
Це повідомлення буде відправлено на всі сервери (**%1$s), які підписані на цей канал. Ти можеш редагувати або видалити це повідомлення пізніше, і такі зміни відобразяться на всіх підписаних серверах.
Докладнішу статистику дивись у налаштуваннях сервера.
- Крім того, з твого останнього повідомлення ти отримав нові сервери (%1$s) і втратив старі сервери (%2$s).
Досягнуто обмеження в 10 опублікованих повідомлень на годину. Але нам подобається твій ентузіазм, тому спробуй ще раз через %1$s.
Отакої! Спливаюче вікно.
На жаль, щось пішло не так.
diff --git a/com.discord/res/values-vi/strings.xml b/com.discord/res/values-vi/strings.xml
index 25f2040a6c..668ac78ee4 100644
--- a/com.discord/res/values-vi/strings.xml
+++ b/com.discord/res/values-vi/strings.xml
@@ -4627,7 +4627,6 @@ phát hiện Nhấn để Nói trong khi chơi game."
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ủ.
- Còn nữa, kể từ bài đăng cuối cùng, bạn đã có thêm %1$s máy chủ mới và mất đi %2$s máy chủ.
Bạn đã đạt giới hạn đăng 10 tin nhắn mỗi giờ. Chúng tôi thích sự nhiệt huyết đó, hãy thử lại trong %1$s nữa.
Ôi không, có cửa sổ bật lên.
Xin lỗi, có gì đó không ổn rồi.
diff --git a/com.discord/res/values-zh-rCN/strings.xml b/com.discord/res/values-zh-rCN/strings.xml
index 9cb8daa1a4..b87de53a0e 100644
--- a/com.discord/res/values-zh-rCN/strings.xml
+++ b/com.discord/res/values-zh-rCN/strings.xml
@@ -4665,7 +4665,6 @@
该消息会发送至所有关注此频道的服务器中。您可以在晚些时候编辑或删除此消息,随后每个关注的服务器中都会进行相应的更新。
该消息会发送至所有关注此频道的 **%1$s 个服务器** 中。您可以在晚些时候编辑或删除此消息,随后每个关注的服务器中都会进行相应的更新。
在服务器设置中查看更多数据。
- 还有,从您最近一次发帖到现在,您获得了 %1$s 个新服务器,失去了 %2$s 个服务器。
您已达到每小时发布10条消息的上限。但我们喜欢您的热情,请在%1$s后再试一次。
啊哦,弹出对话框啦。
对不起,哪里出错了。
diff --git a/com.discord/res/values-zh-rTW/strings.xml b/com.discord/res/values-zh-rTW/strings.xml
index c97e36ed47..7645fd8c62 100644
--- a/com.discord/res/values-zh-rTW/strings.xml
+++ b/com.discord/res/values-zh-rTW/strings.xml
@@ -4666,7 +4666,6 @@
系統將傳送此訊息至所有追蹤此頻道的伺服器。您之後可以編輯或刪除此訊息,在追蹤的所有伺服器中,訊息也將隨之更新。
系統將傳送此訊息至追蹤此頻道的 **%1$s 個伺服器**。您之後可以編輯或刪除此訊息,在追蹤的所有伺服器中,訊息也將隨之更新。
至伺服器設定查看更多統計資料。
- 還有,自從您上次貼文之後,您已經增加了 %1$s 個新的伺服器,並失去了 %2$s 個伺服器。
您已經達到每小時發布 10 則訊息的上限。不過我們欣賞您的熱忱,請於 %1$s 後再次嘗試發送訊息。
呃喔,彈出視窗。
抱歉,出問題了。
diff --git a/com.discord/res/values/ids.xml b/com.discord/res/values/ids.xml
index 477cf9ef42..32907256d4 100644
--- a/com.discord/res/values/ids.xml
+++ b/com.discord/res/values/ids.xml
@@ -274,6 +274,8 @@
+
+
@@ -1326,10 +1328,6 @@
-
-
-
-
@@ -2456,6 +2454,11 @@
+
+
+
+
+
diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml
index 2ac965fd7b..ebeb3f13d9 100644
--- a/com.discord/res/values/public.xml
+++ b/com.discord/res/values/public.xml
@@ -2790,1285 +2790,1286 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -4109,6 +4110,7 @@
+
@@ -4416,2453 +4418,2456 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -7576,7 +7581,8 @@
-
+
+
@@ -11809,5315 +11815,5334 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml
index 36e1337593..8a40f676d6 100644
--- a/com.discord/res/values/strings.xml
+++ b/com.discord/res/values/strings.xml
@@ -882,6 +882,7 @@
Build Override for %1$s
Build ID
%1$s client only
+ %1$s targets only
Invalid build override
Incorrect user
"Build isn't available"
@@ -1130,7 +1131,7 @@ We’re here to make a good impression."
Presets
Select a color
Transparency
- ddf82858fc4c4f54ae0dd9fe9b9b3caa
+ 69aa2cdb644d4c6fb6de7389a17f0698
Coming Soon
Search Animated GIFs on the Web
Displays text with emphasis.
@@ -2420,6 +2421,14 @@ Analytics about Announcement Channels, Server Discovery, and Welcome Screen also
We usually follow up within X days.
Each Partner application is reviewed by Discord. Please note that applying does not guarantee Partnership.
"Just submit and you're done!"
+ Having direct access to the Discord Community Team for assistance
+ Aside from the upgraded server perks, what are you most looking forward to getting out of being a Partnered community?
+ If you selected other, what have you got in mind?
+ Early access to news and feature updates
+ Getting inspired with new ideas and suggestions from other Partners on how to grow my community
+ Other
+ Being able to talk with other Partnered community leaders
+ Partnership Survey
Apply to the Discord Partner Program
Server Type
Business / Brand
@@ -2432,7 +2441,8 @@ Analytics about Announcement Channels, Server Discovery, and Welcome Screen also
"Next, we'll also need some info about you, the server owner. Since you're a content creator, you will need to specify where you make your stuff."
Tell us about yourself!
Community Website (Optional)
- All Partners are required to use light theme moving forward. Please set your client to light theme. :)
+ Take a moment to share what makes your server unique, or tell us something truly special that happened within your community.
+ What makes your server deserving of Partnership?
Discord Partner
"We can't show any further details."
This server is not public.
@@ -3299,6 +3309,7 @@ Want to know more about Discord?"
Are you sure you want to remove **%1$s**?
An internal server error has occurred.
Error Removing Bot
+ You do not have permissions to remove this integration.
Removing this integration will remove any bots and webhooks on this page from your server. This action cannot be undone.
Remove %1$s
Bots and Apps
@@ -3857,6 +3868,8 @@ Want to know more about Discord?"
Message unpinned.
Message Actions
Messages
+ Messages failed to load
+ Try Again
Add Phone Number
Already Enabled!
SMS Backup Authentication
@@ -3886,6 +3899,7 @@ Want to know more about Discord?"
Experimental feature that may improve performance in video calls. Beware, may cause jank.
While speaking, filter out background noise and showcase your wonderful voice. Powered by Krisp.
Noise suppression (beta)
+ Participants without video are currently hidden. Would you like to show them?
Moderation
Are you sure?
Monthly
@@ -4852,8 +4866,8 @@ The changes to your subscription are reflected below:"
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.
- "Also, since your last post, you've gained %1$s new servers and lost %2$s servers."
+ Server Insights.
+ Announcement stats can be found in
"You've reached your 10 published messages per-hour limit. But we love the enthusiasm, so please try again in %1$s."
Uh-oh, a pop up box.
Sorry, something went wrong.
@@ -5387,7 +5401,6 @@ Good news though, it does work on your mobile web browser! So please open it the
Offline
Online
Online via mobile
- https://status.discord.com
Streaming
Unknown
Step %1$s
@@ -6106,6 +6119,8 @@ You cannot take any moderation actions until you enable it."
Video Unavailable
Video and Screen Share are not supported in this browser. Please download our desktop client to beam your face and screen across the net.
Browser not supported
+ BETA: View this server as if you had a set of roles. This will disconnect you from any calls in this server.
+ Voice restrictions (priority speaking, suppression, etc) are tied to your user, so it may not reflect the roles you are viewing as.
View Audit Log
"Members with this permission have access to view the server's audit logs"
View Channel
@@ -6115,6 +6130,9 @@ You cannot take any moderation actions until you enable it."
View Profile
View spectators
View surrounding messages.
+ Edit Roles
+ Select Roles
+ You are viewing this guild with only selected roles.
A member who has clicked into the server and viewed a channel.
Voice
Voice & Video
@@ -6175,6 +6193,7 @@ You cannot take any moderation actions until you enable it."
Are you sure you want to remove this channel from recommended channels?
Remove Recommended Channel
Set an emoji for this channel!
+ Create your first channel
Download the Discord App
Invite your friends
Send your first message
diff --git a/com.discord/smali/androidx/activity/R$drawable.smali b/com.discord/smali/androidx/activity/R$drawable.smali
index 059329bf85..942b587203 100644
--- a/com.discord/smali/androidx/activity/R$drawable.smali
+++ b/com.discord/smali/androidx/activity/R$drawable.smali
@@ -14,29 +14,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
# direct methods
diff --git a/com.discord/smali/androidx/activity/R$id.smali b/com.discord/smali/androidx/activity/R$id.smali
index 33b5dc9f6a..32ce2f8b23 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 = 0x7f0a00f4
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02cf
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a0969
+.field public static final tag_accessibility_actions:I = 0x7f0a0967
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096a
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0968
-.field public static final tag_accessibility_heading:I = 0x7f0a096b
+.field public static final tag_accessibility_heading:I = 0x7f0a0969
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096c
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096a
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096d
+.field public static final tag_screen_reader_focusable:I = 0x7f0a096b
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
# direct methods
diff --git a/com.discord/smali/androidx/activity/R$string.smali b/com.discord/smali/androidx/activity/R$string.smali
index d02a739303..81d1c017aa 100644
--- a/com.discord/smali/androidx/activity/R$string.smali
+++ b/com.discord/smali/androidx/activity/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
# direct methods
diff --git a/com.discord/smali/androidx/activity/ktx/R$drawable.smali b/com.discord/smali/androidx/activity/ktx/R$drawable.smali
index 2d44427987..8f555d08d4 100644
--- a/com.discord/smali/androidx/activity/ktx/R$drawable.smali
+++ b/com.discord/smali/androidx/activity/ktx/R$drawable.smali
@@ -14,29 +14,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
# 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 43f681524d..8a57dd8056 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 = 0x7f0a00f4
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02cf
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a0969
+.field public static final tag_accessibility_actions:I = 0x7f0a0967
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096a
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0968
-.field public static final tag_accessibility_heading:I = 0x7f0a096b
+.field public static final tag_accessibility_heading:I = 0x7f0a0969
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096c
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096a
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096d
+.field public static final tag_screen_reader_focusable:I = 0x7f0a096b
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
# direct methods
diff --git a/com.discord/smali/androidx/activity/ktx/R$string.smali b/com.discord/smali/androidx/activity/ktx/R$string.smali
index e9d4d9fd27..cf6f9bc3e9 100644
--- a/com.discord/smali/androidx/activity/ktx/R$string.smali
+++ b/com.discord/smali/androidx/activity/ktx/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$drawable.smali b/com.discord/smali/androidx/appcompat/R$drawable.smali
index 3fc90344ce..26d8079ce8 100644
--- a/com.discord/smali/androidx/appcompat/R$drawable.smali
+++ b/com.discord/smali/androidx/appcompat/R$drawable.smali
@@ -14,221 +14,221 @@
# static fields
-.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080031
+.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080032
-.field public static final abc_action_bar_item_background_material:I = 0x7f080032
+.field public static final abc_action_bar_item_background_material:I = 0x7f080033
-.field public static final abc_btn_borderless_material:I = 0x7f080033
+.field public static final abc_btn_borderless_material:I = 0x7f080034
-.field public static final abc_btn_check_material:I = 0x7f080034
+.field public static final abc_btn_check_material:I = 0x7f080035
-.field public static final abc_btn_check_material_anim:I = 0x7f080035
+.field public static final abc_btn_check_material_anim:I = 0x7f080036
-.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f080036
+.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f080037
-.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f080037
+.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f080038
-.field public static final abc_btn_colored_material:I = 0x7f080038
+.field public static final abc_btn_colored_material:I = 0x7f080039
-.field public static final abc_btn_default_mtrl_shape:I = 0x7f080039
+.field public static final abc_btn_default_mtrl_shape:I = 0x7f08003a
-.field public static final abc_btn_radio_material:I = 0x7f08003a
+.field public static final abc_btn_radio_material:I = 0x7f08003b
-.field public static final abc_btn_radio_material_anim:I = 0x7f08003b
+.field public static final abc_btn_radio_material_anim:I = 0x7f08003c
-.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08003c
+.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08003d
-.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f08003d
+.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f08003e
-.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f08003e
+.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f08003f
-.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f08003f
+.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080040
-.field public static final abc_cab_background_internal_bg:I = 0x7f080040
+.field public static final abc_cab_background_internal_bg:I = 0x7f080041
-.field public static final abc_cab_background_top_material:I = 0x7f080041
+.field public static final abc_cab_background_top_material:I = 0x7f080042
-.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080042
+.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080043
-.field public static final abc_control_background_material:I = 0x7f080043
+.field public static final abc_control_background_material:I = 0x7f080044
-.field public static final abc_dialog_material_background:I = 0x7f080044
+.field public static final abc_dialog_material_background:I = 0x7f080045
-.field public static final abc_edit_text_material:I = 0x7f080045
+.field public static final abc_edit_text_material:I = 0x7f080046
-.field public static final abc_ic_ab_back_material:I = 0x7f080046
+.field public static final abc_ic_ab_back_material:I = 0x7f080047
-.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f080047
+.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f080048
-.field public static final abc_ic_clear_material:I = 0x7f080048
+.field public static final abc_ic_clear_material:I = 0x7f080049
-.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f080049
+.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08004a
-.field public static final abc_ic_go_search_api_material:I = 0x7f08004a
+.field public static final abc_ic_go_search_api_material:I = 0x7f08004b
-.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08004b
+.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08004c
-.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08004c
+.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08004d
-.field public static final abc_ic_menu_overflow_material:I = 0x7f08004d
+.field public static final abc_ic_menu_overflow_material:I = 0x7f08004e
-.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f08004e
+.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f08004f
-.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f08004f
+.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080050
-.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080050
+.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080051
-.field public static final abc_ic_search_api_material:I = 0x7f080051
+.field public static final abc_ic_search_api_material:I = 0x7f080052
-.field public static final abc_ic_star_black_16dp:I = 0x7f080052
+.field public static final abc_ic_star_black_16dp:I = 0x7f080053
-.field public static final abc_ic_star_black_36dp:I = 0x7f080053
+.field public static final abc_ic_star_black_36dp:I = 0x7f080054
-.field public static final abc_ic_star_black_48dp:I = 0x7f080054
+.field public static final abc_ic_star_black_48dp:I = 0x7f080055
-.field public static final abc_ic_star_half_black_16dp:I = 0x7f080055
+.field public static final abc_ic_star_half_black_16dp:I = 0x7f080056
-.field public static final abc_ic_star_half_black_36dp:I = 0x7f080056
+.field public static final abc_ic_star_half_black_36dp:I = 0x7f080057
-.field public static final abc_ic_star_half_black_48dp:I = 0x7f080057
+.field public static final abc_ic_star_half_black_48dp:I = 0x7f080058
-.field public static final abc_ic_voice_search_api_material:I = 0x7f080058
+.field public static final abc_ic_voice_search_api_material:I = 0x7f080059
-.field public static final abc_item_background_holo_dark:I = 0x7f080059
+.field public static final abc_item_background_holo_dark:I = 0x7f08005a
-.field public static final abc_item_background_holo_light:I = 0x7f08005a
+.field public static final abc_item_background_holo_light:I = 0x7f08005b
-.field public static final abc_list_divider_material:I = 0x7f08005b
+.field public static final abc_list_divider_material:I = 0x7f08005c
-.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08005c
+.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08005d
-.field public static final abc_list_focused_holo:I = 0x7f08005d
+.field public static final abc_list_focused_holo:I = 0x7f08005e
-.field public static final abc_list_longpressed_holo:I = 0x7f08005e
+.field public static final abc_list_longpressed_holo:I = 0x7f08005f
-.field public static final abc_list_pressed_holo_dark:I = 0x7f08005f
+.field public static final abc_list_pressed_holo_dark:I = 0x7f080060
-.field public static final abc_list_pressed_holo_light:I = 0x7f080060
+.field public static final abc_list_pressed_holo_light:I = 0x7f080061
-.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080061
+.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080062
-.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080062
+.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080063
-.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080063
+.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080064
-.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080064
+.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080065
-.field public static final abc_list_selector_holo_dark:I = 0x7f080065
+.field public static final abc_list_selector_holo_dark:I = 0x7f080066
-.field public static final abc_list_selector_holo_light:I = 0x7f080066
+.field public static final abc_list_selector_holo_light:I = 0x7f080067
-.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f080067
+.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f080068
-.field public static final abc_popup_background_mtrl_mult:I = 0x7f080068
+.field public static final abc_popup_background_mtrl_mult:I = 0x7f080069
-.field public static final abc_ratingbar_indicator_material:I = 0x7f080069
+.field public static final abc_ratingbar_indicator_material:I = 0x7f08006a
-.field public static final abc_ratingbar_material:I = 0x7f08006a
+.field public static final abc_ratingbar_material:I = 0x7f08006b
-.field public static final abc_ratingbar_small_material:I = 0x7f08006b
+.field public static final abc_ratingbar_small_material:I = 0x7f08006c
-.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08006c
+.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08006d
-.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f08006d
+.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f08006e
-.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f08006e
+.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f08006f
-.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f08006f
+.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080070
-.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080070
+.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080071
-.field public static final abc_seekbar_thumb_material:I = 0x7f080071
+.field public static final abc_seekbar_thumb_material:I = 0x7f080072
-.field public static final abc_seekbar_tick_mark_material:I = 0x7f080072
+.field public static final abc_seekbar_tick_mark_material:I = 0x7f080073
-.field public static final abc_seekbar_track_material:I = 0x7f080073
+.field public static final abc_seekbar_track_material:I = 0x7f080074
-.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080074
+.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080075
-.field public static final abc_spinner_textfield_background_material:I = 0x7f080075
+.field public static final abc_spinner_textfield_background_material:I = 0x7f080076
-.field public static final abc_switch_thumb_material:I = 0x7f080076
+.field public static final abc_switch_thumb_material:I = 0x7f080077
-.field public static final abc_switch_track_mtrl_alpha:I = 0x7f080077
+.field public static final abc_switch_track_mtrl_alpha:I = 0x7f080078
-.field public static final abc_tab_indicator_material:I = 0x7f080078
+.field public static final abc_tab_indicator_material:I = 0x7f080079
-.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f080079
+.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08007a
-.field public static final abc_text_cursor_material:I = 0x7f08007a
+.field public static final abc_text_cursor_material:I = 0x7f08007b
-.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08007b
+.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08007c
-.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08007c
+.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08007d
-.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f08007d
+.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f08007e
-.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f08007e
+.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f08007f
-.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f08007f
+.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080080
-.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080080
+.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080081
-.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080081
+.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080082
-.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080082
+.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080083
-.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080083
+.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080084
-.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080084
+.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080085
-.field public static final abc_textfield_search_material:I = 0x7f080085
+.field public static final abc_textfield_search_material:I = 0x7f080086
-.field public static final abc_vector_test:I = 0x7f080086
+.field public static final abc_vector_test:I = 0x7f080087
-.field public static final btn_checkbox_checked_mtrl:I = 0x7f0800c0
+.field public static final btn_checkbox_checked_mtrl:I = 0x7f0800c1
-.field public static final btn_checkbox_checked_to_unchecked_mtrl_animation:I = 0x7f0800c1
+.field public static final btn_checkbox_checked_to_unchecked_mtrl_animation:I = 0x7f0800c2
-.field public static final btn_checkbox_unchecked_mtrl:I = 0x7f0800c2
+.field public static final btn_checkbox_unchecked_mtrl:I = 0x7f0800c3
-.field public static final btn_checkbox_unchecked_to_checked_mtrl_animation:I = 0x7f0800c3
+.field public static final btn_checkbox_unchecked_to_checked_mtrl_animation:I = 0x7f0800c4
-.field public static final btn_radio_off_mtrl:I = 0x7f0800c4
+.field public static final btn_radio_off_mtrl:I = 0x7f0800c5
-.field public static final btn_radio_off_to_on_mtrl_animation:I = 0x7f0800c5
+.field public static final btn_radio_off_to_on_mtrl_animation:I = 0x7f0800c6
-.field public static final btn_radio_on_mtrl:I = 0x7f0800c6
+.field public static final btn_radio_on_mtrl:I = 0x7f0800c7
-.field public static final btn_radio_on_to_off_mtrl_animation:I = 0x7f0800c7
+.field public static final btn_radio_on_to_off_mtrl_animation:I = 0x7f0800c8
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
-.field public static final tooltip_frame_dark:I = 0x7f08051f
+.field public static final tooltip_frame_dark:I = 0x7f080520
-.field public static final tooltip_frame_light:I = 0x7f080520
+.field public static final tooltip_frame_light:I = 0x7f080521
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$id.smali b/com.discord/smali/androidx/appcompat/R$id.smali
index b0d8ef79ec..571107b62e 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 = 0x7f0a0125
-.field public static final checkbox:I = 0x7f0a0260
+.field public static final checkbox:I = 0x7f0a0262
-.field public static final checked:I = 0x7f0a0262
+.field public static final checked:I = 0x7f0a0264
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final content:I = 0x7f0a028a
+.field public static final content:I = 0x7f0a028c
-.field public static final contentPanel:I = 0x7f0a028b
+.field public static final contentPanel:I = 0x7f0a028d
-.field public static final custom:I = 0x7f0a02b5
+.field public static final custom:I = 0x7f0a02b7
-.field public static final customPanel:I = 0x7f0a02b6
+.field public static final customPanel:I = 0x7f0a02b8
-.field public static final decor_content_parent:I = 0x7f0a02be
+.field public static final decor_content_parent:I = 0x7f0a02c0
-.field public static final default_activity_button:I = 0x7f0a02bf
+.field public static final default_activity_button:I = 0x7f0a02c1
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02cf
-.field public static final edit_query:I = 0x7f0a031e
+.field public static final edit_query:I = 0x7f0a0320
-.field public static final expand_activities_button:I = 0x7f0a0368
+.field public static final expand_activities_button:I = 0x7f0a036a
-.field public static final expanded_menu:I = 0x7f0a0369
+.field public static final expanded_menu:I = 0x7f0a036b
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final group_divider:I = 0x7f0a0412
+.field public static final group_divider:I = 0x7f0a0414
-.field public static final home:I = 0x7f0a04c1
+.field public static final home:I = 0x7f0a04c3
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final image:I = 0x7f0a04e0
+.field public static final image:I = 0x7f0a04e2
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final listMode:I = 0x7f0a058a
+.field public static final listMode:I = 0x7f0a058c
-.field public static final list_item:I = 0x7f0a058b
+.field public static final list_item:I = 0x7f0a058d
-.field public static final message:I = 0x7f0a05de
+.field public static final message:I = 0x7f0a05dc
-.field public static final multiply:I = 0x7f0a0600
+.field public static final multiply:I = 0x7f0a05fe
-.field public static final none:I = 0x7f0a0627
+.field public static final none:I = 0x7f0a0625
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final off:I = 0x7f0a0668
+.field public static final off:I = 0x7f0a0666
-.field public static final on:I = 0x7f0a066c
+.field public static final on:I = 0x7f0a066a
-.field public static final parentPanel:I = 0x7f0a0681
+.field public static final parentPanel:I = 0x7f0a067f
-.field public static final progress_circular:I = 0x7f0a072c
+.field public static final progress_circular:I = 0x7f0a072a
-.field public static final progress_horizontal:I = 0x7f0a072f
+.field public static final progress_horizontal:I = 0x7f0a072d
-.field public static final radio:I = 0x7f0a073d
+.field public static final radio:I = 0x7f0a073b
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final screen:I = 0x7f0a0791
+.field public static final screen:I = 0x7f0a078f
-.field public static final scrollIndicatorDown:I = 0x7f0a0795
+.field public static final scrollIndicatorDown:I = 0x7f0a0793
-.field public static final scrollIndicatorUp:I = 0x7f0a0796
+.field public static final scrollIndicatorUp:I = 0x7f0a0794
-.field public static final scrollView:I = 0x7f0a0797
+.field public static final scrollView:I = 0x7f0a0795
-.field public static final search_badge:I = 0x7f0a079a
+.field public static final search_badge:I = 0x7f0a0798
-.field public static final search_bar:I = 0x7f0a079b
+.field public static final search_bar:I = 0x7f0a0799
-.field public static final search_button:I = 0x7f0a079c
+.field public static final search_button:I = 0x7f0a079a
-.field public static final search_close_btn:I = 0x7f0a079d
+.field public static final search_close_btn:I = 0x7f0a079b
-.field public static final search_edit_frame:I = 0x7f0a079e
+.field public static final search_edit_frame:I = 0x7f0a079c
-.field public static final search_go_btn:I = 0x7f0a07a0
+.field public static final search_go_btn:I = 0x7f0a079e
-.field public static final search_mag_icon:I = 0x7f0a07a1
+.field public static final search_mag_icon:I = 0x7f0a079f
-.field public static final search_plate:I = 0x7f0a07a2
+.field public static final search_plate:I = 0x7f0a07a0
-.field public static final search_src_text:I = 0x7f0a07a5
+.field public static final search_src_text:I = 0x7f0a07a3
-.field public static final search_voice_btn:I = 0x7f0a07b1
+.field public static final search_voice_btn:I = 0x7f0a07af
-.field public static final select_dialog_listview:I = 0x7f0a07b4
+.field public static final select_dialog_listview:I = 0x7f0a07b2
-.field public static final shortcut:I = 0x7f0a0914
+.field public static final shortcut:I = 0x7f0a0912
-.field public static final spacer:I = 0x7f0a0923
+.field public static final spacer:I = 0x7f0a0921
-.field public static final split_action_bar:I = 0x7f0a0927
+.field public static final split_action_bar:I = 0x7f0a0925
-.field public static final src_atop:I = 0x7f0a092b
+.field public static final src_atop:I = 0x7f0a0929
-.field public static final src_in:I = 0x7f0a092c
+.field public static final src_in:I = 0x7f0a092a
-.field public static final src_over:I = 0x7f0a092d
+.field public static final src_over:I = 0x7f0a092b
-.field public static final submenuarrow:I = 0x7f0a094a
+.field public static final submenuarrow:I = 0x7f0a0948
-.field public static final submit_area:I = 0x7f0a094b
+.field public static final submit_area:I = 0x7f0a0949
-.field public static final tabMode:I = 0x7f0a095b
+.field public static final tabMode:I = 0x7f0a0959
-.field public static final tag_accessibility_actions:I = 0x7f0a0969
+.field public static final tag_accessibility_actions:I = 0x7f0a0967
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096a
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0968
-.field public static final tag_accessibility_heading:I = 0x7f0a096b
+.field public static final tag_accessibility_heading:I = 0x7f0a0969
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096c
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096a
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096d
+.field public static final tag_screen_reader_focusable:I = 0x7f0a096b
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final textSpacerNoButtons:I = 0x7f0a097f
+.field public static final textSpacerNoButtons:I = 0x7f0a097d
-.field public static final textSpacerNoTitle:I = 0x7f0a0980
+.field public static final textSpacerNoTitle:I = 0x7f0a097e
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
-.field public static final titleDividerNoCustom:I = 0x7f0a0993
+.field public static final titleDividerNoCustom:I = 0x7f0a0991
-.field public static final title_template:I = 0x7f0a0994
+.field public static final title_template:I = 0x7f0a0992
-.field public static final topPanel:I = 0x7f0a099b
+.field public static final topPanel:I = 0x7f0a0999
-.field public static final unchecked:I = 0x7f0a09b1
+.field public static final unchecked:I = 0x7f0a09af
-.field public static final uniform:I = 0x7f0a09b4
+.field public static final uniform:I = 0x7f0a09b2
-.field public static final up:I = 0x7f0a09b6
+.field public static final up:I = 0x7f0a09b4
-.field public static final wrap_content:I = 0x7f0a0ab6
+.field public static final wrap_content:I = 0x7f0a0ab9
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$string.smali b/com.discord/smali/androidx/appcompat/R$string.smali
index 483052893c..84e741bdd0 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 = 0x7f120020
-.field public static final search_menu_title:I = 0x7f121404
+.field public static final search_menu_title:I = 0x7f121412
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/resources/R$drawable.smali b/com.discord/smali/androidx/appcompat/resources/R$drawable.smali
index 65b6ea815e..9fb47fa47b 100644
--- a/com.discord/smali/androidx/appcompat/resources/R$drawable.smali
+++ b/com.discord/smali/androidx/appcompat/resources/R$drawable.smali
@@ -14,31 +14,31 @@
# static fields
-.field public static final abc_vector_test:I = 0x7f080086
+.field public static final abc_vector_test:I = 0x7f080087
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
# 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 73cccfac31..226edd020b 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 = 0x7f0a00f4
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02cf
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a0969
+.field public static final tag_accessibility_actions:I = 0x7f0a0967
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096a
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0968
-.field public static final tag_accessibility_heading:I = 0x7f0a096b
+.field public static final tag_accessibility_heading:I = 0x7f0a0969
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096c
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096a
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096d
+.field public static final tag_screen_reader_focusable:I = 0x7f0a096b
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/resources/R$string.smali b/com.discord/smali/androidx/appcompat/resources/R$string.smali
index b5014ec53a..1790e520ac 100644
--- a/com.discord/smali/androidx/appcompat/resources/R$string.smali
+++ b/com.discord/smali/androidx/appcompat/resources/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
# direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali b/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali
index f84a310201..54327a71fd 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali
@@ -14,29 +14,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
# direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$id.smali b/com.discord/smali/androidx/asynclayoutinflater/R$id.smali
index c80d06e112..68b1f2afff 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 = 0x7f0a00f4
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
# direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$string.smali b/com.discord/smali/androidx/asynclayoutinflater/R$string.smali
index 5a6201ec42..8117edda93 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$string.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
# direct methods
diff --git a/com.discord/smali/androidx/browser/R$drawable.smali b/com.discord/smali/androidx/browser/R$drawable.smali
index a3b3a943b8..b88dd75f10 100644
--- a/com.discord/smali/androidx/browser/R$drawable.smali
+++ b/com.discord/smali/androidx/browser/R$drawable.smali
@@ -14,29 +14,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
# direct methods
diff --git a/com.discord/smali/androidx/browser/R$id.smali b/com.discord/smali/androidx/browser/R$id.smali
index 5d6b668ff3..5106faf5f3 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 = 0x7f0a0124
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02cf
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a0969
+.field public static final tag_accessibility_actions:I = 0x7f0a0967
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096a
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0968
-.field public static final tag_accessibility_heading:I = 0x7f0a096b
+.field public static final tag_accessibility_heading:I = 0x7f0a0969
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096c
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096a
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096d
+.field public static final tag_screen_reader_focusable:I = 0x7f0a096b
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
# direct methods
diff --git a/com.discord/smali/androidx/browser/R$string.smali b/com.discord/smali/androidx/browser/R$string.smali
index d887d2841a..daebb9a254 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 = 0x7f1204dc
+.field public static final copy_toast_msg:I = 0x7f1204dd
-.field public static final fallback_menu_item_copy_link:I = 0x7f12069b
+.field public static final fallback_menu_item_copy_link:I = 0x7f12069c
-.field public static final fallback_menu_item_open_in_browser:I = 0x7f12069c
+.field public static final fallback_menu_item_open_in_browser:I = 0x7f12069d
-.field public static final fallback_menu_item_share_link:I = 0x7f12069d
+.field public static final fallback_menu_item_share_link:I = 0x7f12069e
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
# 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 24d7647dda..deab2dc6af 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 = 0x7f0a011e
-.field public static final end:I = 0x7f0a034b
+.field public static final end:I = 0x7f0a034d
-.field public static final gone:I = 0x7f0a0410
+.field public static final gone:I = 0x7f0a0412
-.field public static final invisible:I = 0x7f0a0511
+.field public static final invisible:I = 0x7f0a0513
-.field public static final left:I = 0x7f0a0584
+.field public static final left:I = 0x7f0a0586
-.field public static final packed:I = 0x7f0a067d
+.field public static final packed:I = 0x7f0a067b
-.field public static final parent:I = 0x7f0a0680
+.field public static final parent:I = 0x7f0a067e
-.field public static final percent:I = 0x7f0a06ae
+.field public static final percent:I = 0x7f0a06ac
-.field public static final right:I = 0x7f0a075f
+.field public static final right:I = 0x7f0a075d
-.field public static final spread:I = 0x7f0a0928
+.field public static final spread:I = 0x7f0a0926
-.field public static final spread_inside:I = 0x7f0a0929
+.field public static final spread_inside:I = 0x7f0a0927
-.field public static final start:I = 0x7f0a0930
+.field public static final start:I = 0x7f0a092e
-.field public static final top:I = 0x7f0a099a
+.field public static final top:I = 0x7f0a0998
-.field public static final wrap:I = 0x7f0a0ab5
+.field public static final wrap:I = 0x7f0a0ab8
# direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali b/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali
index 7acf0f2557..42f5a550a2 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali
@@ -14,29 +14,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
# direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$id.smali b/com.discord/smali/androidx/coordinatorlayout/R$id.smali
index a69026bbf6..542cf9bb6f 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 = 0x7f0a011e
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02cf
-.field public static final end:I = 0x7f0a034b
+.field public static final end:I = 0x7f0a034d
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final left:I = 0x7f0a0584
+.field public static final left:I = 0x7f0a0586
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final none:I = 0x7f0a0627
+.field public static final none:I = 0x7f0a0625
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right:I = 0x7f0a075f
+.field public static final right:I = 0x7f0a075d
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final start:I = 0x7f0a0930
+.field public static final start:I = 0x7f0a092e
-.field public static final tag_accessibility_actions:I = 0x7f0a0969
+.field public static final tag_accessibility_actions:I = 0x7f0a0967
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096a
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0968
-.field public static final tag_accessibility_heading:I = 0x7f0a096b
+.field public static final tag_accessibility_heading:I = 0x7f0a0969
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096c
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096a
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096d
+.field public static final tag_screen_reader_focusable:I = 0x7f0a096b
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
-.field public static final top:I = 0x7f0a099a
+.field public static final top:I = 0x7f0a0998
# direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$string.smali b/com.discord/smali/androidx/coordinatorlayout/R$string.smali
index d67f1b3c94..ea88d2a4fa 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$string.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
# direct methods
diff --git a/com.discord/smali/androidx/core/R$drawable.smali b/com.discord/smali/androidx/core/R$drawable.smali
index 90234f8ce8..ce69d74219 100644
--- a/com.discord/smali/androidx/core/R$drawable.smali
+++ b/com.discord/smali/androidx/core/R$drawable.smali
@@ -14,29 +14,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
# direct methods
diff --git a/com.discord/smali/androidx/core/R$id.smali b/com.discord/smali/androidx/core/R$id.smali
index e17edced30..4ac714b251 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 = 0x7f0a00f4
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02cf
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a0969
+.field public static final tag_accessibility_actions:I = 0x7f0a0967
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096a
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0968
-.field public static final tag_accessibility_heading:I = 0x7f0a096b
+.field public static final tag_accessibility_heading:I = 0x7f0a0969
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096c
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096a
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096d
+.field public static final tag_screen_reader_focusable:I = 0x7f0a096b
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
# direct methods
diff --git a/com.discord/smali/androidx/core/R$string.smali b/com.discord/smali/androidx/core/R$string.smali
index dc11e93c81..66ad461a04 100644
--- a/com.discord/smali/androidx/core/R$string.smali
+++ b/com.discord/smali/androidx/core/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
# direct methods
diff --git a/com.discord/smali/androidx/core/ktx/R$drawable.smali b/com.discord/smali/androidx/core/ktx/R$drawable.smali
index f4aa0afb1e..4d396acb31 100644
--- a/com.discord/smali/androidx/core/ktx/R$drawable.smali
+++ b/com.discord/smali/androidx/core/ktx/R$drawable.smali
@@ -14,29 +14,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
# 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 3985e894bb..90563288b8 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 = 0x7f0a00f4
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02cf
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a0969
+.field public static final tag_accessibility_actions:I = 0x7f0a0967
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096a
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0968
-.field public static final tag_accessibility_heading:I = 0x7f0a096b
+.field public static final tag_accessibility_heading:I = 0x7f0a0969
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096c
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096a
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096d
+.field public static final tag_screen_reader_focusable:I = 0x7f0a096b
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
# direct methods
diff --git a/com.discord/smali/androidx/core/ktx/R$string.smali b/com.discord/smali/androidx/core/ktx/R$string.smali
index 16876b85d9..cee1399129 100644
--- a/com.discord/smali/androidx/core/ktx/R$string.smali
+++ b/com.discord/smali/androidx/core/ktx/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
# direct methods
diff --git a/com.discord/smali/androidx/customview/R$drawable.smali b/com.discord/smali/androidx/customview/R$drawable.smali
index 166ffa142f..5c7533af0b 100644
--- a/com.discord/smali/androidx/customview/R$drawable.smali
+++ b/com.discord/smali/androidx/customview/R$drawable.smali
@@ -14,29 +14,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
# direct methods
diff --git a/com.discord/smali/androidx/customview/R$id.smali b/com.discord/smali/androidx/customview/R$id.smali
index 0663394323..9f20f66daa 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 = 0x7f0a00f4
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
# direct methods
diff --git a/com.discord/smali/androidx/customview/R$string.smali b/com.discord/smali/androidx/customview/R$string.smali
index 950ae8d710..d0bd89f482 100644
--- a/com.discord/smali/androidx/customview/R$string.smali
+++ b/com.discord/smali/androidx/customview/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
# direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$drawable.smali b/com.discord/smali/androidx/drawerlayout/R$drawable.smali
index a0059b3bc8..7b5f45b30c 100644
--- a/com.discord/smali/androidx/drawerlayout/R$drawable.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$drawable.smali
@@ -14,29 +14,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
# direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$id.smali b/com.discord/smali/androidx/drawerlayout/R$id.smali
index d9fee071ca..a6b2dd77fc 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 = 0x7f0a00f4
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
# direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$string.smali b/com.discord/smali/androidx/drawerlayout/R$string.smali
index b8e5d532d1..7a16bf01d1 100644
--- a/com.discord/smali/androidx/drawerlayout/R$string.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
# direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$drawable.smali b/com.discord/smali/androidx/dynamicanimation/R$drawable.smali
index 0c3fff6055..cefc6f85bc 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$drawable.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$drawable.smali
@@ -14,29 +14,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
# direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$id.smali b/com.discord/smali/androidx/dynamicanimation/R$id.smali
index af8af27a75..a1a81d5565 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 = 0x7f0a00f4
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02cf
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a0969
+.field public static final tag_accessibility_actions:I = 0x7f0a0967
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096a
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0968
-.field public static final tag_accessibility_heading:I = 0x7f0a096b
+.field public static final tag_accessibility_heading:I = 0x7f0a0969
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096c
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096a
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096d
+.field public static final tag_screen_reader_focusable:I = 0x7f0a096b
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
# direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$string.smali b/com.discord/smali/androidx/dynamicanimation/R$string.smali
index 3cdc02d83e..309448c981 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$string.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
# direct methods
diff --git a/com.discord/smali/androidx/fragment/R$drawable.smali b/com.discord/smali/androidx/fragment/R$drawable.smali
index eca4b25b02..6986482e5d 100644
--- a/com.discord/smali/androidx/fragment/R$drawable.smali
+++ b/com.discord/smali/androidx/fragment/R$drawable.smali
@@ -14,29 +14,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
# direct methods
diff --git a/com.discord/smali/androidx/fragment/R$id.smali b/com.discord/smali/androidx/fragment/R$id.smali
index a1b338d762..7acac87cc2 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 = 0x7f0a00f4
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02cf
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final fragment_container_view_tag:I = 0x7f0a03c8
+.field public static final fragment_container_view_tag:I = 0x7f0a03ca
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a0969
+.field public static final tag_accessibility_actions:I = 0x7f0a0967
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096a
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0968
-.field public static final tag_accessibility_heading:I = 0x7f0a096b
+.field public static final tag_accessibility_heading:I = 0x7f0a0969
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096c
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096a
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096d
+.field public static final tag_screen_reader_focusable:I = 0x7f0a096b
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
-.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a4e
+.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a4c
# direct methods
diff --git a/com.discord/smali/androidx/fragment/R$string.smali b/com.discord/smali/androidx/fragment/R$string.smali
index 053d114d3b..4065a5f759 100644
--- a/com.discord/smali/androidx/fragment/R$string.smali
+++ b/com.discord/smali/androidx/fragment/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
# direct methods
diff --git a/com.discord/smali/androidx/fragment/ktx/R$drawable.smali b/com.discord/smali/androidx/fragment/ktx/R$drawable.smali
index c05d43b36e..617d622087 100644
--- a/com.discord/smali/androidx/fragment/ktx/R$drawable.smali
+++ b/com.discord/smali/androidx/fragment/ktx/R$drawable.smali
@@ -14,29 +14,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
# 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 dc0325d2c0..14defc7d15 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 = 0x7f0a00f4
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02cf
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final fragment_container_view_tag:I = 0x7f0a03c8
+.field public static final fragment_container_view_tag:I = 0x7f0a03ca
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a0969
+.field public static final tag_accessibility_actions:I = 0x7f0a0967
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096a
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0968
-.field public static final tag_accessibility_heading:I = 0x7f0a096b
+.field public static final tag_accessibility_heading:I = 0x7f0a0969
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096c
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096a
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096d
+.field public static final tag_screen_reader_focusable:I = 0x7f0a096b
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
-.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a4e
+.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a4c
# direct methods
diff --git a/com.discord/smali/androidx/fragment/ktx/R$string.smali b/com.discord/smali/androidx/fragment/ktx/R$string.smali
index b693cb76ff..ff3eeba4cb 100644
--- a/com.discord/smali/androidx/fragment/ktx/R$string.smali
+++ b/com.discord/smali/androidx/fragment/ktx/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreui/R$drawable.smali b/com.discord/smali/androidx/legacy/coreui/R$drawable.smali
index 4bb57e07f7..56dd236c87 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$drawable.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$drawable.smali
@@ -14,29 +14,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
# 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 bac673c0e0..ada48b2ae7 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 = 0x7f0a011e
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final end:I = 0x7f0a034b
+.field public static final end:I = 0x7f0a034d
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final left:I = 0x7f0a0584
+.field public static final left:I = 0x7f0a0586
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final none:I = 0x7f0a0627
+.field public static final none:I = 0x7f0a0625
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right:I = 0x7f0a075f
+.field public static final right:I = 0x7f0a075d
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final start:I = 0x7f0a0930
+.field public static final start:I = 0x7f0a092e
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
-.field public static final top:I = 0x7f0a099a
+.field public static final top:I = 0x7f0a0998
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreui/R$string.smali b/com.discord/smali/androidx/legacy/coreui/R$string.smali
index a6b168628f..8ccca0d74c 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$string.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali b/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali
index bb182d58bf..b86ca4f9ed 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali
@@ -14,29 +14,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
# 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 e821e39393..5635d7a3e2 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 = 0x7f0a00f4
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$string.smali b/com.discord/smali/androidx/legacy/coreutils/R$string.smali
index c5d600f7a9..b97ce8da23 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$string.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
# direct methods
diff --git a/com.discord/smali/androidx/legacy/v4/R$drawable.smali b/com.discord/smali/androidx/legacy/v4/R$drawable.smali
index f70ed6daaf..4f59c80f52 100644
--- a/com.discord/smali/androidx/legacy/v4/R$drawable.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$drawable.smali
@@ -14,29 +14,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
# 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 7e2e6d5c8c..8bca1f3090 100644
--- a/com.discord/smali/androidx/legacy/v4/R$id.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$id.smali
@@ -32,67 +32,67 @@
.field public static final bottom:I = 0x7f0a011e
-.field public static final cancel_action:I = 0x7f0a013a
+.field public static final cancel_action:I = 0x7f0a013c
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final end:I = 0x7f0a034b
+.field public static final end:I = 0x7f0a034d
-.field public static final end_padder:I = 0x7f0a034c
+.field public static final end_padder:I = 0x7f0a034e
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final left:I = 0x7f0a0584
+.field public static final left:I = 0x7f0a0586
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final media_actions:I = 0x7f0a05a1
+.field public static final media_actions:I = 0x7f0a05a3
-.field public static final none:I = 0x7f0a0627
+.field public static final none:I = 0x7f0a0625
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right:I = 0x7f0a075f
+.field public static final right:I = 0x7f0a075d
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final start:I = 0x7f0a0930
+.field public static final start:I = 0x7f0a092e
-.field public static final status_bar_latest_event_content:I = 0x7f0a0934
+.field public static final status_bar_latest_event_content:I = 0x7f0a0932
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
-.field public static final top:I = 0x7f0a099a
+.field public static final top:I = 0x7f0a0998
# direct methods
diff --git a/com.discord/smali/androidx/legacy/v4/R$string.smali b/com.discord/smali/androidx/legacy/v4/R$string.smali
index 2af3fb9ba7..09cf4ceca9 100644
--- a/com.discord/smali/androidx/legacy/v4/R$string.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
# direct methods
diff --git a/com.discord/smali/androidx/loader/R$drawable.smali b/com.discord/smali/androidx/loader/R$drawable.smali
index 59e0491d19..a8a3072678 100644
--- a/com.discord/smali/androidx/loader/R$drawable.smali
+++ b/com.discord/smali/androidx/loader/R$drawable.smali
@@ -14,29 +14,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
# direct methods
diff --git a/com.discord/smali/androidx/loader/R$id.smali b/com.discord/smali/androidx/loader/R$id.smali
index 4232544ce3..59f5e60f3c 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 = 0x7f0a00f4
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
# direct methods
diff --git a/com.discord/smali/androidx/loader/R$string.smali b/com.discord/smali/androidx/loader/R$string.smali
index 4ca28ae495..f68e765fb3 100644
--- a/com.discord/smali/androidx/loader/R$string.smali
+++ b/com.discord/smali/androidx/loader/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
# direct methods
diff --git a/com.discord/smali/androidx/media/R$drawable.smali b/com.discord/smali/androidx/media/R$drawable.smali
index 00f75566dc..ab9f75ef5e 100644
--- a/com.discord/smali/androidx/media/R$drawable.smali
+++ b/com.discord/smali/androidx/media/R$drawable.smali
@@ -14,29 +14,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
# direct methods
diff --git a/com.discord/smali/androidx/media/R$id.smali b/com.discord/smali/androidx/media/R$id.smali
index 1ccadab8ad..b11b405131 100644
--- a/com.discord/smali/androidx/media/R$id.smali
+++ b/com.discord/smali/androidx/media/R$id.smali
@@ -30,55 +30,55 @@
.field public static final blocking:I = 0x7f0a00f4
-.field public static final cancel_action:I = 0x7f0a013a
+.field public static final cancel_action:I = 0x7f0a013c
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final end_padder:I = 0x7f0a034c
+.field public static final end_padder:I = 0x7f0a034e
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final media_actions:I = 0x7f0a05a1
+.field public static final media_actions:I = 0x7f0a05a3
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final status_bar_latest_event_content:I = 0x7f0a0934
+.field public static final status_bar_latest_event_content:I = 0x7f0a0932
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
# direct methods
diff --git a/com.discord/smali/androidx/media/R$string.smali b/com.discord/smali/androidx/media/R$string.smali
index 2f435c58ee..08ba7f0442 100644
--- a/com.discord/smali/androidx/media/R$string.smali
+++ b/com.discord/smali/androidx/media/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
# direct methods
diff --git a/com.discord/smali/androidx/preference/R$drawable.smali b/com.discord/smali/androidx/preference/R$drawable.smali
index 2a08b66eae..9c0a1533d9 100644
--- a/com.discord/smali/androidx/preference/R$drawable.smali
+++ b/com.discord/smali/androidx/preference/R$drawable.smali
@@ -14,225 +14,225 @@
# static fields
-.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080031
+.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080032
-.field public static final abc_action_bar_item_background_material:I = 0x7f080032
+.field public static final abc_action_bar_item_background_material:I = 0x7f080033
-.field public static final abc_btn_borderless_material:I = 0x7f080033
+.field public static final abc_btn_borderless_material:I = 0x7f080034
-.field public static final abc_btn_check_material:I = 0x7f080034
+.field public static final abc_btn_check_material:I = 0x7f080035
-.field public static final abc_btn_check_material_anim:I = 0x7f080035
+.field public static final abc_btn_check_material_anim:I = 0x7f080036
-.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f080036
+.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f080037
-.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f080037
+.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f080038
-.field public static final abc_btn_colored_material:I = 0x7f080038
+.field public static final abc_btn_colored_material:I = 0x7f080039
-.field public static final abc_btn_default_mtrl_shape:I = 0x7f080039
+.field public static final abc_btn_default_mtrl_shape:I = 0x7f08003a
-.field public static final abc_btn_radio_material:I = 0x7f08003a
+.field public static final abc_btn_radio_material:I = 0x7f08003b
-.field public static final abc_btn_radio_material_anim:I = 0x7f08003b
+.field public static final abc_btn_radio_material_anim:I = 0x7f08003c
-.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08003c
+.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08003d
-.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f08003d
+.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f08003e
-.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f08003e
+.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f08003f
-.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f08003f
+.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080040
-.field public static final abc_cab_background_internal_bg:I = 0x7f080040
+.field public static final abc_cab_background_internal_bg:I = 0x7f080041
-.field public static final abc_cab_background_top_material:I = 0x7f080041
+.field public static final abc_cab_background_top_material:I = 0x7f080042
-.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080042
+.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080043
-.field public static final abc_control_background_material:I = 0x7f080043
+.field public static final abc_control_background_material:I = 0x7f080044
-.field public static final abc_dialog_material_background:I = 0x7f080044
+.field public static final abc_dialog_material_background:I = 0x7f080045
-.field public static final abc_edit_text_material:I = 0x7f080045
+.field public static final abc_edit_text_material:I = 0x7f080046
-.field public static final abc_ic_ab_back_material:I = 0x7f080046
+.field public static final abc_ic_ab_back_material:I = 0x7f080047
-.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f080047
+.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f080048
-.field public static final abc_ic_clear_material:I = 0x7f080048
+.field public static final abc_ic_clear_material:I = 0x7f080049
-.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f080049
+.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08004a
-.field public static final abc_ic_go_search_api_material:I = 0x7f08004a
+.field public static final abc_ic_go_search_api_material:I = 0x7f08004b
-.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08004b
+.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08004c
-.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08004c
+.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08004d
-.field public static final abc_ic_menu_overflow_material:I = 0x7f08004d
+.field public static final abc_ic_menu_overflow_material:I = 0x7f08004e
-.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f08004e
+.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f08004f
-.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f08004f
+.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080050
-.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080050
+.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080051
-.field public static final abc_ic_search_api_material:I = 0x7f080051
+.field public static final abc_ic_search_api_material:I = 0x7f080052
-.field public static final abc_ic_star_black_16dp:I = 0x7f080052
+.field public static final abc_ic_star_black_16dp:I = 0x7f080053
-.field public static final abc_ic_star_black_36dp:I = 0x7f080053
+.field public static final abc_ic_star_black_36dp:I = 0x7f080054
-.field public static final abc_ic_star_black_48dp:I = 0x7f080054
+.field public static final abc_ic_star_black_48dp:I = 0x7f080055
-.field public static final abc_ic_star_half_black_16dp:I = 0x7f080055
+.field public static final abc_ic_star_half_black_16dp:I = 0x7f080056
-.field public static final abc_ic_star_half_black_36dp:I = 0x7f080056
+.field public static final abc_ic_star_half_black_36dp:I = 0x7f080057
-.field public static final abc_ic_star_half_black_48dp:I = 0x7f080057
+.field public static final abc_ic_star_half_black_48dp:I = 0x7f080058
-.field public static final abc_ic_voice_search_api_material:I = 0x7f080058
+.field public static final abc_ic_voice_search_api_material:I = 0x7f080059
-.field public static final abc_item_background_holo_dark:I = 0x7f080059
+.field public static final abc_item_background_holo_dark:I = 0x7f08005a
-.field public static final abc_item_background_holo_light:I = 0x7f08005a
+.field public static final abc_item_background_holo_light:I = 0x7f08005b
-.field public static final abc_list_divider_material:I = 0x7f08005b
+.field public static final abc_list_divider_material:I = 0x7f08005c
-.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08005c
+.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08005d
-.field public static final abc_list_focused_holo:I = 0x7f08005d
+.field public static final abc_list_focused_holo:I = 0x7f08005e
-.field public static final abc_list_longpressed_holo:I = 0x7f08005e
+.field public static final abc_list_longpressed_holo:I = 0x7f08005f
-.field public static final abc_list_pressed_holo_dark:I = 0x7f08005f
+.field public static final abc_list_pressed_holo_dark:I = 0x7f080060
-.field public static final abc_list_pressed_holo_light:I = 0x7f080060
+.field public static final abc_list_pressed_holo_light:I = 0x7f080061
-.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080061
+.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080062
-.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080062
+.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080063
-.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080063
+.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080064
-.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080064
+.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080065
-.field public static final abc_list_selector_holo_dark:I = 0x7f080065
+.field public static final abc_list_selector_holo_dark:I = 0x7f080066
-.field public static final abc_list_selector_holo_light:I = 0x7f080066
+.field public static final abc_list_selector_holo_light:I = 0x7f080067
-.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f080067
+.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f080068
-.field public static final abc_popup_background_mtrl_mult:I = 0x7f080068
+.field public static final abc_popup_background_mtrl_mult:I = 0x7f080069
-.field public static final abc_ratingbar_indicator_material:I = 0x7f080069
+.field public static final abc_ratingbar_indicator_material:I = 0x7f08006a
-.field public static final abc_ratingbar_material:I = 0x7f08006a
+.field public static final abc_ratingbar_material:I = 0x7f08006b
-.field public static final abc_ratingbar_small_material:I = 0x7f08006b
+.field public static final abc_ratingbar_small_material:I = 0x7f08006c
-.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08006c
+.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08006d
-.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f08006d
+.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f08006e
-.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f08006e
+.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f08006f
-.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f08006f
+.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080070
-.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080070
+.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080071
-.field public static final abc_seekbar_thumb_material:I = 0x7f080071
+.field public static final abc_seekbar_thumb_material:I = 0x7f080072
-.field public static final abc_seekbar_tick_mark_material:I = 0x7f080072
+.field public static final abc_seekbar_tick_mark_material:I = 0x7f080073
-.field public static final abc_seekbar_track_material:I = 0x7f080073
+.field public static final abc_seekbar_track_material:I = 0x7f080074
-.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080074
+.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080075
-.field public static final abc_spinner_textfield_background_material:I = 0x7f080075
+.field public static final abc_spinner_textfield_background_material:I = 0x7f080076
-.field public static final abc_switch_thumb_material:I = 0x7f080076
+.field public static final abc_switch_thumb_material:I = 0x7f080077
-.field public static final abc_switch_track_mtrl_alpha:I = 0x7f080077
+.field public static final abc_switch_track_mtrl_alpha:I = 0x7f080078
-.field public static final abc_tab_indicator_material:I = 0x7f080078
+.field public static final abc_tab_indicator_material:I = 0x7f080079
-.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f080079
+.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08007a
-.field public static final abc_text_cursor_material:I = 0x7f08007a
+.field public static final abc_text_cursor_material:I = 0x7f08007b
-.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08007b
+.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08007c
-.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08007c
+.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08007d
-.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f08007d
+.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f08007e
-.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f08007e
+.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f08007f
-.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f08007f
+.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080080
-.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080080
+.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080081
-.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080081
+.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080082
-.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080082
+.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080083
-.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080083
+.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080084
-.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080084
+.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080085
-.field public static final abc_textfield_search_material:I = 0x7f080085
+.field public static final abc_textfield_search_material:I = 0x7f080086
-.field public static final abc_vector_test:I = 0x7f080086
+.field public static final abc_vector_test:I = 0x7f080087
-.field public static final btn_checkbox_checked_mtrl:I = 0x7f0800c0
+.field public static final btn_checkbox_checked_mtrl:I = 0x7f0800c1
-.field public static final btn_checkbox_checked_to_unchecked_mtrl_animation:I = 0x7f0800c1
+.field public static final btn_checkbox_checked_to_unchecked_mtrl_animation:I = 0x7f0800c2
-.field public static final btn_checkbox_unchecked_mtrl:I = 0x7f0800c2
+.field public static final btn_checkbox_unchecked_mtrl:I = 0x7f0800c3
-.field public static final btn_checkbox_unchecked_to_checked_mtrl_animation:I = 0x7f0800c3
+.field public static final btn_checkbox_unchecked_to_checked_mtrl_animation:I = 0x7f0800c4
-.field public static final btn_radio_off_mtrl:I = 0x7f0800c4
+.field public static final btn_radio_off_mtrl:I = 0x7f0800c5
-.field public static final btn_radio_off_to_on_mtrl_animation:I = 0x7f0800c5
+.field public static final btn_radio_off_to_on_mtrl_animation:I = 0x7f0800c6
-.field public static final btn_radio_on_mtrl:I = 0x7f0800c6
+.field public static final btn_radio_on_mtrl:I = 0x7f0800c7
-.field public static final btn_radio_on_to_off_mtrl_animation:I = 0x7f0800c7
+.field public static final btn_radio_on_to_off_mtrl_animation:I = 0x7f0800c8
-.field public static final ic_arrow_down_24dp:I = 0x7f080221
+.field public static final ic_arrow_down_24dp:I = 0x7f080222
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
-.field public static final preference_list_divider_material:I = 0x7f08050c
+.field public static final preference_list_divider_material:I = 0x7f08050d
-.field public static final tooltip_frame_dark:I = 0x7f08051f
+.field public static final tooltip_frame_dark:I = 0x7f080520
-.field public static final tooltip_frame_light:I = 0x7f080520
+.field public static final tooltip_frame_light:I = 0x7f080521
# direct methods
diff --git a/com.discord/smali/androidx/preference/R$id.smali b/com.discord/smali/androidx/preference/R$id.smali
index d17c2fbb70..ab4ea40e4c 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 = 0x7f0a0125
-.field public static final checkbox:I = 0x7f0a0260
+.field public static final checkbox:I = 0x7f0a0262
-.field public static final checked:I = 0x7f0a0262
+.field public static final checked:I = 0x7f0a0264
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final content:I = 0x7f0a028a
+.field public static final content:I = 0x7f0a028c
-.field public static final contentPanel:I = 0x7f0a028b
+.field public static final contentPanel:I = 0x7f0a028d
-.field public static final custom:I = 0x7f0a02b5
+.field public static final custom:I = 0x7f0a02b7
-.field public static final customPanel:I = 0x7f0a02b6
+.field public static final customPanel:I = 0x7f0a02b8
-.field public static final decor_content_parent:I = 0x7f0a02be
+.field public static final decor_content_parent:I = 0x7f0a02c0
-.field public static final default_activity_button:I = 0x7f0a02bf
+.field public static final default_activity_button:I = 0x7f0a02c1
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02cf
-.field public static final edit_query:I = 0x7f0a031e
+.field public static final edit_query:I = 0x7f0a0320
-.field public static final end:I = 0x7f0a034b
+.field public static final end:I = 0x7f0a034d
-.field public static final expand_activities_button:I = 0x7f0a0368
+.field public static final expand_activities_button:I = 0x7f0a036a
-.field public static final expanded_menu:I = 0x7f0a0369
+.field public static final expanded_menu:I = 0x7f0a036b
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final fragment_container_view_tag:I = 0x7f0a03c8
+.field public static final fragment_container_view_tag:I = 0x7f0a03ca
-.field public static final group_divider:I = 0x7f0a0412
+.field public static final group_divider:I = 0x7f0a0414
-.field public static final home:I = 0x7f0a04c1
+.field public static final home:I = 0x7f0a04c3
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_frame:I = 0x7f0a04d5
+.field public static final icon_frame:I = 0x7f0a04d7
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final image:I = 0x7f0a04e0
+.field public static final image:I = 0x7f0a04e2
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a056f
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0571
-.field public static final left:I = 0x7f0a0584
+.field public static final left:I = 0x7f0a0586
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final listMode:I = 0x7f0a058a
+.field public static final listMode:I = 0x7f0a058c
-.field public static final list_item:I = 0x7f0a058b
+.field public static final list_item:I = 0x7f0a058d
-.field public static final message:I = 0x7f0a05de
+.field public static final message:I = 0x7f0a05dc
-.field public static final multiply:I = 0x7f0a0600
+.field public static final multiply:I = 0x7f0a05fe
-.field public static final none:I = 0x7f0a0627
+.field public static final none:I = 0x7f0a0625
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final off:I = 0x7f0a0668
+.field public static final off:I = 0x7f0a0666
-.field public static final on:I = 0x7f0a066c
+.field public static final on:I = 0x7f0a066a
-.field public static final parentPanel:I = 0x7f0a0681
+.field public static final parentPanel:I = 0x7f0a067f
-.field public static final progress_circular:I = 0x7f0a072c
+.field public static final progress_circular:I = 0x7f0a072a
-.field public static final progress_horizontal:I = 0x7f0a072f
+.field public static final progress_horizontal:I = 0x7f0a072d
-.field public static final radio:I = 0x7f0a073d
+.field public static final radio:I = 0x7f0a073b
-.field public static final recycler_view:I = 0x7f0a0743
+.field public static final recycler_view:I = 0x7f0a0741
-.field public static final right:I = 0x7f0a075f
+.field public static final right:I = 0x7f0a075d
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final screen:I = 0x7f0a0791
+.field public static final screen:I = 0x7f0a078f
-.field public static final scrollIndicatorDown:I = 0x7f0a0795
+.field public static final scrollIndicatorDown:I = 0x7f0a0793
-.field public static final scrollIndicatorUp:I = 0x7f0a0796
+.field public static final scrollIndicatorUp:I = 0x7f0a0794
-.field public static final scrollView:I = 0x7f0a0797
+.field public static final scrollView:I = 0x7f0a0795
-.field public static final search_badge:I = 0x7f0a079a
+.field public static final search_badge:I = 0x7f0a0798
-.field public static final search_bar:I = 0x7f0a079b
+.field public static final search_bar:I = 0x7f0a0799
-.field public static final search_button:I = 0x7f0a079c
+.field public static final search_button:I = 0x7f0a079a
-.field public static final search_close_btn:I = 0x7f0a079d
+.field public static final search_close_btn:I = 0x7f0a079b
-.field public static final search_edit_frame:I = 0x7f0a079e
+.field public static final search_edit_frame:I = 0x7f0a079c
-.field public static final search_go_btn:I = 0x7f0a07a0
+.field public static final search_go_btn:I = 0x7f0a079e
-.field public static final search_mag_icon:I = 0x7f0a07a1
+.field public static final search_mag_icon:I = 0x7f0a079f
-.field public static final search_plate:I = 0x7f0a07a2
+.field public static final search_plate:I = 0x7f0a07a0
-.field public static final search_src_text:I = 0x7f0a07a5
+.field public static final search_src_text:I = 0x7f0a07a3
-.field public static final search_voice_btn:I = 0x7f0a07b1
+.field public static final search_voice_btn:I = 0x7f0a07af
-.field public static final seekbar:I = 0x7f0a07b2
+.field public static final seekbar:I = 0x7f0a07b0
-.field public static final seekbar_value:I = 0x7f0a07b3
+.field public static final seekbar_value:I = 0x7f0a07b1
-.field public static final select_dialog_listview:I = 0x7f0a07b4
+.field public static final select_dialog_listview:I = 0x7f0a07b2
-.field public static final shortcut:I = 0x7f0a0914
+.field public static final shortcut:I = 0x7f0a0912
-.field public static final spacer:I = 0x7f0a0923
+.field public static final spacer:I = 0x7f0a0921
-.field public static final spinner:I = 0x7f0a0926
+.field public static final spinner:I = 0x7f0a0924
-.field public static final split_action_bar:I = 0x7f0a0927
+.field public static final split_action_bar:I = 0x7f0a0925
-.field public static final src_atop:I = 0x7f0a092b
+.field public static final src_atop:I = 0x7f0a0929
-.field public static final src_in:I = 0x7f0a092c
+.field public static final src_in:I = 0x7f0a092a
-.field public static final src_over:I = 0x7f0a092d
+.field public static final src_over:I = 0x7f0a092b
-.field public static final start:I = 0x7f0a0930
+.field public static final start:I = 0x7f0a092e
-.field public static final submenuarrow:I = 0x7f0a094a
+.field public static final submenuarrow:I = 0x7f0a0948
-.field public static final submit_area:I = 0x7f0a094b
+.field public static final submit_area:I = 0x7f0a0949
-.field public static final switchWidget:I = 0x7f0a0959
+.field public static final switchWidget:I = 0x7f0a0957
-.field public static final tabMode:I = 0x7f0a095b
+.field public static final tabMode:I = 0x7f0a0959
-.field public static final tag_accessibility_actions:I = 0x7f0a0969
+.field public static final tag_accessibility_actions:I = 0x7f0a0967
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096a
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0968
-.field public static final tag_accessibility_heading:I = 0x7f0a096b
+.field public static final tag_accessibility_heading:I = 0x7f0a0969
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096c
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096a
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096d
+.field public static final tag_screen_reader_focusable:I = 0x7f0a096b
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final textSpacerNoButtons:I = 0x7f0a097f
+.field public static final textSpacerNoButtons:I = 0x7f0a097d
-.field public static final textSpacerNoTitle:I = 0x7f0a0980
+.field public static final textSpacerNoTitle:I = 0x7f0a097e
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
-.field public static final titleDividerNoCustom:I = 0x7f0a0993
+.field public static final titleDividerNoCustom:I = 0x7f0a0991
-.field public static final title_template:I = 0x7f0a0994
+.field public static final title_template:I = 0x7f0a0992
-.field public static final top:I = 0x7f0a099a
+.field public static final top:I = 0x7f0a0998
-.field public static final topPanel:I = 0x7f0a099b
+.field public static final topPanel:I = 0x7f0a0999
-.field public static final unchecked:I = 0x7f0a09b1
+.field public static final unchecked:I = 0x7f0a09af
-.field public static final uniform:I = 0x7f0a09b4
+.field public static final uniform:I = 0x7f0a09b2
-.field public static final up:I = 0x7f0a09b6
+.field public static final up:I = 0x7f0a09b4
-.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a4e
+.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a4c
-.field public static final wrap_content:I = 0x7f0a0ab6
+.field public static final wrap_content:I = 0x7f0a0ab9
# direct methods
diff --git a/com.discord/smali/androidx/preference/R$string.smali b/com.discord/smali/androidx/preference/R$string.smali
index 6ca4213067..4168280c29 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 = 0x7f120020
-.field public static final copy:I = 0x7f1204d2
+.field public static final copy:I = 0x7f1204d3
-.field public static final expand_button_title:I = 0x7f120680
+.field public static final expand_button_title:I = 0x7f120681
-.field public static final not_set:I = 0x7f120fa7
+.field public static final not_set:I = 0x7f120fb5
-.field public static final preference_copied:I = 0x7f12113f
+.field public static final preference_copied:I = 0x7f12114d
-.field public static final search_menu_title:I = 0x7f121404
+.field public static final search_menu_title:I = 0x7f121412
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
-.field public static final summary_collapsed_preference_list:I = 0x7f12152a
+.field public static final summary_collapsed_preference_list:I = 0x7f121537
-.field public static final v7_preference_off:I = 0x7f121752
+.field public static final v7_preference_off:I = 0x7f12175f
-.field public static final v7_preference_on:I = 0x7f121753
+.field public static final v7_preference_on:I = 0x7f121760
# direct methods
diff --git a/com.discord/smali/androidx/preference/ktx/R$drawable.smali b/com.discord/smali/androidx/preference/ktx/R$drawable.smali
index 5866f82ce8..9d5f46db6a 100644
--- a/com.discord/smali/androidx/preference/ktx/R$drawable.smali
+++ b/com.discord/smali/androidx/preference/ktx/R$drawable.smali
@@ -14,225 +14,225 @@
# static fields
-.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080031
+.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080032
-.field public static final abc_action_bar_item_background_material:I = 0x7f080032
+.field public static final abc_action_bar_item_background_material:I = 0x7f080033
-.field public static final abc_btn_borderless_material:I = 0x7f080033
+.field public static final abc_btn_borderless_material:I = 0x7f080034
-.field public static final abc_btn_check_material:I = 0x7f080034
+.field public static final abc_btn_check_material:I = 0x7f080035
-.field public static final abc_btn_check_material_anim:I = 0x7f080035
+.field public static final abc_btn_check_material_anim:I = 0x7f080036
-.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f080036
+.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f080037
-.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f080037
+.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f080038
-.field public static final abc_btn_colored_material:I = 0x7f080038
+.field public static final abc_btn_colored_material:I = 0x7f080039
-.field public static final abc_btn_default_mtrl_shape:I = 0x7f080039
+.field public static final abc_btn_default_mtrl_shape:I = 0x7f08003a
-.field public static final abc_btn_radio_material:I = 0x7f08003a
+.field public static final abc_btn_radio_material:I = 0x7f08003b
-.field public static final abc_btn_radio_material_anim:I = 0x7f08003b
+.field public static final abc_btn_radio_material_anim:I = 0x7f08003c
-.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08003c
+.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08003d
-.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f08003d
+.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f08003e
-.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f08003e
+.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f08003f
-.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f08003f
+.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080040
-.field public static final abc_cab_background_internal_bg:I = 0x7f080040
+.field public static final abc_cab_background_internal_bg:I = 0x7f080041
-.field public static final abc_cab_background_top_material:I = 0x7f080041
+.field public static final abc_cab_background_top_material:I = 0x7f080042
-.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080042
+.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080043
-.field public static final abc_control_background_material:I = 0x7f080043
+.field public static final abc_control_background_material:I = 0x7f080044
-.field public static final abc_dialog_material_background:I = 0x7f080044
+.field public static final abc_dialog_material_background:I = 0x7f080045
-.field public static final abc_edit_text_material:I = 0x7f080045
+.field public static final abc_edit_text_material:I = 0x7f080046
-.field public static final abc_ic_ab_back_material:I = 0x7f080046
+.field public static final abc_ic_ab_back_material:I = 0x7f080047
-.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f080047
+.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f080048
-.field public static final abc_ic_clear_material:I = 0x7f080048
+.field public static final abc_ic_clear_material:I = 0x7f080049
-.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f080049
+.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08004a
-.field public static final abc_ic_go_search_api_material:I = 0x7f08004a
+.field public static final abc_ic_go_search_api_material:I = 0x7f08004b
-.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08004b
+.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08004c
-.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08004c
+.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08004d
-.field public static final abc_ic_menu_overflow_material:I = 0x7f08004d
+.field public static final abc_ic_menu_overflow_material:I = 0x7f08004e
-.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f08004e
+.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f08004f
-.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f08004f
+.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080050
-.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080050
+.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080051
-.field public static final abc_ic_search_api_material:I = 0x7f080051
+.field public static final abc_ic_search_api_material:I = 0x7f080052
-.field public static final abc_ic_star_black_16dp:I = 0x7f080052
+.field public static final abc_ic_star_black_16dp:I = 0x7f080053
-.field public static final abc_ic_star_black_36dp:I = 0x7f080053
+.field public static final abc_ic_star_black_36dp:I = 0x7f080054
-.field public static final abc_ic_star_black_48dp:I = 0x7f080054
+.field public static final abc_ic_star_black_48dp:I = 0x7f080055
-.field public static final abc_ic_star_half_black_16dp:I = 0x7f080055
+.field public static final abc_ic_star_half_black_16dp:I = 0x7f080056
-.field public static final abc_ic_star_half_black_36dp:I = 0x7f080056
+.field public static final abc_ic_star_half_black_36dp:I = 0x7f080057
-.field public static final abc_ic_star_half_black_48dp:I = 0x7f080057
+.field public static final abc_ic_star_half_black_48dp:I = 0x7f080058
-.field public static final abc_ic_voice_search_api_material:I = 0x7f080058
+.field public static final abc_ic_voice_search_api_material:I = 0x7f080059
-.field public static final abc_item_background_holo_dark:I = 0x7f080059
+.field public static final abc_item_background_holo_dark:I = 0x7f08005a
-.field public static final abc_item_background_holo_light:I = 0x7f08005a
+.field public static final abc_item_background_holo_light:I = 0x7f08005b
-.field public static final abc_list_divider_material:I = 0x7f08005b
+.field public static final abc_list_divider_material:I = 0x7f08005c
-.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08005c
+.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08005d
-.field public static final abc_list_focused_holo:I = 0x7f08005d
+.field public static final abc_list_focused_holo:I = 0x7f08005e
-.field public static final abc_list_longpressed_holo:I = 0x7f08005e
+.field public static final abc_list_longpressed_holo:I = 0x7f08005f
-.field public static final abc_list_pressed_holo_dark:I = 0x7f08005f
+.field public static final abc_list_pressed_holo_dark:I = 0x7f080060
-.field public static final abc_list_pressed_holo_light:I = 0x7f080060
+.field public static final abc_list_pressed_holo_light:I = 0x7f080061
-.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080061
+.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080062
-.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080062
+.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080063
-.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080063
+.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080064
-.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080064
+.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080065
-.field public static final abc_list_selector_holo_dark:I = 0x7f080065
+.field public static final abc_list_selector_holo_dark:I = 0x7f080066
-.field public static final abc_list_selector_holo_light:I = 0x7f080066
+.field public static final abc_list_selector_holo_light:I = 0x7f080067
-.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f080067
+.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f080068
-.field public static final abc_popup_background_mtrl_mult:I = 0x7f080068
+.field public static final abc_popup_background_mtrl_mult:I = 0x7f080069
-.field public static final abc_ratingbar_indicator_material:I = 0x7f080069
+.field public static final abc_ratingbar_indicator_material:I = 0x7f08006a
-.field public static final abc_ratingbar_material:I = 0x7f08006a
+.field public static final abc_ratingbar_material:I = 0x7f08006b
-.field public static final abc_ratingbar_small_material:I = 0x7f08006b
+.field public static final abc_ratingbar_small_material:I = 0x7f08006c
-.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08006c
+.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08006d
-.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f08006d
+.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f08006e
-.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f08006e
+.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f08006f
-.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f08006f
+.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080070
-.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080070
+.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080071
-.field public static final abc_seekbar_thumb_material:I = 0x7f080071
+.field public static final abc_seekbar_thumb_material:I = 0x7f080072
-.field public static final abc_seekbar_tick_mark_material:I = 0x7f080072
+.field public static final abc_seekbar_tick_mark_material:I = 0x7f080073
-.field public static final abc_seekbar_track_material:I = 0x7f080073
+.field public static final abc_seekbar_track_material:I = 0x7f080074
-.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080074
+.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080075
-.field public static final abc_spinner_textfield_background_material:I = 0x7f080075
+.field public static final abc_spinner_textfield_background_material:I = 0x7f080076
-.field public static final abc_switch_thumb_material:I = 0x7f080076
+.field public static final abc_switch_thumb_material:I = 0x7f080077
-.field public static final abc_switch_track_mtrl_alpha:I = 0x7f080077
+.field public static final abc_switch_track_mtrl_alpha:I = 0x7f080078
-.field public static final abc_tab_indicator_material:I = 0x7f080078
+.field public static final abc_tab_indicator_material:I = 0x7f080079
-.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f080079
+.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08007a
-.field public static final abc_text_cursor_material:I = 0x7f08007a
+.field public static final abc_text_cursor_material:I = 0x7f08007b
-.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08007b
+.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08007c
-.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08007c
+.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08007d
-.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f08007d
+.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f08007e
-.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f08007e
+.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f08007f
-.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f08007f
+.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080080
-.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080080
+.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080081
-.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080081
+.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080082
-.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080082
+.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080083
-.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080083
+.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080084
-.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080084
+.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080085
-.field public static final abc_textfield_search_material:I = 0x7f080085
+.field public static final abc_textfield_search_material:I = 0x7f080086
-.field public static final abc_vector_test:I = 0x7f080086
+.field public static final abc_vector_test:I = 0x7f080087
-.field public static final btn_checkbox_checked_mtrl:I = 0x7f0800c0
+.field public static final btn_checkbox_checked_mtrl:I = 0x7f0800c1
-.field public static final btn_checkbox_checked_to_unchecked_mtrl_animation:I = 0x7f0800c1
+.field public static final btn_checkbox_checked_to_unchecked_mtrl_animation:I = 0x7f0800c2
-.field public static final btn_checkbox_unchecked_mtrl:I = 0x7f0800c2
+.field public static final btn_checkbox_unchecked_mtrl:I = 0x7f0800c3
-.field public static final btn_checkbox_unchecked_to_checked_mtrl_animation:I = 0x7f0800c3
+.field public static final btn_checkbox_unchecked_to_checked_mtrl_animation:I = 0x7f0800c4
-.field public static final btn_radio_off_mtrl:I = 0x7f0800c4
+.field public static final btn_radio_off_mtrl:I = 0x7f0800c5
-.field public static final btn_radio_off_to_on_mtrl_animation:I = 0x7f0800c5
+.field public static final btn_radio_off_to_on_mtrl_animation:I = 0x7f0800c6
-.field public static final btn_radio_on_mtrl:I = 0x7f0800c6
+.field public static final btn_radio_on_mtrl:I = 0x7f0800c7
-.field public static final btn_radio_on_to_off_mtrl_animation:I = 0x7f0800c7
+.field public static final btn_radio_on_to_off_mtrl_animation:I = 0x7f0800c8
-.field public static final ic_arrow_down_24dp:I = 0x7f080221
+.field public static final ic_arrow_down_24dp:I = 0x7f080222
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
-.field public static final preference_list_divider_material:I = 0x7f08050c
+.field public static final preference_list_divider_material:I = 0x7f08050d
-.field public static final tooltip_frame_dark:I = 0x7f08051f
+.field public static final tooltip_frame_dark:I = 0x7f080520
-.field public static final tooltip_frame_light:I = 0x7f080520
+.field public static final tooltip_frame_light:I = 0x7f080521
# 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 3c728b146b..9f04543887 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 = 0x7f0a0125
-.field public static final checkbox:I = 0x7f0a0260
+.field public static final checkbox:I = 0x7f0a0262
-.field public static final checked:I = 0x7f0a0262
+.field public static final checked:I = 0x7f0a0264
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final content:I = 0x7f0a028a
+.field public static final content:I = 0x7f0a028c
-.field public static final contentPanel:I = 0x7f0a028b
+.field public static final contentPanel:I = 0x7f0a028d
-.field public static final custom:I = 0x7f0a02b5
+.field public static final custom:I = 0x7f0a02b7
-.field public static final customPanel:I = 0x7f0a02b6
+.field public static final customPanel:I = 0x7f0a02b8
-.field public static final decor_content_parent:I = 0x7f0a02be
+.field public static final decor_content_parent:I = 0x7f0a02c0
-.field public static final default_activity_button:I = 0x7f0a02bf
+.field public static final default_activity_button:I = 0x7f0a02c1
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02cf
-.field public static final edit_query:I = 0x7f0a031e
+.field public static final edit_query:I = 0x7f0a0320
-.field public static final end:I = 0x7f0a034b
+.field public static final end:I = 0x7f0a034d
-.field public static final expand_activities_button:I = 0x7f0a0368
+.field public static final expand_activities_button:I = 0x7f0a036a
-.field public static final expanded_menu:I = 0x7f0a0369
+.field public static final expanded_menu:I = 0x7f0a036b
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final fragment_container_view_tag:I = 0x7f0a03c8
+.field public static final fragment_container_view_tag:I = 0x7f0a03ca
-.field public static final group_divider:I = 0x7f0a0412
+.field public static final group_divider:I = 0x7f0a0414
-.field public static final home:I = 0x7f0a04c1
+.field public static final home:I = 0x7f0a04c3
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_frame:I = 0x7f0a04d5
+.field public static final icon_frame:I = 0x7f0a04d7
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final image:I = 0x7f0a04e0
+.field public static final image:I = 0x7f0a04e2
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a056f
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0571
-.field public static final left:I = 0x7f0a0584
+.field public static final left:I = 0x7f0a0586
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final listMode:I = 0x7f0a058a
+.field public static final listMode:I = 0x7f0a058c
-.field public static final list_item:I = 0x7f0a058b
+.field public static final list_item:I = 0x7f0a058d
-.field public static final message:I = 0x7f0a05de
+.field public static final message:I = 0x7f0a05dc
-.field public static final multiply:I = 0x7f0a0600
+.field public static final multiply:I = 0x7f0a05fe
-.field public static final none:I = 0x7f0a0627
+.field public static final none:I = 0x7f0a0625
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final off:I = 0x7f0a0668
+.field public static final off:I = 0x7f0a0666
-.field public static final on:I = 0x7f0a066c
+.field public static final on:I = 0x7f0a066a
-.field public static final parentPanel:I = 0x7f0a0681
+.field public static final parentPanel:I = 0x7f0a067f
-.field public static final progress_circular:I = 0x7f0a072c
+.field public static final progress_circular:I = 0x7f0a072a
-.field public static final progress_horizontal:I = 0x7f0a072f
+.field public static final progress_horizontal:I = 0x7f0a072d
-.field public static final radio:I = 0x7f0a073d
+.field public static final radio:I = 0x7f0a073b
-.field public static final recycler_view:I = 0x7f0a0743
+.field public static final recycler_view:I = 0x7f0a0741
-.field public static final right:I = 0x7f0a075f
+.field public static final right:I = 0x7f0a075d
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final screen:I = 0x7f0a0791
+.field public static final screen:I = 0x7f0a078f
-.field public static final scrollIndicatorDown:I = 0x7f0a0795
+.field public static final scrollIndicatorDown:I = 0x7f0a0793
-.field public static final scrollIndicatorUp:I = 0x7f0a0796
+.field public static final scrollIndicatorUp:I = 0x7f0a0794
-.field public static final scrollView:I = 0x7f0a0797
+.field public static final scrollView:I = 0x7f0a0795
-.field public static final search_badge:I = 0x7f0a079a
+.field public static final search_badge:I = 0x7f0a0798
-.field public static final search_bar:I = 0x7f0a079b
+.field public static final search_bar:I = 0x7f0a0799
-.field public static final search_button:I = 0x7f0a079c
+.field public static final search_button:I = 0x7f0a079a
-.field public static final search_close_btn:I = 0x7f0a079d
+.field public static final search_close_btn:I = 0x7f0a079b
-.field public static final search_edit_frame:I = 0x7f0a079e
+.field public static final search_edit_frame:I = 0x7f0a079c
-.field public static final search_go_btn:I = 0x7f0a07a0
+.field public static final search_go_btn:I = 0x7f0a079e
-.field public static final search_mag_icon:I = 0x7f0a07a1
+.field public static final search_mag_icon:I = 0x7f0a079f
-.field public static final search_plate:I = 0x7f0a07a2
+.field public static final search_plate:I = 0x7f0a07a0
-.field public static final search_src_text:I = 0x7f0a07a5
+.field public static final search_src_text:I = 0x7f0a07a3
-.field public static final search_voice_btn:I = 0x7f0a07b1
+.field public static final search_voice_btn:I = 0x7f0a07af
-.field public static final seekbar:I = 0x7f0a07b2
+.field public static final seekbar:I = 0x7f0a07b0
-.field public static final seekbar_value:I = 0x7f0a07b3
+.field public static final seekbar_value:I = 0x7f0a07b1
-.field public static final select_dialog_listview:I = 0x7f0a07b4
+.field public static final select_dialog_listview:I = 0x7f0a07b2
-.field public static final shortcut:I = 0x7f0a0914
+.field public static final shortcut:I = 0x7f0a0912
-.field public static final spacer:I = 0x7f0a0923
+.field public static final spacer:I = 0x7f0a0921
-.field public static final spinner:I = 0x7f0a0926
+.field public static final spinner:I = 0x7f0a0924
-.field public static final split_action_bar:I = 0x7f0a0927
+.field public static final split_action_bar:I = 0x7f0a0925
-.field public static final src_atop:I = 0x7f0a092b
+.field public static final src_atop:I = 0x7f0a0929
-.field public static final src_in:I = 0x7f0a092c
+.field public static final src_in:I = 0x7f0a092a
-.field public static final src_over:I = 0x7f0a092d
+.field public static final src_over:I = 0x7f0a092b
-.field public static final start:I = 0x7f0a0930
+.field public static final start:I = 0x7f0a092e
-.field public static final submenuarrow:I = 0x7f0a094a
+.field public static final submenuarrow:I = 0x7f0a0948
-.field public static final submit_area:I = 0x7f0a094b
+.field public static final submit_area:I = 0x7f0a0949
-.field public static final switchWidget:I = 0x7f0a0959
+.field public static final switchWidget:I = 0x7f0a0957
-.field public static final tabMode:I = 0x7f0a095b
+.field public static final tabMode:I = 0x7f0a0959
-.field public static final tag_accessibility_actions:I = 0x7f0a0969
+.field public static final tag_accessibility_actions:I = 0x7f0a0967
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096a
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0968
-.field public static final tag_accessibility_heading:I = 0x7f0a096b
+.field public static final tag_accessibility_heading:I = 0x7f0a0969
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096c
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096a
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096d
+.field public static final tag_screen_reader_focusable:I = 0x7f0a096b
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final textSpacerNoButtons:I = 0x7f0a097f
+.field public static final textSpacerNoButtons:I = 0x7f0a097d
-.field public static final textSpacerNoTitle:I = 0x7f0a0980
+.field public static final textSpacerNoTitle:I = 0x7f0a097e
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
-.field public static final titleDividerNoCustom:I = 0x7f0a0993
+.field public static final titleDividerNoCustom:I = 0x7f0a0991
-.field public static final title_template:I = 0x7f0a0994
+.field public static final title_template:I = 0x7f0a0992
-.field public static final top:I = 0x7f0a099a
+.field public static final top:I = 0x7f0a0998
-.field public static final topPanel:I = 0x7f0a099b
+.field public static final topPanel:I = 0x7f0a0999
-.field public static final unchecked:I = 0x7f0a09b1
+.field public static final unchecked:I = 0x7f0a09af
-.field public static final uniform:I = 0x7f0a09b4
+.field public static final uniform:I = 0x7f0a09b2
-.field public static final up:I = 0x7f0a09b6
+.field public static final up:I = 0x7f0a09b4
-.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a4e
+.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a4c
-.field public static final wrap_content:I = 0x7f0a0ab6
+.field public static final wrap_content:I = 0x7f0a0ab9
# 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 7031a2230d..71c1e6763c 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 = 0x7f120020
-.field public static final copy:I = 0x7f1204d2
+.field public static final copy:I = 0x7f1204d3
-.field public static final expand_button_title:I = 0x7f120680
+.field public static final expand_button_title:I = 0x7f120681
-.field public static final not_set:I = 0x7f120fa7
+.field public static final not_set:I = 0x7f120fb5
-.field public static final preference_copied:I = 0x7f12113f
+.field public static final preference_copied:I = 0x7f12114d
-.field public static final search_menu_title:I = 0x7f121404
+.field public static final search_menu_title:I = 0x7f121412
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
-.field public static final summary_collapsed_preference_list:I = 0x7f12152a
+.field public static final summary_collapsed_preference_list:I = 0x7f121537
-.field public static final v7_preference_off:I = 0x7f121752
+.field public static final v7_preference_off:I = 0x7f12175f
-.field public static final v7_preference_on:I = 0x7f121753
+.field public static final v7_preference_on:I = 0x7f121760
# direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$drawable.smali b/com.discord/smali/androidx/recyclerview/R$drawable.smali
index 8c317ae500..ae77c66be1 100644
--- a/com.discord/smali/androidx/recyclerview/R$drawable.smali
+++ b/com.discord/smali/androidx/recyclerview/R$drawable.smali
@@ -14,29 +14,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
# direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$id.smali b/com.discord/smali/androidx/recyclerview/R$id.smali
index f592cc8063..04fe9fb028 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 = 0x7f0a00f4
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02cf
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a056f
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0571
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a0969
+.field public static final tag_accessibility_actions:I = 0x7f0a0967
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096a
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0968
-.field public static final tag_accessibility_heading:I = 0x7f0a096b
+.field public static final tag_accessibility_heading:I = 0x7f0a0969
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096c
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096a
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096d
+.field public static final tag_screen_reader_focusable:I = 0x7f0a096b
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
# direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$string.smali b/com.discord/smali/androidx/recyclerview/R$string.smali
index 36129ac290..5bbc347a20 100644
--- a/com.discord/smali/androidx/recyclerview/R$string.smali
+++ b/com.discord/smali/androidx/recyclerview/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
# direct methods
diff --git a/com.discord/smali/androidx/sharetarget/R$drawable.smali b/com.discord/smali/androidx/sharetarget/R$drawable.smali
index 191d84c090..d007e3658e 100644
--- a/com.discord/smali/androidx/sharetarget/R$drawable.smali
+++ b/com.discord/smali/androidx/sharetarget/R$drawable.smali
@@ -14,29 +14,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
# direct methods
diff --git a/com.discord/smali/androidx/sharetarget/R$id.smali b/com.discord/smali/androidx/sharetarget/R$id.smali
index c4ae593e7b..dbeaeeeaf8 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 = 0x7f0a00f4
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02cf
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a0969
+.field public static final tag_accessibility_actions:I = 0x7f0a0967
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096a
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0968
-.field public static final tag_accessibility_heading:I = 0x7f0a096b
+.field public static final tag_accessibility_heading:I = 0x7f0a0969
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096c
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096a
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096d
+.field public static final tag_screen_reader_focusable:I = 0x7f0a096b
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
# direct methods
diff --git a/com.discord/smali/androidx/sharetarget/R$string.smali b/com.discord/smali/androidx/sharetarget/R$string.smali
index 18475a3a77..0c2d47ef44 100644
--- a/com.discord/smali/androidx/sharetarget/R$string.smali
+++ b/com.discord/smali/androidx/sharetarget/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
# direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali b/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali
index 606d5798e8..83a1744d24 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali
@@ -14,29 +14,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
# direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$id.smali b/com.discord/smali/androidx/slidingpanelayout/R$id.smali
index 6a8c6b518d..571f2c0152 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 = 0x7f0a00f4
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
# direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$string.smali b/com.discord/smali/androidx/slidingpanelayout/R$string.smali
index c86d92e94c..3875aec849 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$string.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
# direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali b/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali
index 8d290a4e3d..948863a442 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali
@@ -14,29 +14,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
# direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$id.smali b/com.discord/smali/androidx/swiperefreshlayout/R$id.smali
index be7493f4c1..e67198f09c 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 = 0x7f0a00f4
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02cf
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a0969
+.field public static final tag_accessibility_actions:I = 0x7f0a0967
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096a
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0968
-.field public static final tag_accessibility_heading:I = 0x7f0a096b
+.field public static final tag_accessibility_heading:I = 0x7f0a0969
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096c
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096a
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096d
+.field public static final tag_screen_reader_focusable:I = 0x7f0a096b
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
# direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$string.smali b/com.discord/smali/androidx/swiperefreshlayout/R$string.smali
index 01fc6cdbaf..a91fd5bc19 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$string.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
# direct methods
diff --git a/com.discord/smali/androidx/transition/R$drawable.smali b/com.discord/smali/androidx/transition/R$drawable.smali
index dc86837dfa..dee824666d 100644
--- a/com.discord/smali/androidx/transition/R$drawable.smali
+++ b/com.discord/smali/androidx/transition/R$drawable.smali
@@ -14,29 +14,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
# direct methods
diff --git a/com.discord/smali/androidx/transition/R$id.smali b/com.discord/smali/androidx/transition/R$id.smali
index b8683a94b9..daa90d78e5 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 = 0x7f0a00f4
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final ghost_view:I = 0x7f0a03e3
+.field public static final ghost_view:I = 0x7f0a03e5
-.field public static final ghost_view_holder:I = 0x7f0a03e4
+.field public static final ghost_view_holder:I = 0x7f0a03e6
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final parent_matrix:I = 0x7f0a0682
+.field public static final parent_matrix:I = 0x7f0a0680
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final save_non_transition_alpha:I = 0x7f0a078d
+.field public static final save_non_transition_alpha:I = 0x7f0a078b
-.field public static final save_overlay_view:I = 0x7f0a078e
+.field public static final save_overlay_view:I = 0x7f0a078c
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
-.field public static final transition_current_scene:I = 0x7f0a099e
+.field public static final transition_current_scene:I = 0x7f0a099c
-.field public static final transition_layout_save:I = 0x7f0a099f
+.field public static final transition_layout_save:I = 0x7f0a099d
-.field public static final transition_position:I = 0x7f0a09a0
+.field public static final transition_position:I = 0x7f0a099e
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a09a1
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a099f
-.field public static final transition_transform:I = 0x7f0a09a2
+.field public static final transition_transform:I = 0x7f0a09a0
# direct methods
diff --git a/com.discord/smali/androidx/transition/R$string.smali b/com.discord/smali/androidx/transition/R$string.smali
index 99c8b0436e..9fc2c9d358 100644
--- a/com.discord/smali/androidx/transition/R$string.smali
+++ b/com.discord/smali/androidx/transition/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$drawable.smali b/com.discord/smali/androidx/vectordrawable/R$drawable.smali
index 140665d4e6..4bacba206b 100644
--- a/com.discord/smali/androidx/vectordrawable/R$drawable.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$drawable.smali
@@ -14,29 +14,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$id.smali b/com.discord/smali/androidx/vectordrawable/R$id.smali
index f60f1a04e0..76ba5e5c3a 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 = 0x7f0a00f4
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02cf
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a0969
+.field public static final tag_accessibility_actions:I = 0x7f0a0967
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096a
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0968
-.field public static final tag_accessibility_heading:I = 0x7f0a096b
+.field public static final tag_accessibility_heading:I = 0x7f0a0969
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096c
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096a
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096d
+.field public static final tag_screen_reader_focusable:I = 0x7f0a096b
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$string.smali b/com.discord/smali/androidx/vectordrawable/R$string.smali
index c93252892a..8d72c0a1ae 100644
--- a/com.discord/smali/androidx/vectordrawable/R$string.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/animated/R$drawable.smali b/com.discord/smali/androidx/vectordrawable/animated/R$drawable.smali
index 7ed0048c65..346d7df24e 100644
--- a/com.discord/smali/androidx/vectordrawable/animated/R$drawable.smali
+++ b/com.discord/smali/androidx/vectordrawable/animated/R$drawable.smali
@@ -14,29 +14,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
# 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 f2a8a04d06..e1e6e25f00 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 = 0x7f0a00f4
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02cf
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a0969
+.field public static final tag_accessibility_actions:I = 0x7f0a0967
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096a
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0968
-.field public static final tag_accessibility_heading:I = 0x7f0a096b
+.field public static final tag_accessibility_heading:I = 0x7f0a0969
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096c
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096a
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096d
+.field public static final tag_screen_reader_focusable:I = 0x7f0a096b
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/animated/R$string.smali b/com.discord/smali/androidx/vectordrawable/animated/R$string.smali
index 31626d6b48..fa46a1be9e 100644
--- a/com.discord/smali/androidx/vectordrawable/animated/R$string.smali
+++ b/com.discord/smali/androidx/vectordrawable/animated/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
# direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$drawable.smali b/com.discord/smali/androidx/viewpager/R$drawable.smali
index 163f81bb7a..068bec63d9 100644
--- a/com.discord/smali/androidx/viewpager/R$drawable.smali
+++ b/com.discord/smali/androidx/viewpager/R$drawable.smali
@@ -14,29 +14,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
# direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$id.smali b/com.discord/smali/androidx/viewpager/R$id.smali
index b4877101d9..32a32d800d 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 = 0x7f0a00f4
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
# direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$string.smali b/com.discord/smali/androidx/viewpager/R$string.smali
index 76376f6aa4..6487491b65 100644
--- a/com.discord/smali/androidx/viewpager/R$string.smali
+++ b/com.discord/smali/androidx/viewpager/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
# direct methods
diff --git a/com.discord/smali/androidx/viewpager2/R$drawable.smali b/com.discord/smali/androidx/viewpager2/R$drawable.smali
index 651595a7da..2e7b4303d2 100644
--- a/com.discord/smali/androidx/viewpager2/R$drawable.smali
+++ b/com.discord/smali/androidx/viewpager2/R$drawable.smali
@@ -14,29 +14,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
# direct methods
diff --git a/com.discord/smali/androidx/viewpager2/R$id.smali b/com.discord/smali/androidx/viewpager2/R$id.smali
index 55af65bdaf..a7ae3665c4 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 = 0x7f0a00f4
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02cf
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a056f
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0571
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a0969
+.field public static final tag_accessibility_actions:I = 0x7f0a0967
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096a
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0968
-.field public static final tag_accessibility_heading:I = 0x7f0a096b
+.field public static final tag_accessibility_heading:I = 0x7f0a0969
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096c
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096a
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096d
+.field public static final tag_screen_reader_focusable:I = 0x7f0a096b
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
# direct methods
diff --git a/com.discord/smali/androidx/viewpager2/R$string.smali b/com.discord/smali/androidx/viewpager2/R$string.smali
index d85c151c3b..a8052f2d6c 100644
--- a/com.discord/smali/androidx/viewpager2/R$string.smali
+++ b/com.discord/smali/androidx/viewpager2/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
# direct methods
diff --git a/com.discord/smali/androidx/work/R$drawable.smali b/com.discord/smali/androidx/work/R$drawable.smali
index b4276352e1..b6118a320e 100644
--- a/com.discord/smali/androidx/work/R$drawable.smali
+++ b/com.discord/smali/androidx/work/R$drawable.smali
@@ -14,29 +14,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
# direct methods
diff --git a/com.discord/smali/androidx/work/R$id.smali b/com.discord/smali/androidx/work/R$id.smali
index 494fa62377..14ca2ca5b0 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 = 0x7f0a00f4
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02cf
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a0969
+.field public static final tag_accessibility_actions:I = 0x7f0a0967
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096a
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0968
-.field public static final tag_accessibility_heading:I = 0x7f0a096b
+.field public static final tag_accessibility_heading:I = 0x7f0a0969
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096c
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096a
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096d
+.field public static final tag_screen_reader_focusable:I = 0x7f0a096b
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
# direct methods
diff --git a/com.discord/smali/androidx/work/R$string.smali b/com.discord/smali/androidx/work/R$string.smali
index ddaf1cc02e..caa8895ec3 100644
--- a/com.discord/smali/androidx/work/R$string.smali
+++ b/com.discord/smali/androidx/work/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
# direct methods
diff --git a/com.discord/smali/androidx/work/ktx/R$drawable.smali b/com.discord/smali/androidx/work/ktx/R$drawable.smali
index bf7e9a03a3..ac3e5a2073 100644
--- a/com.discord/smali/androidx/work/ktx/R$drawable.smali
+++ b/com.discord/smali/androidx/work/ktx/R$drawable.smali
@@ -14,29 +14,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
# 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 0fd9f0855a..fc3b8488e7 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 = 0x7f0a00f4
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02cf
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final tag_accessibility_actions:I = 0x7f0a0969
+.field public static final tag_accessibility_actions:I = 0x7f0a0967
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096a
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0968
-.field public static final tag_accessibility_heading:I = 0x7f0a096b
+.field public static final tag_accessibility_heading:I = 0x7f0a0969
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096c
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096a
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096d
+.field public static final tag_screen_reader_focusable:I = 0x7f0a096b
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
# direct methods
diff --git a/com.discord/smali/androidx/work/ktx/R$string.smali b/com.discord/smali/androidx/work/ktx/R$string.smali
index 31627f87e3..a9cb8a7c10 100644
--- a/com.discord/smali/androidx/work/ktx/R$string.smali
+++ b/com.discord/smali/androidx/work/ktx/R$string.smali
@@ -14,7 +14,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
# direct methods
diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali
index cb603f5c2a..f4a6ef6e18 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/1246"
+.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1247"
-.field public static final VERSION_CODE:I = 0x4de
+.field public static final VERSION_CODE:I = 0x4df
-.field public static final VERSION_NAME:Ljava/lang/String; = "36.5"
+.field public static final VERSION_NAME:Ljava/lang/String; = "37"
# direct methods
diff --git a/com.discord/smali/com/discord/app/AppBottomSheet.smali b/com.discord/smali/com/discord/app/AppBottomSheet.smali
index f55d21ad97..1d08ef6c96 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, 0x7f0a0289
+ const v2, 0x7f0a028b
invoke-virtual {v1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -92,7 +92,7 @@
move-result-object v1
- const v2, 0x7f0a02c3
+ const v2, 0x7f0a02c5
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 8cb70c75fd..aca8d72729 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, 0x7f121690
+ const v2, 0x7f12169d
const/4 v3, 0x1
diff --git a/com.discord/smali/com/discord/app/AppLog.smali b/com.discord/smali/com/discord/app/AppLog.smali
index ec6bb9d798..9c009b20da 100644
--- a/com.discord/smali/com/discord/app/AppLog.smali
+++ b/com.discord/smali/com/discord/app/AppLog.smali
@@ -88,7 +88,7 @@
const/4 v0, 0x0
- if-eqz p0, :cond_a
+ if-eqz p0, :cond_d
array-length p0, p1
@@ -103,7 +103,7 @@
const/4 v5, 0x1
- if-ge v2, p0, :cond_2
+ if-ge v2, p0, :cond_5
aget-object v6, p1, v2
@@ -115,21 +115,77 @@
invoke-static {v7, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const-class v9, Lcom/discord/utilities/logging/Logger;
-
- invoke-virtual {v9}, Ljava/lang/Class;->getName()Ljava/lang/String;
-
- move-result-object v9
-
- const-string v10, "Logger::class.java.name"
-
- invoke-static {v9, v10}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+ const-string v9, "MediaEngineLegacy"
invoke-static {v7, v9, v1, v3}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
move-result v7
- if-nez v7, :cond_0
+ if-eqz v7, :cond_0
+
+ invoke-virtual {v6}, Ljava/lang/StackTraceElement;->getMethodName()Ljava/lang/String;
+
+ move-result-object v7
+
+ const-string v9, "e"
+
+ invoke-static {v7, v9}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+ move-result v7
+
+ if-eqz v7, :cond_0
+
+ const/4 v7, 0x1
+
+ goto :goto_1
+
+ :cond_0
+ const/4 v7, 0x0
+
+ :goto_1
+ invoke-virtual {v6}, Ljava/lang/StackTraceElement;->getClassName()Ljava/lang/String;
+
+ move-result-object v9
+
+ invoke-static {v9, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ const-class v10, Lcom/discord/utilities/logging/Logger;
+
+ invoke-virtual {v10}, Ljava/lang/Class;->getName()Ljava/lang/String;
+
+ move-result-object v10
+
+ const-string v11, "Logger::class.java.name"
+
+ invoke-static {v10, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ invoke-static {v9, v10, v1, v3}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
+
+ move-result v9
+
+ if-nez v9, :cond_2
+
+ invoke-virtual {v6}, Ljava/lang/StackTraceElement;->getClassName()Ljava/lang/String;
+
+ move-result-object v9
+
+ invoke-static {v9, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ const-class v10, Lorg/webrtc/Logging;
+
+ invoke-virtual {v10}, Ljava/lang/Class;->getName()Ljava/lang/String;
+
+ move-result-object v10
+
+ const-string v11, "Logging::class.java.name"
+
+ invoke-static {v10, v11}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ invoke-static {v9, v10, v1, v3}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
+
+ move-result v9
+
+ if-nez v9, :cond_2
invoke-virtual {v6}, Ljava/lang/StackTraceElement;->getClassName()Ljava/lang/String;
@@ -137,43 +193,59 @@
invoke-static {v6, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const-class v7, Lcom/discord/app/AppLog;
+ const-class v8, Lcom/discord/app/AppLog;
- invoke-virtual {v7}, Ljava/lang/Class;->getName()Ljava/lang/String;
+ invoke-virtual {v8}, Ljava/lang/Class;->getName()Ljava/lang/String;
- move-result-object v7
+ move-result-object v8
- const-string v8, "AppLog::class.java.name"
+ const-string v9, "AppLog::class.java.name"
- invoke-static {v7, v8}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-static {v8, v9}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-static {v6, v7, v1, v3}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
+ invoke-static {v6, v8, v1, v3}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
move-result v6
- if-nez v6, :cond_0
-
- const/4 v6, 0x1
-
- goto :goto_1
-
- :cond_0
- const/4 v6, 0x0
-
- :goto_1
if-eqz v6, :cond_1
goto :goto_2
:cond_1
+ const/4 v6, 0x0
+
+ goto :goto_3
+
+ :cond_2
+ :goto_2
+ const/4 v6, 0x1
+
+ :goto_3
+ if-nez v6, :cond_3
+
+ if-nez v7, :cond_3
+
+ const/4 v6, 0x1
+
+ goto :goto_4
+
+ :cond_3
+ const/4 v6, 0x0
+
+ :goto_4
+ if-eqz v6, :cond_4
+
+ goto :goto_5
+
+ :cond_4
add-int/lit8 v2, v2, 0x1
goto :goto_0
- :cond_2
+ :cond_5
const/4 v2, -0x1
- :goto_2
+ :goto_5
array-length p0, p1
sub-int/2addr p0, v2
@@ -184,8 +256,8 @@
const/4 p1, 0x0
- :goto_3
- if-ge p1, p0, :cond_7
+ :goto_6
+ if-ge p1, p0, :cond_a
aget-object v2, v6, p1
@@ -195,69 +267,69 @@
const/4 v9, 0x0
- :goto_4
- if-ge v9, v8, :cond_5
+ :goto_7
+ if-ge v9, v8, :cond_8
aget-object v10, v7, v9
- if-eqz v2, :cond_3
+ if-eqz v2, :cond_6
invoke-virtual {v2}, Ljava/lang/StackTraceElement;->getClassName()Ljava/lang/String;
move-result-object v11
- if-eqz v11, :cond_3
+ if-eqz v11, :cond_6
invoke-static {v11, v10, v1, v3}, Lj0/t/p;->contains$default(Ljava/lang/CharSequence;Ljava/lang/CharSequence;ZI)Z
move-result v10
- if-ne v10, v5, :cond_3
+ if-ne v10, v5, :cond_6
const/4 v10, 0x1
- goto :goto_5
+ goto :goto_8
- :cond_3
+ :cond_6
const/4 v10, 0x0
- :goto_5
- if-eqz v10, :cond_4
+ :goto_8
+ if-eqz v10, :cond_7
const/4 v2, 0x1
- goto :goto_6
+ goto :goto_9
- :cond_4
+ :cond_7
add-int/lit8 v9, v9, 0x1
- goto :goto_4
-
- :cond_5
- const/4 v2, 0x0
-
- :goto_6
- if-eqz v2, :cond_6
-
- move v4, p1
-
goto :goto_7
- :cond_6
+ :cond_8
+ const/4 v2, 0x0
+
+ :goto_9
+ if-eqz v2, :cond_9
+
+ move v4, p1
+
+ goto :goto_a
+
+ :cond_9
add-int/lit8 p1, p1, 0x1
- goto :goto_3
+ goto :goto_6
- :cond_7
- :goto_7
- if-lez v4, :cond_8
+ :cond_a
+ :goto_a
+ if-lez v4, :cond_b
move v1, v4
- :cond_8
+ :cond_b
aget-object p0, v6, v1
- if-eqz p0, :cond_9
+ if-eqz p0, :cond_c
invoke-virtual {p0}, Ljava/lang/StackTraceElement;->getClassName()Ljava/lang/String;
@@ -287,12 +359,12 @@
move-object v0, v2
- :cond_9
+ :cond_c
aput-object v0, v6, v1
return-object v6
- :cond_a
+ :cond_d
throw v0
.end method
diff --git a/com.discord/smali/com/discord/app/AppPermissions.smali b/com.discord/smali/com/discord/app/AppPermissions.smali
index ca513c0802..02c8937e9a 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, 0x7f12110e
+ const p1, 0x7f12111c
new-instance v0, Lf/a/b/i;
@@ -265,7 +265,7 @@
goto :goto_0
:cond_1
- const p1, 0x7f121115
+ const p1, 0x7f121123
new-instance v0, Lf/a/b/i;
@@ -274,7 +274,7 @@
goto :goto_0
:cond_2
- const p1, 0x7f12110f
+ const p1, 0x7f12111d
new-instance v0, Lf/a/b/i;
@@ -283,7 +283,7 @@
goto :goto_0
:cond_3
- const p1, 0x7f121110
+ const p1, 0x7f12111e
new-instance v0, Lf/a/b/i;
@@ -292,7 +292,7 @@
goto :goto_0
:cond_4
- const p1, 0x7f120f6b
+ const p1, 0x7f120f79
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 ab05274ec3..b8bed20de8 100644
--- a/com.discord/smali/com/discord/app/DiscordConnectService.smali
+++ b/com.discord/smali/com/discord/app/DiscordConnectService.smali
@@ -103,7 +103,7 @@
move-result-object v0
- const v1, 0x7f080369
+ const v1, 0x7f08036a
invoke-virtual {v0, v1}, Landroidx/core/app/NotificationCompat$Builder;->setSmallIcon(I)Landroidx/core/app/NotificationCompat$Builder;
@@ -119,7 +119,7 @@
move-result-object v0
- const v1, 0x7f12049f
+ const v1, 0x7f1204a0
invoke-virtual {p0, v1}, Landroid/app/Service;->getString(I)Ljava/lang/String;
@@ -129,7 +129,7 @@
move-result-object v0
- const v1, 0x7f1204a6
+ const v1, 0x7f1204a7
invoke-virtual {p0, v1}, Landroid/app/Service;->getString(I)Ljava/lang/String;
@@ -301,7 +301,7 @@
if-eqz v6, :cond_3
- const v2, 0x7f12109c
+ const v2, 0x7f1210aa
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, 0x7f121110
+ const v2, 0x7f12111e
const/4 v3, 0x0
@@ -455,8 +455,6 @@
const/4 v9, 0x4
- const/4 v15, 0x0
-
const/4 v10, 0x0
const-string v7, "Try joining voice channel"
@@ -473,11 +471,17 @@
sget-object v2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
- invoke-virtual {v2}, Lcom/discord/stores/StoreStream$Companion;->getConnectivity()Lcom/discord/stores/StoreConnectivity;
+ invoke-virtual {v2}, Lcom/discord/stores/StoreStream$Companion;->getConnectionOpen()Lcom/discord/stores/StoreConnectionOpen;
move-result-object v2
- invoke-virtual {v2}, Lcom/discord/stores/StoreConnectivity;->getConnectionOpen()Lrx/Observable;
+ const/4 v3, 0x0
+
+ const/4 v4, 0x0
+
+ const/4 v5, 0x1
+
+ invoke-static {v2, v4, v5, v3}, Lcom/discord/stores/StoreConnectionOpen;->observeConnectionOpen$default(Lcom/discord/stores/StoreConnectionOpen;ZILjava/lang/Object;)Lrx/Observable;
move-result-object v2
@@ -485,19 +489,21 @@
invoke-virtual {v2, v3}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
- move-result-object v10
+ move-result-object v4
- const-string v2, "StoreStream\n .get\u2026en\n .filter { it }"
+ const-string v2, "StoreStream\n .get\u2026()\n .filter { it }"
- invoke-static {v10, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-static {v4, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const-wide/16 v11, 0x2710
+ const-wide/16 v5, 0x2710
- const/4 v13, 0x0
+ const/4 v7, 0x0
- const/4 v14, 0x2
+ const/4 v8, 0x2
- invoke-static/range {v10 .. v15}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->takeSingleUntilTimeout$default(Lrx/Observable;JZILjava/lang/Object;)Lrx/Observable;
+ const/4 v9, 0x0
+
+ invoke-static/range {v4 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->takeSingleUntilTimeout$default(Lrx/Observable;JZILjava/lang/Object;)Lrx/Observable;
move-result-object v2
@@ -604,35 +610,37 @@
invoke-direct {v3}, Ljava/lang/StringBuilder;->()V
- const-string v6, "Invalid request "
+ const-string v5, "Invalid request "
- invoke-virtual {v3, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+ invoke-virtual {v3, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
- move-result-object v9
+ move-result-object v8
- sget-object v7, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+ sget-object v6, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
const-class v3, Lcom/discord/app/DiscordConnectService;
invoke-virtual {v3}, Ljava/lang/Class;->getSimpleName()Ljava/lang/String;
- move-result-object v8
+ move-result-object v7
- invoke-static {v8, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-static {v7, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const/4 v10, 0x0
+ const/4 v9, 0x0
- const/4 v11, 0x4
+ const/4 v10, 0x4
- const/4 v12, 0x0
+ const/4 v11, 0x0
- invoke-static/range {v7 .. v12}, Lcom/discord/utilities/logging/Logger;->i$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
+ invoke-static/range {v6 .. v11}, Lcom/discord/utilities/logging/Logger;->i$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
- invoke-virtual {v0, v5}, Landroid/app/Service;->stopForeground(Z)V
+ const/4 v2, 0x1
+
+ invoke-virtual {v0, v2}, Landroid/app/Service;->stopForeground(Z)V
invoke-virtual {v0, v1}, Landroid/app/Service;->stopSelf(I)V
diff --git a/com.discord/smali/com/discord/dialogs/ImageUploadDialog.smali b/com.discord/smali/com/discord/dialogs/ImageUploadDialog.smali
index 8189e7baad..c0a3d40864 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, 0x7f0a0631
+ 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, 0x7f0a062c
+ 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, 0x7f0a062b
+ 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, 0x7f0a062f
+ 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/R$drawable.smali b/com.discord/smali/com/discord/gateway/R$drawable.smali
index e46fdf0a5a..a787d089db 100644
--- a/com.discord/smali/com/discord/gateway/R$drawable.smali
+++ b/com.discord/smali/com/discord/gateway/R$drawable.smali
@@ -14,333 +14,333 @@
# static fields
-.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080031
+.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080032
-.field public static final abc_action_bar_item_background_material:I = 0x7f080032
+.field public static final abc_action_bar_item_background_material:I = 0x7f080033
-.field public static final abc_btn_borderless_material:I = 0x7f080033
+.field public static final abc_btn_borderless_material:I = 0x7f080034
-.field public static final abc_btn_check_material:I = 0x7f080034
+.field public static final abc_btn_check_material:I = 0x7f080035
-.field public static final abc_btn_check_material_anim:I = 0x7f080035
+.field public static final abc_btn_check_material_anim:I = 0x7f080036
-.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f080036
+.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f080037
-.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f080037
+.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f080038
-.field public static final abc_btn_colored_material:I = 0x7f080038
+.field public static final abc_btn_colored_material:I = 0x7f080039
-.field public static final abc_btn_default_mtrl_shape:I = 0x7f080039
+.field public static final abc_btn_default_mtrl_shape:I = 0x7f08003a
-.field public static final abc_btn_radio_material:I = 0x7f08003a
+.field public static final abc_btn_radio_material:I = 0x7f08003b
-.field public static final abc_btn_radio_material_anim:I = 0x7f08003b
+.field public static final abc_btn_radio_material_anim:I = 0x7f08003c
-.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08003c
+.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08003d
-.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f08003d
+.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f08003e
-.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f08003e
+.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f08003f
-.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f08003f
+.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080040
-.field public static final abc_cab_background_internal_bg:I = 0x7f080040
+.field public static final abc_cab_background_internal_bg:I = 0x7f080041
-.field public static final abc_cab_background_top_material:I = 0x7f080041
+.field public static final abc_cab_background_top_material:I = 0x7f080042
-.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080042
+.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080043
-.field public static final abc_control_background_material:I = 0x7f080043
+.field public static final abc_control_background_material:I = 0x7f080044
-.field public static final abc_dialog_material_background:I = 0x7f080044
+.field public static final abc_dialog_material_background:I = 0x7f080045
-.field public static final abc_edit_text_material:I = 0x7f080045
+.field public static final abc_edit_text_material:I = 0x7f080046
-.field public static final abc_ic_ab_back_material:I = 0x7f080046
+.field public static final abc_ic_ab_back_material:I = 0x7f080047
-.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f080047
+.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f080048
-.field public static final abc_ic_clear_material:I = 0x7f080048
+.field public static final abc_ic_clear_material:I = 0x7f080049
-.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f080049
+.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08004a
-.field public static final abc_ic_go_search_api_material:I = 0x7f08004a
+.field public static final abc_ic_go_search_api_material:I = 0x7f08004b
-.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08004b
+.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08004c
-.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08004c
+.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08004d
-.field public static final abc_ic_menu_overflow_material:I = 0x7f08004d
+.field public static final abc_ic_menu_overflow_material:I = 0x7f08004e
-.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f08004e
+.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f08004f
-.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f08004f
+.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080050
-.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080050
+.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080051
-.field public static final abc_ic_search_api_material:I = 0x7f080051
+.field public static final abc_ic_search_api_material:I = 0x7f080052
-.field public static final abc_ic_star_black_16dp:I = 0x7f080052
+.field public static final abc_ic_star_black_16dp:I = 0x7f080053
-.field public static final abc_ic_star_black_36dp:I = 0x7f080053
+.field public static final abc_ic_star_black_36dp:I = 0x7f080054
-.field public static final abc_ic_star_black_48dp:I = 0x7f080054
+.field public static final abc_ic_star_black_48dp:I = 0x7f080055
-.field public static final abc_ic_star_half_black_16dp:I = 0x7f080055
+.field public static final abc_ic_star_half_black_16dp:I = 0x7f080056
-.field public static final abc_ic_star_half_black_36dp:I = 0x7f080056
+.field public static final abc_ic_star_half_black_36dp:I = 0x7f080057
-.field public static final abc_ic_star_half_black_48dp:I = 0x7f080057
+.field public static final abc_ic_star_half_black_48dp:I = 0x7f080058
-.field public static final abc_ic_voice_search_api_material:I = 0x7f080058
+.field public static final abc_ic_voice_search_api_material:I = 0x7f080059
-.field public static final abc_item_background_holo_dark:I = 0x7f080059
+.field public static final abc_item_background_holo_dark:I = 0x7f08005a
-.field public static final abc_item_background_holo_light:I = 0x7f08005a
+.field public static final abc_item_background_holo_light:I = 0x7f08005b
-.field public static final abc_list_divider_material:I = 0x7f08005b
+.field public static final abc_list_divider_material:I = 0x7f08005c
-.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08005c
+.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08005d
-.field public static final abc_list_focused_holo:I = 0x7f08005d
+.field public static final abc_list_focused_holo:I = 0x7f08005e
-.field public static final abc_list_longpressed_holo:I = 0x7f08005e
+.field public static final abc_list_longpressed_holo:I = 0x7f08005f
-.field public static final abc_list_pressed_holo_dark:I = 0x7f08005f
+.field public static final abc_list_pressed_holo_dark:I = 0x7f080060
-.field public static final abc_list_pressed_holo_light:I = 0x7f080060
+.field public static final abc_list_pressed_holo_light:I = 0x7f080061
-.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080061
+.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080062
-.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080062
+.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080063
-.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080063
+.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080064
-.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080064
+.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080065
-.field public static final abc_list_selector_holo_dark:I = 0x7f080065
+.field public static final abc_list_selector_holo_dark:I = 0x7f080066
-.field public static final abc_list_selector_holo_light:I = 0x7f080066
+.field public static final abc_list_selector_holo_light:I = 0x7f080067
-.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f080067
+.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f080068
-.field public static final abc_popup_background_mtrl_mult:I = 0x7f080068
+.field public static final abc_popup_background_mtrl_mult:I = 0x7f080069
-.field public static final abc_ratingbar_indicator_material:I = 0x7f080069
+.field public static final abc_ratingbar_indicator_material:I = 0x7f08006a
-.field public static final abc_ratingbar_material:I = 0x7f08006a
+.field public static final abc_ratingbar_material:I = 0x7f08006b
-.field public static final abc_ratingbar_small_material:I = 0x7f08006b
+.field public static final abc_ratingbar_small_material:I = 0x7f08006c
-.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08006c
+.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08006d
-.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f08006d
+.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f08006e
-.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f08006e
+.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f08006f
-.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f08006f
+.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080070
-.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080070
+.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080071
-.field public static final abc_seekbar_thumb_material:I = 0x7f080071
+.field public static final abc_seekbar_thumb_material:I = 0x7f080072
-.field public static final abc_seekbar_tick_mark_material:I = 0x7f080072
+.field public static final abc_seekbar_tick_mark_material:I = 0x7f080073
-.field public static final abc_seekbar_track_material:I = 0x7f080073
+.field public static final abc_seekbar_track_material:I = 0x7f080074
-.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080074
+.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080075
-.field public static final abc_spinner_textfield_background_material:I = 0x7f080075
+.field public static final abc_spinner_textfield_background_material:I = 0x7f080076
-.field public static final abc_switch_thumb_material:I = 0x7f080076
+.field public static final abc_switch_thumb_material:I = 0x7f080077
-.field public static final abc_switch_track_mtrl_alpha:I = 0x7f080077
+.field public static final abc_switch_track_mtrl_alpha:I = 0x7f080078
-.field public static final abc_tab_indicator_material:I = 0x7f080078
+.field public static final abc_tab_indicator_material:I = 0x7f080079
-.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f080079
+.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08007a
-.field public static final abc_text_cursor_material:I = 0x7f08007a
+.field public static final abc_text_cursor_material:I = 0x7f08007b
-.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08007b
+.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08007c
-.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08007c
+.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08007d
-.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f08007d
+.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f08007e
-.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f08007e
+.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f08007f
-.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f08007f
+.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080080
-.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080080
+.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080081
-.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080081
+.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080082
-.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080082
+.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080083
-.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080083
+.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080084
-.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080084
+.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080085
-.field public static final abc_textfield_search_material:I = 0x7f080085
+.field public static final abc_textfield_search_material:I = 0x7f080086
-.field public static final abc_vector_test:I = 0x7f080086
+.field public static final abc_vector_test:I = 0x7f080087
-.field public static final avd_hide_password:I = 0x7f0800a4
+.field public static final avd_hide_password:I = 0x7f0800a5
-.field public static final avd_show_password:I = 0x7f0800a5
+.field public static final avd_show_password:I = 0x7f0800a6
-.field public static final btn_checkbox_checked_mtrl:I = 0x7f0800c0
+.field public static final btn_checkbox_checked_mtrl:I = 0x7f0800c1
-.field public static final btn_checkbox_checked_to_unchecked_mtrl_animation:I = 0x7f0800c1
+.field public static final btn_checkbox_checked_to_unchecked_mtrl_animation:I = 0x7f0800c2
-.field public static final btn_checkbox_unchecked_mtrl:I = 0x7f0800c2
+.field public static final btn_checkbox_unchecked_mtrl:I = 0x7f0800c3
-.field public static final btn_checkbox_unchecked_to_checked_mtrl_animation:I = 0x7f0800c3
+.field public static final btn_checkbox_unchecked_to_checked_mtrl_animation:I = 0x7f0800c4
-.field public static final btn_radio_off_mtrl:I = 0x7f0800c4
+.field public static final btn_radio_off_mtrl:I = 0x7f0800c5
-.field public static final btn_radio_off_to_on_mtrl_animation:I = 0x7f0800c5
+.field public static final btn_radio_off_to_on_mtrl_animation:I = 0x7f0800c6
-.field public static final btn_radio_on_mtrl:I = 0x7f0800c6
+.field public static final btn_radio_on_mtrl:I = 0x7f0800c7
-.field public static final btn_radio_on_to_off_mtrl_animation:I = 0x7f0800c7
+.field public static final btn_radio_on_to_off_mtrl_animation:I = 0x7f0800c8
-.field public static final common_full_open_on_phone:I = 0x7f0800d2
+.field public static final common_full_open_on_phone:I = 0x7f0800d3
-.field public static final common_google_signin_btn_icon_dark:I = 0x7f0800d3
+.field public static final common_google_signin_btn_icon_dark:I = 0x7f0800d4
-.field public static final common_google_signin_btn_icon_dark_focused:I = 0x7f0800d4
+.field public static final common_google_signin_btn_icon_dark_focused:I = 0x7f0800d5
-.field public static final common_google_signin_btn_icon_dark_normal:I = 0x7f0800d5
+.field public static final common_google_signin_btn_icon_dark_normal:I = 0x7f0800d6
-.field public static final common_google_signin_btn_icon_dark_normal_background:I = 0x7f0800d6
+.field public static final common_google_signin_btn_icon_dark_normal_background:I = 0x7f0800d7
-.field public static final common_google_signin_btn_icon_disabled:I = 0x7f0800d7
+.field public static final common_google_signin_btn_icon_disabled:I = 0x7f0800d8
-.field public static final common_google_signin_btn_icon_light:I = 0x7f0800d8
+.field public static final common_google_signin_btn_icon_light:I = 0x7f0800d9
-.field public static final common_google_signin_btn_icon_light_focused:I = 0x7f0800d9
+.field public static final common_google_signin_btn_icon_light_focused:I = 0x7f0800da
-.field public static final common_google_signin_btn_icon_light_normal:I = 0x7f0800da
+.field public static final common_google_signin_btn_icon_light_normal:I = 0x7f0800db
-.field public static final common_google_signin_btn_icon_light_normal_background:I = 0x7f0800db
+.field public static final common_google_signin_btn_icon_light_normal_background:I = 0x7f0800dc
-.field public static final common_google_signin_btn_text_dark:I = 0x7f0800dc
+.field public static final common_google_signin_btn_text_dark:I = 0x7f0800dd
-.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f0800dd
+.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f0800de
-.field public static final common_google_signin_btn_text_dark_normal:I = 0x7f0800de
+.field public static final common_google_signin_btn_text_dark_normal:I = 0x7f0800df
-.field public static final common_google_signin_btn_text_dark_normal_background:I = 0x7f0800df
+.field public static final common_google_signin_btn_text_dark_normal_background:I = 0x7f0800e0
-.field public static final common_google_signin_btn_text_disabled:I = 0x7f0800e0
+.field public static final common_google_signin_btn_text_disabled:I = 0x7f0800e1
-.field public static final common_google_signin_btn_text_light:I = 0x7f0800e1
+.field public static final common_google_signin_btn_text_light:I = 0x7f0800e2
-.field public static final common_google_signin_btn_text_light_focused:I = 0x7f0800e2
+.field public static final common_google_signin_btn_text_light_focused:I = 0x7f0800e3
-.field public static final common_google_signin_btn_text_light_normal:I = 0x7f0800e3
+.field public static final common_google_signin_btn_text_light_normal:I = 0x7f0800e4
-.field public static final common_google_signin_btn_text_light_normal_background:I = 0x7f0800e4
+.field public static final common_google_signin_btn_text_light_normal_background:I = 0x7f0800e5
-.field public static final design_bottom_navigation_item_background:I = 0x7f0800ea
+.field public static final design_bottom_navigation_item_background:I = 0x7f0800eb
-.field public static final design_fab_background:I = 0x7f0800eb
+.field public static final design_fab_background:I = 0x7f0800ec
-.field public static final design_ic_visibility:I = 0x7f0800ec
+.field public static final design_ic_visibility:I = 0x7f0800ed
-.field public static final design_ic_visibility_off:I = 0x7f0800ed
+.field public static final design_ic_visibility_off:I = 0x7f0800ee
-.field public static final design_password_eye:I = 0x7f0800ee
+.field public static final design_password_eye:I = 0x7f0800ef
-.field public static final design_snackbar_background:I = 0x7f0800ef
+.field public static final design_snackbar_background:I = 0x7f0800f0
-.field public static final drawable_chip_background:I = 0x7f08012a
+.field public static final drawable_chip_background:I = 0x7f08012b
-.field public static final drawable_chip_circle:I = 0x7f08012b
+.field public static final drawable_chip_circle:I = 0x7f08012c
-.field public static final drawable_chip_delete:I = 0x7f08012c
+.field public static final drawable_chip_delete:I = 0x7f08012d
-.field public static final googleg_disabled_color_18:I = 0x7f0801f8
+.field public static final googleg_disabled_color_18:I = 0x7f0801f9
-.field public static final googleg_standard_color_18:I = 0x7f0801f9
+.field public static final googleg_standard_color_18:I = 0x7f0801fa
-.field public static final ic_arrow_down_24dp:I = 0x7f080221
+.field public static final ic_arrow_down_24dp:I = 0x7f080222
-.field public static final ic_mtrl_checked_circle:I = 0x7f080353
+.field public static final ic_mtrl_checked_circle:I = 0x7f080354
-.field public static final ic_mtrl_chip_checked_black:I = 0x7f080354
+.field public static final ic_mtrl_chip_checked_black:I = 0x7f080355
-.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080355
+.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080356
-.field public static final ic_mtrl_chip_close_circle:I = 0x7f080356
+.field public static final ic_mtrl_chip_close_circle:I = 0x7f080357
-.field public static final material_ic_calendar_black_24dp:I = 0x7f0804ef
+.field public static final material_ic_calendar_black_24dp:I = 0x7f0804f0
-.field public static final material_ic_clear_black_24dp:I = 0x7f0804f0
+.field public static final material_ic_clear_black_24dp:I = 0x7f0804f1
-.field public static final material_ic_edit_black_24dp:I = 0x7f0804f1
+.field public static final material_ic_edit_black_24dp:I = 0x7f0804f2
-.field public static final material_ic_keyboard_arrow_left_black_24dp:I = 0x7f0804f2
+.field public static final material_ic_keyboard_arrow_left_black_24dp:I = 0x7f0804f3
-.field public static final material_ic_keyboard_arrow_right_black_24dp:I = 0x7f0804f3
+.field public static final material_ic_keyboard_arrow_right_black_24dp:I = 0x7f0804f4
-.field public static final material_ic_menu_arrow_down_black_24dp:I = 0x7f0804f4
+.field public static final material_ic_menu_arrow_down_black_24dp:I = 0x7f0804f5
-.field public static final material_ic_menu_arrow_up_black_24dp:I = 0x7f0804f5
+.field public static final material_ic_menu_arrow_up_black_24dp:I = 0x7f0804f6
-.field public static final mtrl_dialog_background:I = 0x7f0804f6
+.field public static final mtrl_dialog_background:I = 0x7f0804f7
-.field public static final mtrl_dropdown_arrow:I = 0x7f0804f7
+.field public static final mtrl_dropdown_arrow:I = 0x7f0804f8
-.field public static final mtrl_ic_arrow_drop_down:I = 0x7f0804f8
+.field public static final mtrl_ic_arrow_drop_down:I = 0x7f0804f9
-.field public static final mtrl_ic_arrow_drop_up:I = 0x7f0804f9
+.field public static final mtrl_ic_arrow_drop_up:I = 0x7f0804fa
-.field public static final mtrl_ic_cancel:I = 0x7f0804fa
+.field public static final mtrl_ic_cancel:I = 0x7f0804fb
-.field public static final mtrl_ic_error:I = 0x7f0804fb
+.field public static final mtrl_ic_error:I = 0x7f0804fc
-.field public static final mtrl_popupmenu_background:I = 0x7f0804fc
+.field public static final mtrl_popupmenu_background:I = 0x7f0804fd
-.field public static final mtrl_popupmenu_background_dark:I = 0x7f0804fd
+.field public static final mtrl_popupmenu_background_dark:I = 0x7f0804fe
-.field public static final mtrl_tabs_default_indicator:I = 0x7f0804fe
+.field public static final mtrl_tabs_default_indicator:I = 0x7f0804ff
-.field public static final navigation_empty_icon:I = 0x7f0804ff
+.field public static final navigation_empty_icon:I = 0x7f080500
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
-.field public static final preference_list_divider_material:I = 0x7f08050c
+.field public static final preference_list_divider_material:I = 0x7f08050d
-.field public static final test_custom_background:I = 0x7f08051e
+.field public static final test_custom_background:I = 0x7f08051f
-.field public static final tooltip_frame_dark:I = 0x7f08051f
+.field public static final tooltip_frame_dark:I = 0x7f080520
-.field public static final tooltip_frame_light:I = 0x7f080520
+.field public static final tooltip_frame_light:I = 0x7f080521
# direct methods
diff --git a/com.discord/smali/com/discord/gateway/R$id.smali b/com.discord/smali/com/discord/gateway/R$id.smali
index a73324c03a..49722238b1 100644
--- a/com.discord/smali/com/discord/gateway/R$id.smali
+++ b/com.discord/smali/com/discord/gateway/R$id.smali
@@ -150,471 +150,471 @@
.field public static final buttonPanel:I = 0x7f0a0125
-.field public static final cancel_action:I = 0x7f0a013a
+.field public static final cancel_action:I = 0x7f0a013c
-.field public static final cancel_button:I = 0x7f0a013b
+.field public static final cancel_button:I = 0x7f0a013d
-.field public static final center:I = 0x7f0a013f
+.field public static final center:I = 0x7f0a0141
-.field public static final centerCrop:I = 0x7f0a0140
+.field public static final centerCrop:I = 0x7f0a0142
-.field public static final centerInside:I = 0x7f0a0141
+.field public static final centerInside:I = 0x7f0a0143
-.field public static final checkbox:I = 0x7f0a0260
+.field public static final checkbox:I = 0x7f0a0262
-.field public static final checked:I = 0x7f0a0262
+.field public static final checked:I = 0x7f0a0264
-.field public static final chip:I = 0x7f0a0263
+.field public static final chip:I = 0x7f0a0265
-.field public static final chip1:I = 0x7f0a0264
+.field public static final chip1:I = 0x7f0a0266
-.field public static final chip2:I = 0x7f0a0265
+.field public static final chip2:I = 0x7f0a0267
-.field public static final chip3:I = 0x7f0a0266
+.field public static final chip3:I = 0x7f0a0268
-.field public static final chip_group:I = 0x7f0a0267
+.field public static final chip_group:I = 0x7f0a0269
-.field public static final chip_image:I = 0x7f0a0268
+.field public static final chip_image:I = 0x7f0a026a
-.field public static final chip_text:I = 0x7f0a0269
+.field public static final chip_text:I = 0x7f0a026b
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final circular:I = 0x7f0a026c
+.field public static final circular:I = 0x7f0a026e
-.field public static final clear_text:I = 0x7f0a026d
+.field public static final clear_text:I = 0x7f0a026f
-.field public static final column:I = 0x7f0a0276
+.field public static final column:I = 0x7f0a0278
-.field public static final column_reverse:I = 0x7f0a0277
+.field public static final column_reverse:I = 0x7f0a0279
-.field public static final confirm_button:I = 0x7f0a0278
+.field public static final confirm_button:I = 0x7f0a027a
-.field public static final container:I = 0x7f0a0289
+.field public static final container:I = 0x7f0a028b
-.field public static final content:I = 0x7f0a028a
+.field public static final content:I = 0x7f0a028c
-.field public static final contentPanel:I = 0x7f0a028b
+.field public static final contentPanel:I = 0x7f0a028d
-.field public static final coordinator:I = 0x7f0a028f
+.field public static final coordinator:I = 0x7f0a0291
-.field public static final custom:I = 0x7f0a02b5
+.field public static final custom:I = 0x7f0a02b7
-.field public static final customPanel:I = 0x7f0a02b6
+.field public static final customPanel:I = 0x7f0a02b8
-.field public static final cut:I = 0x7f0a02b7
+.field public static final cut:I = 0x7f0a02b9
-.field public static final dark:I = 0x7f0a02b8
+.field public static final dark:I = 0x7f0a02ba
-.field public static final date_picker_actions:I = 0x7f0a02ba
+.field public static final date_picker_actions:I = 0x7f0a02bc
-.field public static final decor_content_parent:I = 0x7f0a02be
+.field public static final decor_content_parent:I = 0x7f0a02c0
-.field public static final default_activity_button:I = 0x7f0a02bf
+.field public static final default_activity_button:I = 0x7f0a02c1
-.field public static final design_bottom_sheet:I = 0x7f0a02c3
+.field public static final design_bottom_sheet:I = 0x7f0a02c5
-.field public static final design_menu_item_action_area:I = 0x7f0a02c4
+.field public static final design_menu_item_action_area:I = 0x7f0a02c6
-.field public static final design_menu_item_action_area_stub:I = 0x7f0a02c5
+.field public static final design_menu_item_action_area_stub:I = 0x7f0a02c7
-.field public static final design_menu_item_text:I = 0x7f0a02c6
+.field public static final design_menu_item_text:I = 0x7f0a02c8
-.field public static final design_navigation_view:I = 0x7f0a02c7
+.field public static final design_navigation_view:I = 0x7f0a02c9
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02cf
-.field public static final dropdown_menu:I = 0x7f0a02f9
+.field public static final dropdown_menu:I = 0x7f0a02fb
-.field public static final edit_query:I = 0x7f0a031e
+.field public static final edit_query:I = 0x7f0a0320
-.field public static final end:I = 0x7f0a034b
+.field public static final end:I = 0x7f0a034d
-.field public static final end_padder:I = 0x7f0a034c
+.field public static final end_padder:I = 0x7f0a034e
-.field public static final expand_activities_button:I = 0x7f0a0368
+.field public static final expand_activities_button:I = 0x7f0a036a
-.field public static final expanded_menu:I = 0x7f0a0369
+.field public static final expanded_menu:I = 0x7f0a036b
-.field public static final fade:I = 0x7f0a0387
+.field public static final fade:I = 0x7f0a0389
-.field public static final fill:I = 0x7f0a039e
+.field public static final fill:I = 0x7f0a03a0
-.field public static final filled:I = 0x7f0a03a1
+.field public static final filled:I = 0x7f0a03a3
-.field public static final fitBottomStart:I = 0x7f0a03a5
+.field public static final fitBottomStart:I = 0x7f0a03a7
-.field public static final fitCenter:I = 0x7f0a03a6
+.field public static final fitCenter:I = 0x7f0a03a8
-.field public static final fitEnd:I = 0x7f0a03a7
+.field public static final fitEnd:I = 0x7f0a03a9
-.field public static final fitStart:I = 0x7f0a03a8
+.field public static final fitStart:I = 0x7f0a03aa
-.field public static final fitXY:I = 0x7f0a03aa
+.field public static final fitXY:I = 0x7f0a03ac
-.field public static final fixed:I = 0x7f0a03ab
+.field public static final fixed:I = 0x7f0a03ad
-.field public static final flex_end:I = 0x7f0a03ae
+.field public static final flex_end:I = 0x7f0a03b0
-.field public static final flex_start:I = 0x7f0a03bf
+.field public static final flex_start:I = 0x7f0a03c1
-.field public static final floating:I = 0x7f0a03c0
+.field public static final floating:I = 0x7f0a03c2
-.field public static final focusCrop:I = 0x7f0a03c2
+.field public static final focusCrop:I = 0x7f0a03c4
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final fragment_container_view_tag:I = 0x7f0a03c8
+.field public static final fragment_container_view_tag:I = 0x7f0a03ca
-.field public static final ghost_view:I = 0x7f0a03e3
+.field public static final ghost_view:I = 0x7f0a03e5
-.field public static final ghost_view_holder:I = 0x7f0a03e4
+.field public static final ghost_view_holder:I = 0x7f0a03e6
-.field public static final gone:I = 0x7f0a0410
+.field public static final gone:I = 0x7f0a0412
-.field public static final group_divider:I = 0x7f0a0412
+.field public static final group_divider:I = 0x7f0a0414
-.field public static final home:I = 0x7f0a04c1
+.field public static final home:I = 0x7f0a04c3
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_frame:I = 0x7f0a04d5
+.field public static final icon_frame:I = 0x7f0a04d7
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final icon_only:I = 0x7f0a04d7
+.field public static final icon_only:I = 0x7f0a04d9
-.field public static final image:I = 0x7f0a04e0
+.field public static final image:I = 0x7f0a04e2
-.field public static final incoming:I = 0x7f0a04e8
+.field public static final incoming:I = 0x7f0a04ea
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a056f
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0571
-.field public static final labeled:I = 0x7f0a0577
+.field public static final labeled:I = 0x7f0a0579
-.field public static final largeLabel:I = 0x7f0a0579
+.field public static final largeLabel:I = 0x7f0a057b
-.field public static final left:I = 0x7f0a0584
+.field public static final left:I = 0x7f0a0586
-.field public static final light:I = 0x7f0a0585
+.field public static final light:I = 0x7f0a0587
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final linear:I = 0x7f0a0588
+.field public static final linear:I = 0x7f0a058a
-.field public static final listMode:I = 0x7f0a058a
+.field public static final listMode:I = 0x7f0a058c
-.field public static final list_item:I = 0x7f0a058b
+.field public static final list_item:I = 0x7f0a058d
-.field public static final masked:I = 0x7f0a059b
+.field public static final masked:I = 0x7f0a059d
-.field public static final media_actions:I = 0x7f0a05a1
+.field public static final media_actions:I = 0x7f0a05a3
-.field public static final message:I = 0x7f0a05de
+.field public static final message:I = 0x7f0a05dc
-.field public static final mini:I = 0x7f0a05e3
+.field public static final mini:I = 0x7f0a05e1
-.field public static final month_grid:I = 0x7f0a05e5
+.field public static final month_grid:I = 0x7f0a05e3
-.field public static final month_navigation_bar:I = 0x7f0a05e6
+.field public static final month_navigation_bar:I = 0x7f0a05e4
-.field public static final month_navigation_fragment_toggle:I = 0x7f0a05e7
+.field public static final month_navigation_fragment_toggle:I = 0x7f0a05e5
-.field public static final month_navigation_next:I = 0x7f0a05e8
+.field public static final month_navigation_next:I = 0x7f0a05e6
-.field public static final month_navigation_previous:I = 0x7f0a05e9
+.field public static final month_navigation_previous:I = 0x7f0a05e7
-.field public static final month_title:I = 0x7f0a05ea
+.field public static final month_title:I = 0x7f0a05e8
-.field public static final mtrl_calendar_day_selector_frame:I = 0x7f0a05eb
+.field public static final mtrl_calendar_day_selector_frame:I = 0x7f0a05e9
-.field public static final mtrl_calendar_days_of_week:I = 0x7f0a05ec
+.field public static final mtrl_calendar_days_of_week:I = 0x7f0a05ea
-.field public static final mtrl_calendar_frame:I = 0x7f0a05ed
+.field public static final mtrl_calendar_frame:I = 0x7f0a05eb
-.field public static final mtrl_calendar_main_pane:I = 0x7f0a05ee
+.field public static final mtrl_calendar_main_pane:I = 0x7f0a05ec
-.field public static final mtrl_calendar_months:I = 0x7f0a05ef
+.field public static final mtrl_calendar_months:I = 0x7f0a05ed
-.field public static final mtrl_calendar_selection_frame:I = 0x7f0a05f0
+.field public static final mtrl_calendar_selection_frame:I = 0x7f0a05ee
-.field public static final mtrl_calendar_text_input_frame:I = 0x7f0a05f1
+.field public static final mtrl_calendar_text_input_frame:I = 0x7f0a05ef
-.field public static final mtrl_calendar_year_selector_frame:I = 0x7f0a05f2
+.field public static final mtrl_calendar_year_selector_frame:I = 0x7f0a05f0
-.field public static final mtrl_card_checked_layer_id:I = 0x7f0a05f3
+.field public static final mtrl_card_checked_layer_id:I = 0x7f0a05f1
-.field public static final mtrl_child_content_container:I = 0x7f0a05f4
+.field public static final mtrl_child_content_container:I = 0x7f0a05f2
-.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a05f5
+.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a05f3
-.field public static final mtrl_motion_snapshot_view:I = 0x7f0a05f6
+.field public static final mtrl_motion_snapshot_view:I = 0x7f0a05f4
-.field public static final mtrl_picker_fullscreen:I = 0x7f0a05f7
+.field public static final mtrl_picker_fullscreen:I = 0x7f0a05f5
-.field public static final mtrl_picker_header:I = 0x7f0a05f8
+.field public static final mtrl_picker_header:I = 0x7f0a05f6
-.field public static final mtrl_picker_header_selection_text:I = 0x7f0a05f9
+.field public static final mtrl_picker_header_selection_text:I = 0x7f0a05f7
-.field public static final mtrl_picker_header_title_and_selection:I = 0x7f0a05fa
+.field public static final mtrl_picker_header_title_and_selection:I = 0x7f0a05f8
-.field public static final mtrl_picker_header_toggle:I = 0x7f0a05fb
+.field public static final mtrl_picker_header_toggle:I = 0x7f0a05f9
-.field public static final mtrl_picker_text_input_date:I = 0x7f0a05fc
+.field public static final mtrl_picker_text_input_date:I = 0x7f0a05fa
-.field public static final mtrl_picker_text_input_range_end:I = 0x7f0a05fd
+.field public static final mtrl_picker_text_input_range_end:I = 0x7f0a05fb
-.field public static final mtrl_picker_text_input_range_start:I = 0x7f0a05fe
+.field public static final mtrl_picker_text_input_range_start:I = 0x7f0a05fc
-.field public static final mtrl_picker_title_text:I = 0x7f0a05ff
+.field public static final mtrl_picker_title_text:I = 0x7f0a05fd
-.field public static final multiply:I = 0x7f0a0600
+.field public static final multiply:I = 0x7f0a05fe
-.field public static final navigation_header_container:I = 0x7f0a0612
+.field public static final navigation_header_container:I = 0x7f0a0610
-.field public static final none:I = 0x7f0a0627
+.field public static final none:I = 0x7f0a0625
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final nowrap:I = 0x7f0a0638
+.field public static final nowrap:I = 0x7f0a0636
-.field public static final off:I = 0x7f0a0668
+.field public static final off:I = 0x7f0a0666
-.field public static final on:I = 0x7f0a066c
+.field public static final on:I = 0x7f0a066a
-.field public static final outgoing:I = 0x7f0a066e
+.field public static final outgoing:I = 0x7f0a066c
-.field public static final outline:I = 0x7f0a066f
+.field public static final outline:I = 0x7f0a066d
-.field public static final parallax:I = 0x7f0a067f
+.field public static final parallax:I = 0x7f0a067d
-.field public static final parentPanel:I = 0x7f0a0681
+.field public static final parentPanel:I = 0x7f0a067f
-.field public static final parent_matrix:I = 0x7f0a0682
+.field public static final parent_matrix:I = 0x7f0a0680
-.field public static final password_toggle:I = 0x7f0a0690
+.field public static final password_toggle:I = 0x7f0a068e
-.field public static final pin:I = 0x7f0a06bd
+.field public static final pin:I = 0x7f0a06bb
-.field public static final progress_circular:I = 0x7f0a072c
+.field public static final progress_circular:I = 0x7f0a072a
-.field public static final progress_horizontal:I = 0x7f0a072f
+.field public static final progress_horizontal:I = 0x7f0a072d
-.field public static final radio:I = 0x7f0a073d
+.field public static final radio:I = 0x7f0a073b
-.field public static final recycler_view:I = 0x7f0a0743
+.field public static final recycler_view:I = 0x7f0a0741
-.field public static final right:I = 0x7f0a075f
+.field public static final right:I = 0x7f0a075d
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final rounded:I = 0x7f0a0789
+.field public static final rounded:I = 0x7f0a0787
-.field public static final row:I = 0x7f0a078a
+.field public static final row:I = 0x7f0a0788
-.field public static final row_index_key:I = 0x7f0a078b
+.field public static final row_index_key:I = 0x7f0a0789
-.field public static final row_reverse:I = 0x7f0a078c
+.field public static final row_reverse:I = 0x7f0a078a
-.field public static final save_non_transition_alpha:I = 0x7f0a078d
+.field public static final save_non_transition_alpha:I = 0x7f0a078b
-.field public static final save_overlay_view:I = 0x7f0a078e
+.field public static final save_overlay_view:I = 0x7f0a078c
-.field public static final scale:I = 0x7f0a078f
+.field public static final scale:I = 0x7f0a078d
-.field public static final screen:I = 0x7f0a0791
+.field public static final screen:I = 0x7f0a078f
-.field public static final scrollIndicatorDown:I = 0x7f0a0795
+.field public static final scrollIndicatorDown:I = 0x7f0a0793
-.field public static final scrollIndicatorUp:I = 0x7f0a0796
+.field public static final scrollIndicatorUp:I = 0x7f0a0794
-.field public static final scrollView:I = 0x7f0a0797
+.field public static final scrollView:I = 0x7f0a0795
-.field public static final scrollable:I = 0x7f0a0799
+.field public static final scrollable:I = 0x7f0a0797
-.field public static final search_badge:I = 0x7f0a079a
+.field public static final search_badge:I = 0x7f0a0798
-.field public static final search_bar:I = 0x7f0a079b
+.field public static final search_bar:I = 0x7f0a0799
-.field public static final search_button:I = 0x7f0a079c
+.field public static final search_button:I = 0x7f0a079a
-.field public static final search_close_btn:I = 0x7f0a079d
+.field public static final search_close_btn:I = 0x7f0a079b
-.field public static final search_edit_frame:I = 0x7f0a079e
+.field public static final search_edit_frame:I = 0x7f0a079c
-.field public static final search_go_btn:I = 0x7f0a07a0
+.field public static final search_go_btn:I = 0x7f0a079e
-.field public static final search_mag_icon:I = 0x7f0a07a1
+.field public static final search_mag_icon:I = 0x7f0a079f
-.field public static final search_plate:I = 0x7f0a07a2
+.field public static final search_plate:I = 0x7f0a07a0
-.field public static final search_src_text:I = 0x7f0a07a5
+.field public static final search_src_text:I = 0x7f0a07a3
-.field public static final search_voice_btn:I = 0x7f0a07b1
+.field public static final search_voice_btn:I = 0x7f0a07af
-.field public static final seekbar:I = 0x7f0a07b2
+.field public static final seekbar:I = 0x7f0a07b0
-.field public static final seekbar_value:I = 0x7f0a07b3
+.field public static final seekbar_value:I = 0x7f0a07b1
-.field public static final select_dialog_listview:I = 0x7f0a07b4
+.field public static final select_dialog_listview:I = 0x7f0a07b2
-.field public static final selected:I = 0x7f0a07b5
+.field public static final selected:I = 0x7f0a07b3
-.field public static final shortcut:I = 0x7f0a0914
+.field public static final shortcut:I = 0x7f0a0912
-.field public static final slide:I = 0x7f0a0919
+.field public static final slide:I = 0x7f0a0917
-.field public static final smallLabel:I = 0x7f0a091a
+.field public static final smallLabel:I = 0x7f0a0918
-.field public static final snackbar_action:I = 0x7f0a091b
+.field public static final snackbar_action:I = 0x7f0a0919
-.field public static final snackbar_text:I = 0x7f0a091c
+.field public static final snackbar_text:I = 0x7f0a091a
-.field public static final space_around:I = 0x7f0a0920
+.field public static final space_around:I = 0x7f0a091e
-.field public static final space_between:I = 0x7f0a0921
+.field public static final space_between:I = 0x7f0a091f
-.field public static final space_evenly:I = 0x7f0a0922
+.field public static final space_evenly:I = 0x7f0a0920
-.field public static final spacer:I = 0x7f0a0923
+.field public static final spacer:I = 0x7f0a0921
-.field public static final spinner:I = 0x7f0a0926
+.field public static final spinner:I = 0x7f0a0924
-.field public static final split_action_bar:I = 0x7f0a0927
+.field public static final split_action_bar:I = 0x7f0a0925
-.field public static final src_atop:I = 0x7f0a092b
+.field public static final src_atop:I = 0x7f0a0929
-.field public static final src_in:I = 0x7f0a092c
+.field public static final src_in:I = 0x7f0a092a
-.field public static final src_over:I = 0x7f0a092d
+.field public static final src_over:I = 0x7f0a092b
-.field public static final standard:I = 0x7f0a092f
+.field public static final standard:I = 0x7f0a092d
-.field public static final start:I = 0x7f0a0930
+.field public static final start:I = 0x7f0a092e
-.field public static final status_bar_latest_event_content:I = 0x7f0a0934
+.field public static final status_bar_latest_event_content:I = 0x7f0a0932
-.field public static final stretch:I = 0x7f0a0949
+.field public static final stretch:I = 0x7f0a0947
-.field public static final submenuarrow:I = 0x7f0a094a
+.field public static final submenuarrow:I = 0x7f0a0948
-.field public static final submit_area:I = 0x7f0a094b
+.field public static final submit_area:I = 0x7f0a0949
-.field public static final switchWidget:I = 0x7f0a0959
+.field public static final switchWidget:I = 0x7f0a0957
-.field public static final tabMode:I = 0x7f0a095b
+.field public static final tabMode:I = 0x7f0a0959
-.field public static final tag_accessibility_actions:I = 0x7f0a0969
+.field public static final tag_accessibility_actions:I = 0x7f0a0967
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096a
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0968
-.field public static final tag_accessibility_heading:I = 0x7f0a096b
+.field public static final tag_accessibility_heading:I = 0x7f0a0969
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096c
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096a
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096d
+.field public static final tag_screen_reader_focusable:I = 0x7f0a096b
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final test_checkbox_android_button_tint:I = 0x7f0a0977
+.field public static final test_checkbox_android_button_tint:I = 0x7f0a0975
-.field public static final test_checkbox_app_button_tint:I = 0x7f0a0978
+.field public static final test_checkbox_app_button_tint:I = 0x7f0a0976
-.field public static final test_radiobutton_android_button_tint:I = 0x7f0a0979
+.field public static final test_radiobutton_android_button_tint:I = 0x7f0a0977
-.field public static final test_radiobutton_app_button_tint:I = 0x7f0a097a
+.field public static final test_radiobutton_app_button_tint:I = 0x7f0a0978
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final textSpacerNoButtons:I = 0x7f0a097f
+.field public static final textSpacerNoButtons:I = 0x7f0a097d
-.field public static final textSpacerNoTitle:I = 0x7f0a0980
+.field public static final textSpacerNoTitle:I = 0x7f0a097e
-.field public static final text_input_end_icon:I = 0x7f0a0982
+.field public static final text_input_end_icon:I = 0x7f0a0980
-.field public static final text_input_start_icon:I = 0x7f0a0983
+.field public static final text_input_start_icon:I = 0x7f0a0981
-.field public static final textinput_counter:I = 0x7f0a0986
+.field public static final textinput_counter:I = 0x7f0a0984
-.field public static final textinput_error:I = 0x7f0a0987
+.field public static final textinput_error:I = 0x7f0a0985
-.field public static final textinput_helper_text:I = 0x7f0a0988
+.field public static final textinput_helper_text:I = 0x7f0a0986
-.field public static final textinput_placeholder:I = 0x7f0a0989
+.field public static final textinput_placeholder:I = 0x7f0a0987
-.field public static final textinput_prefix_text:I = 0x7f0a098a
+.field public static final textinput_prefix_text:I = 0x7f0a0988
-.field public static final textinput_suffix_text:I = 0x7f0a098b
+.field public static final textinput_suffix_text:I = 0x7f0a0989
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
-.field public static final titleDividerNoCustom:I = 0x7f0a0993
+.field public static final titleDividerNoCustom:I = 0x7f0a0991
-.field public static final title_template:I = 0x7f0a0994
+.field public static final title_template:I = 0x7f0a0992
-.field public static final top:I = 0x7f0a099a
+.field public static final top:I = 0x7f0a0998
-.field public static final topPanel:I = 0x7f0a099b
+.field public static final topPanel:I = 0x7f0a0999
-.field public static final touch_outside:I = 0x7f0a099d
+.field public static final touch_outside:I = 0x7f0a099b
-.field public static final transition_current_scene:I = 0x7f0a099e
+.field public static final transition_current_scene:I = 0x7f0a099c
-.field public static final transition_layout_save:I = 0x7f0a099f
+.field public static final transition_layout_save:I = 0x7f0a099d
-.field public static final transition_position:I = 0x7f0a09a0
+.field public static final transition_position:I = 0x7f0a099e
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a09a1
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a099f
-.field public static final transition_transform:I = 0x7f0a09a2
+.field public static final transition_transform:I = 0x7f0a09a0
-.field public static final unchecked:I = 0x7f0a09b1
+.field public static final unchecked:I = 0x7f0a09af
-.field public static final uniform:I = 0x7f0a09b4
+.field public static final uniform:I = 0x7f0a09b2
-.field public static final unlabeled:I = 0x7f0a09b5
+.field public static final unlabeled:I = 0x7f0a09b3
-.field public static final up:I = 0x7f0a09b6
+.field public static final up:I = 0x7f0a09b4
-.field public static final view_offset_helper:I = 0x7f0a0a39
+.field public static final view_offset_helper:I = 0x7f0a0a37
-.field public static final visible:I = 0x7f0a0a4d
+.field public static final visible:I = 0x7f0a0a4b
-.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a4e
+.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a4c
-.field public static final wide:I = 0x7f0a0a7d
+.field public static final wide:I = 0x7f0a0a80
-.field public static final withinBounds:I = 0x7f0a0ab4
+.field public static final withinBounds:I = 0x7f0a0ab7
-.field public static final wrap:I = 0x7f0a0ab5
+.field public static final wrap:I = 0x7f0a0ab8
-.field public static final wrap_content:I = 0x7f0a0ab6
+.field public static final wrap_content:I = 0x7f0a0ab9
-.field public static final wrap_reverse:I = 0x7f0a0ab7
+.field public static final wrap_reverse:I = 0x7f0a0aba
-.field public static final zero_corner_chip:I = 0x7f0a0abc
+.field public static final zero_corner_chip:I = 0x7f0a0abf
# 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 120556209d..4f57783e92 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 = 0x7f120357
-.field public static final character_counter_content_description:I = 0x7f12041d
+.field public static final character_counter_content_description:I = 0x7f12041e
-.field public static final character_counter_overflowed_content_description:I = 0x7f12041e
+.field public static final character_counter_overflowed_content_description:I = 0x7f12041f
-.field public static final character_counter_pattern:I = 0x7f12041f
+.field public static final character_counter_pattern:I = 0x7f120420
-.field public static final chip_text:I = 0x7f120428
+.field public static final chip_text:I = 0x7f120429
-.field public static final clear_text_end_icon_content_description:I = 0x7f120435
+.field public static final clear_text_end_icon_content_description:I = 0x7f120436
-.field public static final common_google_play_services_enable_button:I = 0x7f120464
+.field public static final common_google_play_services_enable_button:I = 0x7f120465
-.field public static final common_google_play_services_enable_text:I = 0x7f120465
+.field public static final common_google_play_services_enable_text:I = 0x7f120466
-.field public static final common_google_play_services_enable_title:I = 0x7f120466
+.field public static final common_google_play_services_enable_title:I = 0x7f120467
-.field public static final common_google_play_services_install_button:I = 0x7f120467
+.field public static final common_google_play_services_install_button:I = 0x7f120468
-.field public static final common_google_play_services_install_text:I = 0x7f120468
+.field public static final common_google_play_services_install_text:I = 0x7f120469
-.field public static final common_google_play_services_install_title:I = 0x7f120469
+.field public static final common_google_play_services_install_title:I = 0x7f12046a
-.field public static final common_google_play_services_notification_channel_name:I = 0x7f12046a
+.field public static final common_google_play_services_notification_channel_name:I = 0x7f12046b
-.field public static final common_google_play_services_notification_ticker:I = 0x7f12046b
+.field public static final common_google_play_services_notification_ticker:I = 0x7f12046c
-.field public static final common_google_play_services_unknown_issue:I = 0x7f12046c
+.field public static final common_google_play_services_unknown_issue:I = 0x7f12046d
-.field public static final common_google_play_services_unsupported_text:I = 0x7f12046d
+.field public static final common_google_play_services_unsupported_text:I = 0x7f12046e
-.field public static final common_google_play_services_update_button:I = 0x7f12046e
+.field public static final common_google_play_services_update_button:I = 0x7f12046f
-.field public static final common_google_play_services_update_text:I = 0x7f12046f
+.field public static final common_google_play_services_update_text:I = 0x7f120470
-.field public static final common_google_play_services_update_title:I = 0x7f120470
+.field public static final common_google_play_services_update_title:I = 0x7f120471
-.field public static final common_google_play_services_updating_text:I = 0x7f120471
+.field public static final common_google_play_services_updating_text:I = 0x7f120472
-.field public static final common_google_play_services_wear_update_text:I = 0x7f120472
+.field public static final common_google_play_services_wear_update_text:I = 0x7f120473
-.field public static final common_open_on_phone:I = 0x7f120473
+.field public static final common_open_on_phone:I = 0x7f120474
-.field public static final common_signin_button_text:I = 0x7f120474
+.field public static final common_signin_button_text:I = 0x7f120475
-.field public static final common_signin_button_text_long:I = 0x7f120475
+.field public static final common_signin_button_text_long:I = 0x7f120476
-.field public static final copy:I = 0x7f1204d2
+.field public static final copy:I = 0x7f1204d3
-.field public static final error_icon_content_description:I = 0x7f120649
+.field public static final error_icon_content_description:I = 0x7f12064a
-.field public static final expand_button_title:I = 0x7f120680
+.field public static final expand_button_title:I = 0x7f120681
-.field public static final exposed_dropdown_menu_content_description:I = 0x7f12068e
+.field public static final exposed_dropdown_menu_content_description:I = 0x7f12068f
-.field public static final fab_transformation_scrim_behavior:I = 0x7f120697
+.field public static final fab_transformation_scrim_behavior:I = 0x7f120698
-.field public static final fab_transformation_sheet_behavior:I = 0x7f120698
+.field public static final fab_transformation_sheet_behavior:I = 0x7f120699
-.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120bcd
+.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120bd7
-.field public static final icon_content_description:I = 0x7f120c5a
+.field public static final icon_content_description:I = 0x7f120c64
-.field public static final item_view_role_description:I = 0x7f120d7b
+.field public static final item_view_role_description:I = 0x7f120d86
-.field public static final mtrl_badge_numberless_content_description:I = 0x7f120f01
+.field public static final mtrl_badge_numberless_content_description:I = 0x7f120f0f
-.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120f02
+.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120f10
-.field public static final mtrl_exceed_max_badge_number_content_description:I = 0x7f120f03
+.field public static final mtrl_exceed_max_badge_number_content_description:I = 0x7f120f11
-.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120f04
+.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120f12
-.field public static final mtrl_picker_a11y_next_month:I = 0x7f120f05
+.field public static final mtrl_picker_a11y_next_month:I = 0x7f120f13
-.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120f06
+.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120f14
-.field public static final mtrl_picker_announce_current_selection:I = 0x7f120f07
+.field public static final mtrl_picker_announce_current_selection:I = 0x7f120f15
-.field public static final mtrl_picker_cancel:I = 0x7f120f08
+.field public static final mtrl_picker_cancel:I = 0x7f120f16
-.field public static final mtrl_picker_confirm:I = 0x7f120f09
+.field public static final mtrl_picker_confirm:I = 0x7f120f17
-.field public static final mtrl_picker_date_header_selected:I = 0x7f120f0a
+.field public static final mtrl_picker_date_header_selected:I = 0x7f120f18
-.field public static final mtrl_picker_date_header_title:I = 0x7f120f0b
+.field public static final mtrl_picker_date_header_title:I = 0x7f120f19
-.field public static final mtrl_picker_date_header_unselected:I = 0x7f120f0c
+.field public static final mtrl_picker_date_header_unselected:I = 0x7f120f1a
-.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120f0d
+.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120f1b
-.field public static final mtrl_picker_invalid_format:I = 0x7f120f0e
+.field public static final mtrl_picker_invalid_format:I = 0x7f120f1c
-.field public static final mtrl_picker_invalid_format_example:I = 0x7f120f0f
+.field public static final mtrl_picker_invalid_format_example:I = 0x7f120f1d
-.field public static final mtrl_picker_invalid_format_use:I = 0x7f120f10
+.field public static final mtrl_picker_invalid_format_use:I = 0x7f120f1e
-.field public static final mtrl_picker_invalid_range:I = 0x7f120f11
+.field public static final mtrl_picker_invalid_range:I = 0x7f120f1f
-.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120f12
+.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120f20
-.field public static final mtrl_picker_out_of_range:I = 0x7f120f13
+.field public static final mtrl_picker_out_of_range:I = 0x7f120f21
-.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120f14
+.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120f22
-.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120f15
+.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120f23
-.field public static final mtrl_picker_range_header_selected:I = 0x7f120f16
+.field public static final mtrl_picker_range_header_selected:I = 0x7f120f24
-.field public static final mtrl_picker_range_header_title:I = 0x7f120f17
+.field public static final mtrl_picker_range_header_title:I = 0x7f120f25
-.field public static final mtrl_picker_range_header_unselected:I = 0x7f120f18
+.field public static final mtrl_picker_range_header_unselected:I = 0x7f120f26
-.field public static final mtrl_picker_save:I = 0x7f120f19
+.field public static final mtrl_picker_save:I = 0x7f120f27
-.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120f1a
+.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120f28
-.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120f1b
+.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120f29
-.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120f1c
+.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120f2a
-.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120f1d
+.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120f2b
-.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120f1e
+.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120f2c
-.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120f1f
+.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120f2d
-.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120f20
+.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120f2e
-.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120f21
+.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120f2f
-.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120f22
+.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120f30
-.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120f23
+.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120f31
-.field public static final mtrl_slider_range_content_description:I = 0x7f120f24
+.field public static final mtrl_slider_range_content_description:I = 0x7f120f32
-.field public static final not_set:I = 0x7f120fa7
+.field public static final not_set:I = 0x7f120fb5
-.field public static final password_toggle_content_description:I = 0x7f1210ca
+.field public static final password_toggle_content_description:I = 0x7f1210d8
-.field public static final path_password_eye:I = 0x7f1210cc
+.field public static final path_password_eye:I = 0x7f1210da
-.field public static final path_password_eye_mask_strike_through:I = 0x7f1210cd
+.field public static final path_password_eye_mask_strike_through:I = 0x7f1210db
-.field public static final path_password_eye_mask_visible:I = 0x7f1210ce
+.field public static final path_password_eye_mask_visible:I = 0x7f1210dc
-.field public static final path_password_strike_through:I = 0x7f1210cf
+.field public static final path_password_strike_through:I = 0x7f1210dd
-.field public static final preference_copied:I = 0x7f12113f
+.field public static final preference_copied:I = 0x7f12114d
-.field public static final search_menu_title:I = 0x7f121404
+.field public static final search_menu_title:I = 0x7f121412
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
-.field public static final summary_collapsed_preference_list:I = 0x7f12152a
+.field public static final summary_collapsed_preference_list:I = 0x7f121537
-.field public static final v7_preference_off:I = 0x7f121752
+.field public static final v7_preference_off:I = 0x7f12175f
-.field public static final v7_preference_on:I = 0x7f121753
+.field public static final v7_preference_on:I = 0x7f121760
# direct methods
diff --git a/com.discord/smali/com/discord/models/domain/ModelVoice$State.smali b/com.discord/smali/com/discord/models/domain/ModelVoice$State.smali
index 40c21c100e..a88be5d01b 100644
--- a/com.discord/smali/com/discord/models/domain/ModelVoice$State.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelVoice$State.smali
@@ -708,6 +708,32 @@
return-wide v0
.end method
+.method public hasVideo()Z
+ .locals 1
+
+ iget-boolean v0, p0, Lcom/discord/models/domain/ModelVoice$State;->selfStream:Z
+
+ if-nez v0, :cond_1
+
+ iget-boolean v0, p0, Lcom/discord/models/domain/ModelVoice$State;->selfVideo: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 hashCode()I
.locals 9
diff --git a/com.discord/smali/com/discord/overlay/R$c.smali b/com.discord/smali/com/discord/overlay/R$c.smali
index 6f0dfa1c90..892907a567 100644
--- a/com.discord/smali/com/discord/overlay/R$c.smali
+++ b/com.discord/smali/com/discord/overlay/R$c.smali
@@ -14,229 +14,229 @@
# static fields
-.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080031
+.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080032
-.field public static final abc_action_bar_item_background_material:I = 0x7f080032
+.field public static final abc_action_bar_item_background_material:I = 0x7f080033
-.field public static final abc_btn_borderless_material:I = 0x7f080033
+.field public static final abc_btn_borderless_material:I = 0x7f080034
-.field public static final abc_btn_check_material:I = 0x7f080034
+.field public static final abc_btn_check_material:I = 0x7f080035
-.field public static final abc_btn_check_material_anim:I = 0x7f080035
+.field public static final abc_btn_check_material_anim:I = 0x7f080036
-.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f080036
+.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f080037
-.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f080037
+.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f080038
-.field public static final abc_btn_colored_material:I = 0x7f080038
+.field public static final abc_btn_colored_material:I = 0x7f080039
-.field public static final abc_btn_default_mtrl_shape:I = 0x7f080039
+.field public static final abc_btn_default_mtrl_shape:I = 0x7f08003a
-.field public static final abc_btn_radio_material:I = 0x7f08003a
+.field public static final abc_btn_radio_material:I = 0x7f08003b
-.field public static final abc_btn_radio_material_anim:I = 0x7f08003b
+.field public static final abc_btn_radio_material_anim:I = 0x7f08003c
-.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08003c
+.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08003d
-.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f08003d
+.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f08003e
-.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f08003e
+.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f08003f
-.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f08003f
+.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080040
-.field public static final abc_cab_background_internal_bg:I = 0x7f080040
+.field public static final abc_cab_background_internal_bg:I = 0x7f080041
-.field public static final abc_cab_background_top_material:I = 0x7f080041
+.field public static final abc_cab_background_top_material:I = 0x7f080042
-.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080042
+.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080043
-.field public static final abc_control_background_material:I = 0x7f080043
+.field public static final abc_control_background_material:I = 0x7f080044
-.field public static final abc_dialog_material_background:I = 0x7f080044
+.field public static final abc_dialog_material_background:I = 0x7f080045
-.field public static final abc_edit_text_material:I = 0x7f080045
+.field public static final abc_edit_text_material:I = 0x7f080046
-.field public static final abc_ic_ab_back_material:I = 0x7f080046
+.field public static final abc_ic_ab_back_material:I = 0x7f080047
-.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f080047
+.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f080048
-.field public static final abc_ic_clear_material:I = 0x7f080048
+.field public static final abc_ic_clear_material:I = 0x7f080049
-.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f080049
+.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08004a
-.field public static final abc_ic_go_search_api_material:I = 0x7f08004a
+.field public static final abc_ic_go_search_api_material:I = 0x7f08004b
-.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08004b
+.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08004c
-.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08004c
+.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08004d
-.field public static final abc_ic_menu_overflow_material:I = 0x7f08004d
+.field public static final abc_ic_menu_overflow_material:I = 0x7f08004e
-.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f08004e
+.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f08004f
-.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f08004f
+.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080050
-.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080050
+.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080051
-.field public static final abc_ic_search_api_material:I = 0x7f080051
+.field public static final abc_ic_search_api_material:I = 0x7f080052
-.field public static final abc_ic_star_black_16dp:I = 0x7f080052
+.field public static final abc_ic_star_black_16dp:I = 0x7f080053
-.field public static final abc_ic_star_black_36dp:I = 0x7f080053
+.field public static final abc_ic_star_black_36dp:I = 0x7f080054
-.field public static final abc_ic_star_black_48dp:I = 0x7f080054
+.field public static final abc_ic_star_black_48dp:I = 0x7f080055
-.field public static final abc_ic_star_half_black_16dp:I = 0x7f080055
+.field public static final abc_ic_star_half_black_16dp:I = 0x7f080056
-.field public static final abc_ic_star_half_black_36dp:I = 0x7f080056
+.field public static final abc_ic_star_half_black_36dp:I = 0x7f080057
-.field public static final abc_ic_star_half_black_48dp:I = 0x7f080057
+.field public static final abc_ic_star_half_black_48dp:I = 0x7f080058
-.field public static final abc_ic_voice_search_api_material:I = 0x7f080058
+.field public static final abc_ic_voice_search_api_material:I = 0x7f080059
-.field public static final abc_item_background_holo_dark:I = 0x7f080059
+.field public static final abc_item_background_holo_dark:I = 0x7f08005a
-.field public static final abc_item_background_holo_light:I = 0x7f08005a
+.field public static final abc_item_background_holo_light:I = 0x7f08005b
-.field public static final abc_list_divider_material:I = 0x7f08005b
+.field public static final abc_list_divider_material:I = 0x7f08005c
-.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08005c
+.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08005d
-.field public static final abc_list_focused_holo:I = 0x7f08005d
+.field public static final abc_list_focused_holo:I = 0x7f08005e
-.field public static final abc_list_longpressed_holo:I = 0x7f08005e
+.field public static final abc_list_longpressed_holo:I = 0x7f08005f
-.field public static final abc_list_pressed_holo_dark:I = 0x7f08005f
+.field public static final abc_list_pressed_holo_dark:I = 0x7f080060
-.field public static final abc_list_pressed_holo_light:I = 0x7f080060
+.field public static final abc_list_pressed_holo_light:I = 0x7f080061
-.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080061
+.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080062
-.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080062
+.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080063
-.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080063
+.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080064
-.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080064
+.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080065
-.field public static final abc_list_selector_holo_dark:I = 0x7f080065
+.field public static final abc_list_selector_holo_dark:I = 0x7f080066
-.field public static final abc_list_selector_holo_light:I = 0x7f080066
+.field public static final abc_list_selector_holo_light:I = 0x7f080067
-.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f080067
+.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f080068
-.field public static final abc_popup_background_mtrl_mult:I = 0x7f080068
+.field public static final abc_popup_background_mtrl_mult:I = 0x7f080069
-.field public static final abc_ratingbar_indicator_material:I = 0x7f080069
+.field public static final abc_ratingbar_indicator_material:I = 0x7f08006a
-.field public static final abc_ratingbar_material:I = 0x7f08006a
+.field public static final abc_ratingbar_material:I = 0x7f08006b
-.field public static final abc_ratingbar_small_material:I = 0x7f08006b
+.field public static final abc_ratingbar_small_material:I = 0x7f08006c
-.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08006c
+.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08006d
-.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f08006d
+.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f08006e
-.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f08006e
+.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f08006f
-.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f08006f
+.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080070
-.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080070
+.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080071
-.field public static final abc_seekbar_thumb_material:I = 0x7f080071
+.field public static final abc_seekbar_thumb_material:I = 0x7f080072
-.field public static final abc_seekbar_tick_mark_material:I = 0x7f080072
+.field public static final abc_seekbar_tick_mark_material:I = 0x7f080073
-.field public static final abc_seekbar_track_material:I = 0x7f080073
+.field public static final abc_seekbar_track_material:I = 0x7f080074
-.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080074
+.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080075
-.field public static final abc_spinner_textfield_background_material:I = 0x7f080075
+.field public static final abc_spinner_textfield_background_material:I = 0x7f080076
-.field public static final abc_switch_thumb_material:I = 0x7f080076
+.field public static final abc_switch_thumb_material:I = 0x7f080077
-.field public static final abc_switch_track_mtrl_alpha:I = 0x7f080077
+.field public static final abc_switch_track_mtrl_alpha:I = 0x7f080078
-.field public static final abc_tab_indicator_material:I = 0x7f080078
+.field public static final abc_tab_indicator_material:I = 0x7f080079
-.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f080079
+.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08007a
-.field public static final abc_text_cursor_material:I = 0x7f08007a
+.field public static final abc_text_cursor_material:I = 0x7f08007b
-.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08007b
+.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08007c
-.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08007c
+.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08007d
-.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f08007d
+.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f08007e
-.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f08007e
+.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f08007f
-.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f08007f
+.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080080
-.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080080
+.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080081
-.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080081
+.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080082
-.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080082
+.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080083
-.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080083
+.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080084
-.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080084
+.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080085
-.field public static final abc_textfield_search_material:I = 0x7f080085
+.field public static final abc_textfield_search_material:I = 0x7f080086
-.field public static final abc_vector_test:I = 0x7f080086
+.field public static final abc_vector_test:I = 0x7f080087
-.field public static final btn_checkbox_checked_mtrl:I = 0x7f0800c0
+.field public static final btn_checkbox_checked_mtrl:I = 0x7f0800c1
-.field public static final btn_checkbox_checked_to_unchecked_mtrl_animation:I = 0x7f0800c1
+.field public static final btn_checkbox_checked_to_unchecked_mtrl_animation:I = 0x7f0800c2
-.field public static final btn_checkbox_unchecked_mtrl:I = 0x7f0800c2
+.field public static final btn_checkbox_unchecked_mtrl:I = 0x7f0800c3
-.field public static final btn_checkbox_unchecked_to_checked_mtrl_animation:I = 0x7f0800c3
+.field public static final btn_checkbox_unchecked_to_checked_mtrl_animation:I = 0x7f0800c4
-.field public static final btn_radio_off_mtrl:I = 0x7f0800c4
+.field public static final btn_radio_off_mtrl:I = 0x7f0800c5
-.field public static final btn_radio_off_to_on_mtrl_animation:I = 0x7f0800c5
+.field public static final btn_radio_off_to_on_mtrl_animation:I = 0x7f0800c6
-.field public static final btn_radio_on_mtrl:I = 0x7f0800c6
+.field public static final btn_radio_on_mtrl:I = 0x7f0800c7
-.field public static final btn_radio_on_to_off_mtrl_animation:I = 0x7f0800c7
+.field public static final btn_radio_on_to_off_mtrl_animation:I = 0x7f0800c8
-.field public static final bubble_state_selector:I = 0x7f0800c8
+.field public static final bubble_state_selector:I = 0x7f0800c9
-.field public static final ic_close_24dp:I = 0x7f080287
+.field public static final ic_close_24dp:I = 0x7f080288
-.field public static final ic_trash_outline:I = 0x7f080409
+.field public static final ic_trash_outline:I = 0x7f08040a
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
-.field public static final tooltip_frame_dark:I = 0x7f08051f
+.field public static final tooltip_frame_dark:I = 0x7f080520
-.field public static final tooltip_frame_light:I = 0x7f080520
+.field public static final tooltip_frame_light:I = 0x7f080521
-.field public static final trash_bg:I = 0x7f080521
+.field public static final trash_bg:I = 0x7f080522
# direct methods
diff --git a/com.discord/smali/com/discord/overlay/R$d.smali b/com.discord/smali/com/discord/overlay/R$d.smali
index 64189bbc77..7d8d7fd898 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 = 0x7f0a0125
-.field public static final checkbox:I = 0x7f0a0260
+.field public static final checkbox:I = 0x7f0a0262
-.field public static final checked:I = 0x7f0a0262
+.field public static final checked:I = 0x7f0a0264
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final content:I = 0x7f0a028a
+.field public static final content:I = 0x7f0a028c
-.field public static final contentPanel:I = 0x7f0a028b
+.field public static final contentPanel:I = 0x7f0a028d
-.field public static final custom:I = 0x7f0a02b5
+.field public static final custom:I = 0x7f0a02b7
-.field public static final customPanel:I = 0x7f0a02b6
+.field public static final customPanel:I = 0x7f0a02b8
-.field public static final decor_content_parent:I = 0x7f0a02be
+.field public static final decor_content_parent:I = 0x7f0a02c0
-.field public static final default_activity_button:I = 0x7f0a02bf
+.field public static final default_activity_button:I = 0x7f0a02c1
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02cf
-.field public static final edit_query:I = 0x7f0a031e
+.field public static final edit_query:I = 0x7f0a0320
-.field public static final expand_activities_button:I = 0x7f0a0368
+.field public static final expand_activities_button:I = 0x7f0a036a
-.field public static final expanded_menu:I = 0x7f0a0369
+.field public static final expanded_menu:I = 0x7f0a036b
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final group_divider:I = 0x7f0a0412
+.field public static final group_divider:I = 0x7f0a0414
-.field public static final home:I = 0x7f0a04c1
+.field public static final home:I = 0x7f0a04c3
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final image:I = 0x7f0a04e0
+.field public static final image:I = 0x7f0a04e2
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final listMode:I = 0x7f0a058a
+.field public static final listMode:I = 0x7f0a058c
-.field public static final list_item:I = 0x7f0a058b
+.field public static final list_item:I = 0x7f0a058d
-.field public static final message:I = 0x7f0a05de
+.field public static final message:I = 0x7f0a05dc
-.field public static final multiply:I = 0x7f0a0600
+.field public static final multiply:I = 0x7f0a05fe
-.field public static final none:I = 0x7f0a0627
+.field public static final none:I = 0x7f0a0625
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final off:I = 0x7f0a0668
+.field public static final off:I = 0x7f0a0666
-.field public static final on:I = 0x7f0a066c
+.field public static final on:I = 0x7f0a066a
-.field public static final parentPanel:I = 0x7f0a0681
+.field public static final parentPanel:I = 0x7f0a067f
-.field public static final progress_circular:I = 0x7f0a072c
+.field public static final progress_circular:I = 0x7f0a072a
-.field public static final progress_horizontal:I = 0x7f0a072f
+.field public static final progress_horizontal:I = 0x7f0a072d
-.field public static final radio:I = 0x7f0a073d
+.field public static final radio:I = 0x7f0a073b
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final screen:I = 0x7f0a0791
+.field public static final screen:I = 0x7f0a078f
-.field public static final scrollIndicatorDown:I = 0x7f0a0795
+.field public static final scrollIndicatorDown:I = 0x7f0a0793
-.field public static final scrollIndicatorUp:I = 0x7f0a0796
+.field public static final scrollIndicatorUp:I = 0x7f0a0794
-.field public static final scrollView:I = 0x7f0a0797
+.field public static final scrollView:I = 0x7f0a0795
-.field public static final search_badge:I = 0x7f0a079a
+.field public static final search_badge:I = 0x7f0a0798
-.field public static final search_bar:I = 0x7f0a079b
+.field public static final search_bar:I = 0x7f0a0799
-.field public static final search_button:I = 0x7f0a079c
+.field public static final search_button:I = 0x7f0a079a
-.field public static final search_close_btn:I = 0x7f0a079d
+.field public static final search_close_btn:I = 0x7f0a079b
-.field public static final search_edit_frame:I = 0x7f0a079e
+.field public static final search_edit_frame:I = 0x7f0a079c
-.field public static final search_go_btn:I = 0x7f0a07a0
+.field public static final search_go_btn:I = 0x7f0a079e
-.field public static final search_mag_icon:I = 0x7f0a07a1
+.field public static final search_mag_icon:I = 0x7f0a079f
-.field public static final search_plate:I = 0x7f0a07a2
+.field public static final search_plate:I = 0x7f0a07a0
-.field public static final search_src_text:I = 0x7f0a07a5
+.field public static final search_src_text:I = 0x7f0a07a3
-.field public static final search_voice_btn:I = 0x7f0a07b1
+.field public static final search_voice_btn:I = 0x7f0a07af
-.field public static final select_dialog_listview:I = 0x7f0a07b4
+.field public static final select_dialog_listview:I = 0x7f0a07b2
-.field public static final shortcut:I = 0x7f0a0914
+.field public static final shortcut:I = 0x7f0a0912
-.field public static final spacer:I = 0x7f0a0923
+.field public static final spacer:I = 0x7f0a0921
-.field public static final split_action_bar:I = 0x7f0a0927
+.field public static final split_action_bar:I = 0x7f0a0925
-.field public static final src_atop:I = 0x7f0a092b
+.field public static final src_atop:I = 0x7f0a0929
-.field public static final src_in:I = 0x7f0a092c
+.field public static final src_in:I = 0x7f0a092a
-.field public static final src_over:I = 0x7f0a092d
+.field public static final src_over:I = 0x7f0a092b
-.field public static final submenuarrow:I = 0x7f0a094a
+.field public static final submenuarrow:I = 0x7f0a0948
-.field public static final submit_area:I = 0x7f0a094b
+.field public static final submit_area:I = 0x7f0a0949
-.field public static final tabMode:I = 0x7f0a095b
+.field public static final tabMode:I = 0x7f0a0959
-.field public static final tag_accessibility_actions:I = 0x7f0a0969
+.field public static final tag_accessibility_actions:I = 0x7f0a0967
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096a
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0968
-.field public static final tag_accessibility_heading:I = 0x7f0a096b
+.field public static final tag_accessibility_heading:I = 0x7f0a0969
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096c
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096a
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096d
+.field public static final tag_screen_reader_focusable:I = 0x7f0a096b
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final textSpacerNoButtons:I = 0x7f0a097f
+.field public static final textSpacerNoButtons:I = 0x7f0a097d
-.field public static final textSpacerNoTitle:I = 0x7f0a0980
+.field public static final textSpacerNoTitle:I = 0x7f0a097e
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
-.field public static final titleDividerNoCustom:I = 0x7f0a0993
+.field public static final titleDividerNoCustom:I = 0x7f0a0991
-.field public static final title_template:I = 0x7f0a0994
+.field public static final title_template:I = 0x7f0a0992
-.field public static final topPanel:I = 0x7f0a099b
+.field public static final topPanel:I = 0x7f0a0999
-.field public static final trash_wrap_icon:I = 0x7f0a09a7
+.field public static final trash_wrap_icon:I = 0x7f0a09a5
-.field public static final trash_wrap_target_container:I = 0x7f0a09a8
+.field public static final trash_wrap_target_container:I = 0x7f0a09a6
-.field public static final trash_wrap_target_zone:I = 0x7f0a09a9
+.field public static final trash_wrap_target_zone:I = 0x7f0a09a7
-.field public static final unchecked:I = 0x7f0a09b1
+.field public static final unchecked:I = 0x7f0a09af
-.field public static final uniform:I = 0x7f0a09b4
+.field public static final uniform:I = 0x7f0a09b2
-.field public static final up:I = 0x7f0a09b6
+.field public static final up:I = 0x7f0a09b4
-.field public static final wrap_content:I = 0x7f0a0ab6
+.field public static final wrap_content:I = 0x7f0a0ab9
# direct methods
diff --git a/com.discord/smali/com/discord/restapi/R$drawable.smali b/com.discord/smali/com/discord/restapi/R$drawable.smali
index 77b4cf8eb1..9b9e0e8175 100644
--- a/com.discord/smali/com/discord/restapi/R$drawable.smali
+++ b/com.discord/smali/com/discord/restapi/R$drawable.smali
@@ -14,333 +14,333 @@
# static fields
-.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080031
+.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080032
-.field public static final abc_action_bar_item_background_material:I = 0x7f080032
+.field public static final abc_action_bar_item_background_material:I = 0x7f080033
-.field public static final abc_btn_borderless_material:I = 0x7f080033
+.field public static final abc_btn_borderless_material:I = 0x7f080034
-.field public static final abc_btn_check_material:I = 0x7f080034
+.field public static final abc_btn_check_material:I = 0x7f080035
-.field public static final abc_btn_check_material_anim:I = 0x7f080035
+.field public static final abc_btn_check_material_anim:I = 0x7f080036
-.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f080036
+.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f080037
-.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f080037
+.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f080038
-.field public static final abc_btn_colored_material:I = 0x7f080038
+.field public static final abc_btn_colored_material:I = 0x7f080039
-.field public static final abc_btn_default_mtrl_shape:I = 0x7f080039
+.field public static final abc_btn_default_mtrl_shape:I = 0x7f08003a
-.field public static final abc_btn_radio_material:I = 0x7f08003a
+.field public static final abc_btn_radio_material:I = 0x7f08003b
-.field public static final abc_btn_radio_material_anim:I = 0x7f08003b
+.field public static final abc_btn_radio_material_anim:I = 0x7f08003c
-.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08003c
+.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08003d
-.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f08003d
+.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f08003e
-.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f08003e
+.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f08003f
-.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f08003f
+.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080040
-.field public static final abc_cab_background_internal_bg:I = 0x7f080040
+.field public static final abc_cab_background_internal_bg:I = 0x7f080041
-.field public static final abc_cab_background_top_material:I = 0x7f080041
+.field public static final abc_cab_background_top_material:I = 0x7f080042
-.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080042
+.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080043
-.field public static final abc_control_background_material:I = 0x7f080043
+.field public static final abc_control_background_material:I = 0x7f080044
-.field public static final abc_dialog_material_background:I = 0x7f080044
+.field public static final abc_dialog_material_background:I = 0x7f080045
-.field public static final abc_edit_text_material:I = 0x7f080045
+.field public static final abc_edit_text_material:I = 0x7f080046
-.field public static final abc_ic_ab_back_material:I = 0x7f080046
+.field public static final abc_ic_ab_back_material:I = 0x7f080047
-.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f080047
+.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f080048
-.field public static final abc_ic_clear_material:I = 0x7f080048
+.field public static final abc_ic_clear_material:I = 0x7f080049
-.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f080049
+.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08004a
-.field public static final abc_ic_go_search_api_material:I = 0x7f08004a
+.field public static final abc_ic_go_search_api_material:I = 0x7f08004b
-.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08004b
+.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08004c
-.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08004c
+.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08004d
-.field public static final abc_ic_menu_overflow_material:I = 0x7f08004d
+.field public static final abc_ic_menu_overflow_material:I = 0x7f08004e
-.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f08004e
+.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f08004f
-.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f08004f
+.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080050
-.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080050
+.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080051
-.field public static final abc_ic_search_api_material:I = 0x7f080051
+.field public static final abc_ic_search_api_material:I = 0x7f080052
-.field public static final abc_ic_star_black_16dp:I = 0x7f080052
+.field public static final abc_ic_star_black_16dp:I = 0x7f080053
-.field public static final abc_ic_star_black_36dp:I = 0x7f080053
+.field public static final abc_ic_star_black_36dp:I = 0x7f080054
-.field public static final abc_ic_star_black_48dp:I = 0x7f080054
+.field public static final abc_ic_star_black_48dp:I = 0x7f080055
-.field public static final abc_ic_star_half_black_16dp:I = 0x7f080055
+.field public static final abc_ic_star_half_black_16dp:I = 0x7f080056
-.field public static final abc_ic_star_half_black_36dp:I = 0x7f080056
+.field public static final abc_ic_star_half_black_36dp:I = 0x7f080057
-.field public static final abc_ic_star_half_black_48dp:I = 0x7f080057
+.field public static final abc_ic_star_half_black_48dp:I = 0x7f080058
-.field public static final abc_ic_voice_search_api_material:I = 0x7f080058
+.field public static final abc_ic_voice_search_api_material:I = 0x7f080059
-.field public static final abc_item_background_holo_dark:I = 0x7f080059
+.field public static final abc_item_background_holo_dark:I = 0x7f08005a
-.field public static final abc_item_background_holo_light:I = 0x7f08005a
+.field public static final abc_item_background_holo_light:I = 0x7f08005b
-.field public static final abc_list_divider_material:I = 0x7f08005b
+.field public static final abc_list_divider_material:I = 0x7f08005c
-.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08005c
+.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08005d
-.field public static final abc_list_focused_holo:I = 0x7f08005d
+.field public static final abc_list_focused_holo:I = 0x7f08005e
-.field public static final abc_list_longpressed_holo:I = 0x7f08005e
+.field public static final abc_list_longpressed_holo:I = 0x7f08005f
-.field public static final abc_list_pressed_holo_dark:I = 0x7f08005f
+.field public static final abc_list_pressed_holo_dark:I = 0x7f080060
-.field public static final abc_list_pressed_holo_light:I = 0x7f080060
+.field public static final abc_list_pressed_holo_light:I = 0x7f080061
-.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080061
+.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080062
-.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080062
+.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080063
-.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080063
+.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080064
-.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080064
+.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080065
-.field public static final abc_list_selector_holo_dark:I = 0x7f080065
+.field public static final abc_list_selector_holo_dark:I = 0x7f080066
-.field public static final abc_list_selector_holo_light:I = 0x7f080066
+.field public static final abc_list_selector_holo_light:I = 0x7f080067
-.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f080067
+.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f080068
-.field public static final abc_popup_background_mtrl_mult:I = 0x7f080068
+.field public static final abc_popup_background_mtrl_mult:I = 0x7f080069
-.field public static final abc_ratingbar_indicator_material:I = 0x7f080069
+.field public static final abc_ratingbar_indicator_material:I = 0x7f08006a
-.field public static final abc_ratingbar_material:I = 0x7f08006a
+.field public static final abc_ratingbar_material:I = 0x7f08006b
-.field public static final abc_ratingbar_small_material:I = 0x7f08006b
+.field public static final abc_ratingbar_small_material:I = 0x7f08006c
-.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08006c
+.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08006d
-.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f08006d
+.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f08006e
-.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f08006e
+.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f08006f
-.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f08006f
+.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080070
-.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080070
+.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080071
-.field public static final abc_seekbar_thumb_material:I = 0x7f080071
+.field public static final abc_seekbar_thumb_material:I = 0x7f080072
-.field public static final abc_seekbar_tick_mark_material:I = 0x7f080072
+.field public static final abc_seekbar_tick_mark_material:I = 0x7f080073
-.field public static final abc_seekbar_track_material:I = 0x7f080073
+.field public static final abc_seekbar_track_material:I = 0x7f080074
-.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080074
+.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080075
-.field public static final abc_spinner_textfield_background_material:I = 0x7f080075
+.field public static final abc_spinner_textfield_background_material:I = 0x7f080076
-.field public static final abc_switch_thumb_material:I = 0x7f080076
+.field public static final abc_switch_thumb_material:I = 0x7f080077
-.field public static final abc_switch_track_mtrl_alpha:I = 0x7f080077
+.field public static final abc_switch_track_mtrl_alpha:I = 0x7f080078
-.field public static final abc_tab_indicator_material:I = 0x7f080078
+.field public static final abc_tab_indicator_material:I = 0x7f080079
-.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f080079
+.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08007a
-.field public static final abc_text_cursor_material:I = 0x7f08007a
+.field public static final abc_text_cursor_material:I = 0x7f08007b
-.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08007b
+.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08007c
-.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08007c
+.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08007d
-.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f08007d
+.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f08007e
-.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f08007e
+.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f08007f
-.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f08007f
+.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080080
-.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080080
+.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080081
-.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080081
+.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080082
-.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080082
+.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080083
-.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080083
+.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080084
-.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080084
+.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080085
-.field public static final abc_textfield_search_material:I = 0x7f080085
+.field public static final abc_textfield_search_material:I = 0x7f080086
-.field public static final abc_vector_test:I = 0x7f080086
+.field public static final abc_vector_test:I = 0x7f080087
-.field public static final avd_hide_password:I = 0x7f0800a4
+.field public static final avd_hide_password:I = 0x7f0800a5
-.field public static final avd_show_password:I = 0x7f0800a5
+.field public static final avd_show_password:I = 0x7f0800a6
-.field public static final btn_checkbox_checked_mtrl:I = 0x7f0800c0
+.field public static final btn_checkbox_checked_mtrl:I = 0x7f0800c1
-.field public static final btn_checkbox_checked_to_unchecked_mtrl_animation:I = 0x7f0800c1
+.field public static final btn_checkbox_checked_to_unchecked_mtrl_animation:I = 0x7f0800c2
-.field public static final btn_checkbox_unchecked_mtrl:I = 0x7f0800c2
+.field public static final btn_checkbox_unchecked_mtrl:I = 0x7f0800c3
-.field public static final btn_checkbox_unchecked_to_checked_mtrl_animation:I = 0x7f0800c3
+.field public static final btn_checkbox_unchecked_to_checked_mtrl_animation:I = 0x7f0800c4
-.field public static final btn_radio_off_mtrl:I = 0x7f0800c4
+.field public static final btn_radio_off_mtrl:I = 0x7f0800c5
-.field public static final btn_radio_off_to_on_mtrl_animation:I = 0x7f0800c5
+.field public static final btn_radio_off_to_on_mtrl_animation:I = 0x7f0800c6
-.field public static final btn_radio_on_mtrl:I = 0x7f0800c6
+.field public static final btn_radio_on_mtrl:I = 0x7f0800c7
-.field public static final btn_radio_on_to_off_mtrl_animation:I = 0x7f0800c7
+.field public static final btn_radio_on_to_off_mtrl_animation:I = 0x7f0800c8
-.field public static final common_full_open_on_phone:I = 0x7f0800d2
+.field public static final common_full_open_on_phone:I = 0x7f0800d3
-.field public static final common_google_signin_btn_icon_dark:I = 0x7f0800d3
+.field public static final common_google_signin_btn_icon_dark:I = 0x7f0800d4
-.field public static final common_google_signin_btn_icon_dark_focused:I = 0x7f0800d4
+.field public static final common_google_signin_btn_icon_dark_focused:I = 0x7f0800d5
-.field public static final common_google_signin_btn_icon_dark_normal:I = 0x7f0800d5
+.field public static final common_google_signin_btn_icon_dark_normal:I = 0x7f0800d6
-.field public static final common_google_signin_btn_icon_dark_normal_background:I = 0x7f0800d6
+.field public static final common_google_signin_btn_icon_dark_normal_background:I = 0x7f0800d7
-.field public static final common_google_signin_btn_icon_disabled:I = 0x7f0800d7
+.field public static final common_google_signin_btn_icon_disabled:I = 0x7f0800d8
-.field public static final common_google_signin_btn_icon_light:I = 0x7f0800d8
+.field public static final common_google_signin_btn_icon_light:I = 0x7f0800d9
-.field public static final common_google_signin_btn_icon_light_focused:I = 0x7f0800d9
+.field public static final common_google_signin_btn_icon_light_focused:I = 0x7f0800da
-.field public static final common_google_signin_btn_icon_light_normal:I = 0x7f0800da
+.field public static final common_google_signin_btn_icon_light_normal:I = 0x7f0800db
-.field public static final common_google_signin_btn_icon_light_normal_background:I = 0x7f0800db
+.field public static final common_google_signin_btn_icon_light_normal_background:I = 0x7f0800dc
-.field public static final common_google_signin_btn_text_dark:I = 0x7f0800dc
+.field public static final common_google_signin_btn_text_dark:I = 0x7f0800dd
-.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f0800dd
+.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f0800de
-.field public static final common_google_signin_btn_text_dark_normal:I = 0x7f0800de
+.field public static final common_google_signin_btn_text_dark_normal:I = 0x7f0800df
-.field public static final common_google_signin_btn_text_dark_normal_background:I = 0x7f0800df
+.field public static final common_google_signin_btn_text_dark_normal_background:I = 0x7f0800e0
-.field public static final common_google_signin_btn_text_disabled:I = 0x7f0800e0
+.field public static final common_google_signin_btn_text_disabled:I = 0x7f0800e1
-.field public static final common_google_signin_btn_text_light:I = 0x7f0800e1
+.field public static final common_google_signin_btn_text_light:I = 0x7f0800e2
-.field public static final common_google_signin_btn_text_light_focused:I = 0x7f0800e2
+.field public static final common_google_signin_btn_text_light_focused:I = 0x7f0800e3
-.field public static final common_google_signin_btn_text_light_normal:I = 0x7f0800e3
+.field public static final common_google_signin_btn_text_light_normal:I = 0x7f0800e4
-.field public static final common_google_signin_btn_text_light_normal_background:I = 0x7f0800e4
+.field public static final common_google_signin_btn_text_light_normal_background:I = 0x7f0800e5
-.field public static final design_bottom_navigation_item_background:I = 0x7f0800ea
+.field public static final design_bottom_navigation_item_background:I = 0x7f0800eb
-.field public static final design_fab_background:I = 0x7f0800eb
+.field public static final design_fab_background:I = 0x7f0800ec
-.field public static final design_ic_visibility:I = 0x7f0800ec
+.field public static final design_ic_visibility:I = 0x7f0800ed
-.field public static final design_ic_visibility_off:I = 0x7f0800ed
+.field public static final design_ic_visibility_off:I = 0x7f0800ee
-.field public static final design_password_eye:I = 0x7f0800ee
+.field public static final design_password_eye:I = 0x7f0800ef
-.field public static final design_snackbar_background:I = 0x7f0800ef
+.field public static final design_snackbar_background:I = 0x7f0800f0
-.field public static final drawable_chip_background:I = 0x7f08012a
+.field public static final drawable_chip_background:I = 0x7f08012b
-.field public static final drawable_chip_circle:I = 0x7f08012b
+.field public static final drawable_chip_circle:I = 0x7f08012c
-.field public static final drawable_chip_delete:I = 0x7f08012c
+.field public static final drawable_chip_delete:I = 0x7f08012d
-.field public static final googleg_disabled_color_18:I = 0x7f0801f8
+.field public static final googleg_disabled_color_18:I = 0x7f0801f9
-.field public static final googleg_standard_color_18:I = 0x7f0801f9
+.field public static final googleg_standard_color_18:I = 0x7f0801fa
-.field public static final ic_arrow_down_24dp:I = 0x7f080221
+.field public static final ic_arrow_down_24dp:I = 0x7f080222
-.field public static final ic_mtrl_checked_circle:I = 0x7f080353
+.field public static final ic_mtrl_checked_circle:I = 0x7f080354
-.field public static final ic_mtrl_chip_checked_black:I = 0x7f080354
+.field public static final ic_mtrl_chip_checked_black:I = 0x7f080355
-.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080355
+.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080356
-.field public static final ic_mtrl_chip_close_circle:I = 0x7f080356
+.field public static final ic_mtrl_chip_close_circle:I = 0x7f080357
-.field public static final material_ic_calendar_black_24dp:I = 0x7f0804ef
+.field public static final material_ic_calendar_black_24dp:I = 0x7f0804f0
-.field public static final material_ic_clear_black_24dp:I = 0x7f0804f0
+.field public static final material_ic_clear_black_24dp:I = 0x7f0804f1
-.field public static final material_ic_edit_black_24dp:I = 0x7f0804f1
+.field public static final material_ic_edit_black_24dp:I = 0x7f0804f2
-.field public static final material_ic_keyboard_arrow_left_black_24dp:I = 0x7f0804f2
+.field public static final material_ic_keyboard_arrow_left_black_24dp:I = 0x7f0804f3
-.field public static final material_ic_keyboard_arrow_right_black_24dp:I = 0x7f0804f3
+.field public static final material_ic_keyboard_arrow_right_black_24dp:I = 0x7f0804f4
-.field public static final material_ic_menu_arrow_down_black_24dp:I = 0x7f0804f4
+.field public static final material_ic_menu_arrow_down_black_24dp:I = 0x7f0804f5
-.field public static final material_ic_menu_arrow_up_black_24dp:I = 0x7f0804f5
+.field public static final material_ic_menu_arrow_up_black_24dp:I = 0x7f0804f6
-.field public static final mtrl_dialog_background:I = 0x7f0804f6
+.field public static final mtrl_dialog_background:I = 0x7f0804f7
-.field public static final mtrl_dropdown_arrow:I = 0x7f0804f7
+.field public static final mtrl_dropdown_arrow:I = 0x7f0804f8
-.field public static final mtrl_ic_arrow_drop_down:I = 0x7f0804f8
+.field public static final mtrl_ic_arrow_drop_down:I = 0x7f0804f9
-.field public static final mtrl_ic_arrow_drop_up:I = 0x7f0804f9
+.field public static final mtrl_ic_arrow_drop_up:I = 0x7f0804fa
-.field public static final mtrl_ic_cancel:I = 0x7f0804fa
+.field public static final mtrl_ic_cancel:I = 0x7f0804fb
-.field public static final mtrl_ic_error:I = 0x7f0804fb
+.field public static final mtrl_ic_error:I = 0x7f0804fc
-.field public static final mtrl_popupmenu_background:I = 0x7f0804fc
+.field public static final mtrl_popupmenu_background:I = 0x7f0804fd
-.field public static final mtrl_popupmenu_background_dark:I = 0x7f0804fd
+.field public static final mtrl_popupmenu_background_dark:I = 0x7f0804fe
-.field public static final mtrl_tabs_default_indicator:I = 0x7f0804fe
+.field public static final mtrl_tabs_default_indicator:I = 0x7f0804ff
-.field public static final navigation_empty_icon:I = 0x7f0804ff
+.field public static final navigation_empty_icon:I = 0x7f080500
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
-.field public static final preference_list_divider_material:I = 0x7f08050c
+.field public static final preference_list_divider_material:I = 0x7f08050d
-.field public static final test_custom_background:I = 0x7f08051e
+.field public static final test_custom_background:I = 0x7f08051f
-.field public static final tooltip_frame_dark:I = 0x7f08051f
+.field public static final tooltip_frame_dark:I = 0x7f080520
-.field public static final tooltip_frame_light:I = 0x7f080520
+.field public static final tooltip_frame_light:I = 0x7f080521
# direct methods
diff --git a/com.discord/smali/com/discord/restapi/R$id.smali b/com.discord/smali/com/discord/restapi/R$id.smali
index f8dec330a5..84f484ced5 100644
--- a/com.discord/smali/com/discord/restapi/R$id.smali
+++ b/com.discord/smali/com/discord/restapi/R$id.smali
@@ -150,471 +150,471 @@
.field public static final buttonPanel:I = 0x7f0a0125
-.field public static final cancel_action:I = 0x7f0a013a
+.field public static final cancel_action:I = 0x7f0a013c
-.field public static final cancel_button:I = 0x7f0a013b
+.field public static final cancel_button:I = 0x7f0a013d
-.field public static final center:I = 0x7f0a013f
+.field public static final center:I = 0x7f0a0141
-.field public static final centerCrop:I = 0x7f0a0140
+.field public static final centerCrop:I = 0x7f0a0142
-.field public static final centerInside:I = 0x7f0a0141
+.field public static final centerInside:I = 0x7f0a0143
-.field public static final checkbox:I = 0x7f0a0260
+.field public static final checkbox:I = 0x7f0a0262
-.field public static final checked:I = 0x7f0a0262
+.field public static final checked:I = 0x7f0a0264
-.field public static final chip:I = 0x7f0a0263
+.field public static final chip:I = 0x7f0a0265
-.field public static final chip1:I = 0x7f0a0264
+.field public static final chip1:I = 0x7f0a0266
-.field public static final chip2:I = 0x7f0a0265
+.field public static final chip2:I = 0x7f0a0267
-.field public static final chip3:I = 0x7f0a0266
+.field public static final chip3:I = 0x7f0a0268
-.field public static final chip_group:I = 0x7f0a0267
+.field public static final chip_group:I = 0x7f0a0269
-.field public static final chip_image:I = 0x7f0a0268
+.field public static final chip_image:I = 0x7f0a026a
-.field public static final chip_text:I = 0x7f0a0269
+.field public static final chip_text:I = 0x7f0a026b
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final circular:I = 0x7f0a026c
+.field public static final circular:I = 0x7f0a026e
-.field public static final clear_text:I = 0x7f0a026d
+.field public static final clear_text:I = 0x7f0a026f
-.field public static final column:I = 0x7f0a0276
+.field public static final column:I = 0x7f0a0278
-.field public static final column_reverse:I = 0x7f0a0277
+.field public static final column_reverse:I = 0x7f0a0279
-.field public static final confirm_button:I = 0x7f0a0278
+.field public static final confirm_button:I = 0x7f0a027a
-.field public static final container:I = 0x7f0a0289
+.field public static final container:I = 0x7f0a028b
-.field public static final content:I = 0x7f0a028a
+.field public static final content:I = 0x7f0a028c
-.field public static final contentPanel:I = 0x7f0a028b
+.field public static final contentPanel:I = 0x7f0a028d
-.field public static final coordinator:I = 0x7f0a028f
+.field public static final coordinator:I = 0x7f0a0291
-.field public static final custom:I = 0x7f0a02b5
+.field public static final custom:I = 0x7f0a02b7
-.field public static final customPanel:I = 0x7f0a02b6
+.field public static final customPanel:I = 0x7f0a02b8
-.field public static final cut:I = 0x7f0a02b7
+.field public static final cut:I = 0x7f0a02b9
-.field public static final dark:I = 0x7f0a02b8
+.field public static final dark:I = 0x7f0a02ba
-.field public static final date_picker_actions:I = 0x7f0a02ba
+.field public static final date_picker_actions:I = 0x7f0a02bc
-.field public static final decor_content_parent:I = 0x7f0a02be
+.field public static final decor_content_parent:I = 0x7f0a02c0
-.field public static final default_activity_button:I = 0x7f0a02bf
+.field public static final default_activity_button:I = 0x7f0a02c1
-.field public static final design_bottom_sheet:I = 0x7f0a02c3
+.field public static final design_bottom_sheet:I = 0x7f0a02c5
-.field public static final design_menu_item_action_area:I = 0x7f0a02c4
+.field public static final design_menu_item_action_area:I = 0x7f0a02c6
-.field public static final design_menu_item_action_area_stub:I = 0x7f0a02c5
+.field public static final design_menu_item_action_area_stub:I = 0x7f0a02c7
-.field public static final design_menu_item_text:I = 0x7f0a02c6
+.field public static final design_menu_item_text:I = 0x7f0a02c8
-.field public static final design_navigation_view:I = 0x7f0a02c7
+.field public static final design_navigation_view:I = 0x7f0a02c9
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02cf
-.field public static final dropdown_menu:I = 0x7f0a02f9
+.field public static final dropdown_menu:I = 0x7f0a02fb
-.field public static final edit_query:I = 0x7f0a031e
+.field public static final edit_query:I = 0x7f0a0320
-.field public static final end:I = 0x7f0a034b
+.field public static final end:I = 0x7f0a034d
-.field public static final end_padder:I = 0x7f0a034c
+.field public static final end_padder:I = 0x7f0a034e
-.field public static final expand_activities_button:I = 0x7f0a0368
+.field public static final expand_activities_button:I = 0x7f0a036a
-.field public static final expanded_menu:I = 0x7f0a0369
+.field public static final expanded_menu:I = 0x7f0a036b
-.field public static final fade:I = 0x7f0a0387
+.field public static final fade:I = 0x7f0a0389
-.field public static final fill:I = 0x7f0a039e
+.field public static final fill:I = 0x7f0a03a0
-.field public static final filled:I = 0x7f0a03a1
+.field public static final filled:I = 0x7f0a03a3
-.field public static final fitBottomStart:I = 0x7f0a03a5
+.field public static final fitBottomStart:I = 0x7f0a03a7
-.field public static final fitCenter:I = 0x7f0a03a6
+.field public static final fitCenter:I = 0x7f0a03a8
-.field public static final fitEnd:I = 0x7f0a03a7
+.field public static final fitEnd:I = 0x7f0a03a9
-.field public static final fitStart:I = 0x7f0a03a8
+.field public static final fitStart:I = 0x7f0a03aa
-.field public static final fitXY:I = 0x7f0a03aa
+.field public static final fitXY:I = 0x7f0a03ac
-.field public static final fixed:I = 0x7f0a03ab
+.field public static final fixed:I = 0x7f0a03ad
-.field public static final flex_end:I = 0x7f0a03ae
+.field public static final flex_end:I = 0x7f0a03b0
-.field public static final flex_start:I = 0x7f0a03bf
+.field public static final flex_start:I = 0x7f0a03c1
-.field public static final floating:I = 0x7f0a03c0
+.field public static final floating:I = 0x7f0a03c2
-.field public static final focusCrop:I = 0x7f0a03c2
+.field public static final focusCrop:I = 0x7f0a03c4
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final fragment_container_view_tag:I = 0x7f0a03c8
+.field public static final fragment_container_view_tag:I = 0x7f0a03ca
-.field public static final ghost_view:I = 0x7f0a03e3
+.field public static final ghost_view:I = 0x7f0a03e5
-.field public static final ghost_view_holder:I = 0x7f0a03e4
+.field public static final ghost_view_holder:I = 0x7f0a03e6
-.field public static final gone:I = 0x7f0a0410
+.field public static final gone:I = 0x7f0a0412
-.field public static final group_divider:I = 0x7f0a0412
+.field public static final group_divider:I = 0x7f0a0414
-.field public static final home:I = 0x7f0a04c1
+.field public static final home:I = 0x7f0a04c3
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_frame:I = 0x7f0a04d5
+.field public static final icon_frame:I = 0x7f0a04d7
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final icon_only:I = 0x7f0a04d7
+.field public static final icon_only:I = 0x7f0a04d9
-.field public static final image:I = 0x7f0a04e0
+.field public static final image:I = 0x7f0a04e2
-.field public static final incoming:I = 0x7f0a04e8
+.field public static final incoming:I = 0x7f0a04ea
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a056f
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0571
-.field public static final labeled:I = 0x7f0a0577
+.field public static final labeled:I = 0x7f0a0579
-.field public static final largeLabel:I = 0x7f0a0579
+.field public static final largeLabel:I = 0x7f0a057b
-.field public static final left:I = 0x7f0a0584
+.field public static final left:I = 0x7f0a0586
-.field public static final light:I = 0x7f0a0585
+.field public static final light:I = 0x7f0a0587
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final linear:I = 0x7f0a0588
+.field public static final linear:I = 0x7f0a058a
-.field public static final listMode:I = 0x7f0a058a
+.field public static final listMode:I = 0x7f0a058c
-.field public static final list_item:I = 0x7f0a058b
+.field public static final list_item:I = 0x7f0a058d
-.field public static final masked:I = 0x7f0a059b
+.field public static final masked:I = 0x7f0a059d
-.field public static final media_actions:I = 0x7f0a05a1
+.field public static final media_actions:I = 0x7f0a05a3
-.field public static final message:I = 0x7f0a05de
+.field public static final message:I = 0x7f0a05dc
-.field public static final mini:I = 0x7f0a05e3
+.field public static final mini:I = 0x7f0a05e1
-.field public static final month_grid:I = 0x7f0a05e5
+.field public static final month_grid:I = 0x7f0a05e3
-.field public static final month_navigation_bar:I = 0x7f0a05e6
+.field public static final month_navigation_bar:I = 0x7f0a05e4
-.field public static final month_navigation_fragment_toggle:I = 0x7f0a05e7
+.field public static final month_navigation_fragment_toggle:I = 0x7f0a05e5
-.field public static final month_navigation_next:I = 0x7f0a05e8
+.field public static final month_navigation_next:I = 0x7f0a05e6
-.field public static final month_navigation_previous:I = 0x7f0a05e9
+.field public static final month_navigation_previous:I = 0x7f0a05e7
-.field public static final month_title:I = 0x7f0a05ea
+.field public static final month_title:I = 0x7f0a05e8
-.field public static final mtrl_calendar_day_selector_frame:I = 0x7f0a05eb
+.field public static final mtrl_calendar_day_selector_frame:I = 0x7f0a05e9
-.field public static final mtrl_calendar_days_of_week:I = 0x7f0a05ec
+.field public static final mtrl_calendar_days_of_week:I = 0x7f0a05ea
-.field public static final mtrl_calendar_frame:I = 0x7f0a05ed
+.field public static final mtrl_calendar_frame:I = 0x7f0a05eb
-.field public static final mtrl_calendar_main_pane:I = 0x7f0a05ee
+.field public static final mtrl_calendar_main_pane:I = 0x7f0a05ec
-.field public static final mtrl_calendar_months:I = 0x7f0a05ef
+.field public static final mtrl_calendar_months:I = 0x7f0a05ed
-.field public static final mtrl_calendar_selection_frame:I = 0x7f0a05f0
+.field public static final mtrl_calendar_selection_frame:I = 0x7f0a05ee
-.field public static final mtrl_calendar_text_input_frame:I = 0x7f0a05f1
+.field public static final mtrl_calendar_text_input_frame:I = 0x7f0a05ef
-.field public static final mtrl_calendar_year_selector_frame:I = 0x7f0a05f2
+.field public static final mtrl_calendar_year_selector_frame:I = 0x7f0a05f0
-.field public static final mtrl_card_checked_layer_id:I = 0x7f0a05f3
+.field public static final mtrl_card_checked_layer_id:I = 0x7f0a05f1
-.field public static final mtrl_child_content_container:I = 0x7f0a05f4
+.field public static final mtrl_child_content_container:I = 0x7f0a05f2
-.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a05f5
+.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a05f3
-.field public static final mtrl_motion_snapshot_view:I = 0x7f0a05f6
+.field public static final mtrl_motion_snapshot_view:I = 0x7f0a05f4
-.field public static final mtrl_picker_fullscreen:I = 0x7f0a05f7
+.field public static final mtrl_picker_fullscreen:I = 0x7f0a05f5
-.field public static final mtrl_picker_header:I = 0x7f0a05f8
+.field public static final mtrl_picker_header:I = 0x7f0a05f6
-.field public static final mtrl_picker_header_selection_text:I = 0x7f0a05f9
+.field public static final mtrl_picker_header_selection_text:I = 0x7f0a05f7
-.field public static final mtrl_picker_header_title_and_selection:I = 0x7f0a05fa
+.field public static final mtrl_picker_header_title_and_selection:I = 0x7f0a05f8
-.field public static final mtrl_picker_header_toggle:I = 0x7f0a05fb
+.field public static final mtrl_picker_header_toggle:I = 0x7f0a05f9
-.field public static final mtrl_picker_text_input_date:I = 0x7f0a05fc
+.field public static final mtrl_picker_text_input_date:I = 0x7f0a05fa
-.field public static final mtrl_picker_text_input_range_end:I = 0x7f0a05fd
+.field public static final mtrl_picker_text_input_range_end:I = 0x7f0a05fb
-.field public static final mtrl_picker_text_input_range_start:I = 0x7f0a05fe
+.field public static final mtrl_picker_text_input_range_start:I = 0x7f0a05fc
-.field public static final mtrl_picker_title_text:I = 0x7f0a05ff
+.field public static final mtrl_picker_title_text:I = 0x7f0a05fd
-.field public static final multiply:I = 0x7f0a0600
+.field public static final multiply:I = 0x7f0a05fe
-.field public static final navigation_header_container:I = 0x7f0a0612
+.field public static final navigation_header_container:I = 0x7f0a0610
-.field public static final none:I = 0x7f0a0627
+.field public static final none:I = 0x7f0a0625
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final nowrap:I = 0x7f0a0638
+.field public static final nowrap:I = 0x7f0a0636
-.field public static final off:I = 0x7f0a0668
+.field public static final off:I = 0x7f0a0666
-.field public static final on:I = 0x7f0a066c
+.field public static final on:I = 0x7f0a066a
-.field public static final outgoing:I = 0x7f0a066e
+.field public static final outgoing:I = 0x7f0a066c
-.field public static final outline:I = 0x7f0a066f
+.field public static final outline:I = 0x7f0a066d
-.field public static final parallax:I = 0x7f0a067f
+.field public static final parallax:I = 0x7f0a067d
-.field public static final parentPanel:I = 0x7f0a0681
+.field public static final parentPanel:I = 0x7f0a067f
-.field public static final parent_matrix:I = 0x7f0a0682
+.field public static final parent_matrix:I = 0x7f0a0680
-.field public static final password_toggle:I = 0x7f0a0690
+.field public static final password_toggle:I = 0x7f0a068e
-.field public static final pin:I = 0x7f0a06bd
+.field public static final pin:I = 0x7f0a06bb
-.field public static final progress_circular:I = 0x7f0a072c
+.field public static final progress_circular:I = 0x7f0a072a
-.field public static final progress_horizontal:I = 0x7f0a072f
+.field public static final progress_horizontal:I = 0x7f0a072d
-.field public static final radio:I = 0x7f0a073d
+.field public static final radio:I = 0x7f0a073b
-.field public static final recycler_view:I = 0x7f0a0743
+.field public static final recycler_view:I = 0x7f0a0741
-.field public static final right:I = 0x7f0a075f
+.field public static final right:I = 0x7f0a075d
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final rounded:I = 0x7f0a0789
+.field public static final rounded:I = 0x7f0a0787
-.field public static final row:I = 0x7f0a078a
+.field public static final row:I = 0x7f0a0788
-.field public static final row_index_key:I = 0x7f0a078b
+.field public static final row_index_key:I = 0x7f0a0789
-.field public static final row_reverse:I = 0x7f0a078c
+.field public static final row_reverse:I = 0x7f0a078a
-.field public static final save_non_transition_alpha:I = 0x7f0a078d
+.field public static final save_non_transition_alpha:I = 0x7f0a078b
-.field public static final save_overlay_view:I = 0x7f0a078e
+.field public static final save_overlay_view:I = 0x7f0a078c
-.field public static final scale:I = 0x7f0a078f
+.field public static final scale:I = 0x7f0a078d
-.field public static final screen:I = 0x7f0a0791
+.field public static final screen:I = 0x7f0a078f
-.field public static final scrollIndicatorDown:I = 0x7f0a0795
+.field public static final scrollIndicatorDown:I = 0x7f0a0793
-.field public static final scrollIndicatorUp:I = 0x7f0a0796
+.field public static final scrollIndicatorUp:I = 0x7f0a0794
-.field public static final scrollView:I = 0x7f0a0797
+.field public static final scrollView:I = 0x7f0a0795
-.field public static final scrollable:I = 0x7f0a0799
+.field public static final scrollable:I = 0x7f0a0797
-.field public static final search_badge:I = 0x7f0a079a
+.field public static final search_badge:I = 0x7f0a0798
-.field public static final search_bar:I = 0x7f0a079b
+.field public static final search_bar:I = 0x7f0a0799
-.field public static final search_button:I = 0x7f0a079c
+.field public static final search_button:I = 0x7f0a079a
-.field public static final search_close_btn:I = 0x7f0a079d
+.field public static final search_close_btn:I = 0x7f0a079b
-.field public static final search_edit_frame:I = 0x7f0a079e
+.field public static final search_edit_frame:I = 0x7f0a079c
-.field public static final search_go_btn:I = 0x7f0a07a0
+.field public static final search_go_btn:I = 0x7f0a079e
-.field public static final search_mag_icon:I = 0x7f0a07a1
+.field public static final search_mag_icon:I = 0x7f0a079f
-.field public static final search_plate:I = 0x7f0a07a2
+.field public static final search_plate:I = 0x7f0a07a0
-.field public static final search_src_text:I = 0x7f0a07a5
+.field public static final search_src_text:I = 0x7f0a07a3
-.field public static final search_voice_btn:I = 0x7f0a07b1
+.field public static final search_voice_btn:I = 0x7f0a07af
-.field public static final seekbar:I = 0x7f0a07b2
+.field public static final seekbar:I = 0x7f0a07b0
-.field public static final seekbar_value:I = 0x7f0a07b3
+.field public static final seekbar_value:I = 0x7f0a07b1
-.field public static final select_dialog_listview:I = 0x7f0a07b4
+.field public static final select_dialog_listview:I = 0x7f0a07b2
-.field public static final selected:I = 0x7f0a07b5
+.field public static final selected:I = 0x7f0a07b3
-.field public static final shortcut:I = 0x7f0a0914
+.field public static final shortcut:I = 0x7f0a0912
-.field public static final slide:I = 0x7f0a0919
+.field public static final slide:I = 0x7f0a0917
-.field public static final smallLabel:I = 0x7f0a091a
+.field public static final smallLabel:I = 0x7f0a0918
-.field public static final snackbar_action:I = 0x7f0a091b
+.field public static final snackbar_action:I = 0x7f0a0919
-.field public static final snackbar_text:I = 0x7f0a091c
+.field public static final snackbar_text:I = 0x7f0a091a
-.field public static final space_around:I = 0x7f0a0920
+.field public static final space_around:I = 0x7f0a091e
-.field public static final space_between:I = 0x7f0a0921
+.field public static final space_between:I = 0x7f0a091f
-.field public static final space_evenly:I = 0x7f0a0922
+.field public static final space_evenly:I = 0x7f0a0920
-.field public static final spacer:I = 0x7f0a0923
+.field public static final spacer:I = 0x7f0a0921
-.field public static final spinner:I = 0x7f0a0926
+.field public static final spinner:I = 0x7f0a0924
-.field public static final split_action_bar:I = 0x7f0a0927
+.field public static final split_action_bar:I = 0x7f0a0925
-.field public static final src_atop:I = 0x7f0a092b
+.field public static final src_atop:I = 0x7f0a0929
-.field public static final src_in:I = 0x7f0a092c
+.field public static final src_in:I = 0x7f0a092a
-.field public static final src_over:I = 0x7f0a092d
+.field public static final src_over:I = 0x7f0a092b
-.field public static final standard:I = 0x7f0a092f
+.field public static final standard:I = 0x7f0a092d
-.field public static final start:I = 0x7f0a0930
+.field public static final start:I = 0x7f0a092e
-.field public static final status_bar_latest_event_content:I = 0x7f0a0934
+.field public static final status_bar_latest_event_content:I = 0x7f0a0932
-.field public static final stretch:I = 0x7f0a0949
+.field public static final stretch:I = 0x7f0a0947
-.field public static final submenuarrow:I = 0x7f0a094a
+.field public static final submenuarrow:I = 0x7f0a0948
-.field public static final submit_area:I = 0x7f0a094b
+.field public static final submit_area:I = 0x7f0a0949
-.field public static final switchWidget:I = 0x7f0a0959
+.field public static final switchWidget:I = 0x7f0a0957
-.field public static final tabMode:I = 0x7f0a095b
+.field public static final tabMode:I = 0x7f0a0959
-.field public static final tag_accessibility_actions:I = 0x7f0a0969
+.field public static final tag_accessibility_actions:I = 0x7f0a0967
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096a
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0968
-.field public static final tag_accessibility_heading:I = 0x7f0a096b
+.field public static final tag_accessibility_heading:I = 0x7f0a0969
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096c
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096a
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096d
+.field public static final tag_screen_reader_focusable:I = 0x7f0a096b
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final test_checkbox_android_button_tint:I = 0x7f0a0977
+.field public static final test_checkbox_android_button_tint:I = 0x7f0a0975
-.field public static final test_checkbox_app_button_tint:I = 0x7f0a0978
+.field public static final test_checkbox_app_button_tint:I = 0x7f0a0976
-.field public static final test_radiobutton_android_button_tint:I = 0x7f0a0979
+.field public static final test_radiobutton_android_button_tint:I = 0x7f0a0977
-.field public static final test_radiobutton_app_button_tint:I = 0x7f0a097a
+.field public static final test_radiobutton_app_button_tint:I = 0x7f0a0978
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final textSpacerNoButtons:I = 0x7f0a097f
+.field public static final textSpacerNoButtons:I = 0x7f0a097d
-.field public static final textSpacerNoTitle:I = 0x7f0a0980
+.field public static final textSpacerNoTitle:I = 0x7f0a097e
-.field public static final text_input_end_icon:I = 0x7f0a0982
+.field public static final text_input_end_icon:I = 0x7f0a0980
-.field public static final text_input_start_icon:I = 0x7f0a0983
+.field public static final text_input_start_icon:I = 0x7f0a0981
-.field public static final textinput_counter:I = 0x7f0a0986
+.field public static final textinput_counter:I = 0x7f0a0984
-.field public static final textinput_error:I = 0x7f0a0987
+.field public static final textinput_error:I = 0x7f0a0985
-.field public static final textinput_helper_text:I = 0x7f0a0988
+.field public static final textinput_helper_text:I = 0x7f0a0986
-.field public static final textinput_placeholder:I = 0x7f0a0989
+.field public static final textinput_placeholder:I = 0x7f0a0987
-.field public static final textinput_prefix_text:I = 0x7f0a098a
+.field public static final textinput_prefix_text:I = 0x7f0a0988
-.field public static final textinput_suffix_text:I = 0x7f0a098b
+.field public static final textinput_suffix_text:I = 0x7f0a0989
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
-.field public static final titleDividerNoCustom:I = 0x7f0a0993
+.field public static final titleDividerNoCustom:I = 0x7f0a0991
-.field public static final title_template:I = 0x7f0a0994
+.field public static final title_template:I = 0x7f0a0992
-.field public static final top:I = 0x7f0a099a
+.field public static final top:I = 0x7f0a0998
-.field public static final topPanel:I = 0x7f0a099b
+.field public static final topPanel:I = 0x7f0a0999
-.field public static final touch_outside:I = 0x7f0a099d
+.field public static final touch_outside:I = 0x7f0a099b
-.field public static final transition_current_scene:I = 0x7f0a099e
+.field public static final transition_current_scene:I = 0x7f0a099c
-.field public static final transition_layout_save:I = 0x7f0a099f
+.field public static final transition_layout_save:I = 0x7f0a099d
-.field public static final transition_position:I = 0x7f0a09a0
+.field public static final transition_position:I = 0x7f0a099e
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a09a1
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a099f
-.field public static final transition_transform:I = 0x7f0a09a2
+.field public static final transition_transform:I = 0x7f0a09a0
-.field public static final unchecked:I = 0x7f0a09b1
+.field public static final unchecked:I = 0x7f0a09af
-.field public static final uniform:I = 0x7f0a09b4
+.field public static final uniform:I = 0x7f0a09b2
-.field public static final unlabeled:I = 0x7f0a09b5
+.field public static final unlabeled:I = 0x7f0a09b3
-.field public static final up:I = 0x7f0a09b6
+.field public static final up:I = 0x7f0a09b4
-.field public static final view_offset_helper:I = 0x7f0a0a39
+.field public static final view_offset_helper:I = 0x7f0a0a37
-.field public static final visible:I = 0x7f0a0a4d
+.field public static final visible:I = 0x7f0a0a4b
-.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a4e
+.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a4c
-.field public static final wide:I = 0x7f0a0a7d
+.field public static final wide:I = 0x7f0a0a80
-.field public static final withinBounds:I = 0x7f0a0ab4
+.field public static final withinBounds:I = 0x7f0a0ab7
-.field public static final wrap:I = 0x7f0a0ab5
+.field public static final wrap:I = 0x7f0a0ab8
-.field public static final wrap_content:I = 0x7f0a0ab6
+.field public static final wrap_content:I = 0x7f0a0ab9
-.field public static final wrap_reverse:I = 0x7f0a0ab7
+.field public static final wrap_reverse:I = 0x7f0a0aba
-.field public static final zero_corner_chip:I = 0x7f0a0abc
+.field public static final zero_corner_chip:I = 0x7f0a0abf
# 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 6a08c7c662..0f683e96bf 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 = 0x7f120357
-.field public static final character_counter_content_description:I = 0x7f12041d
+.field public static final character_counter_content_description:I = 0x7f12041e
-.field public static final character_counter_overflowed_content_description:I = 0x7f12041e
+.field public static final character_counter_overflowed_content_description:I = 0x7f12041f
-.field public static final character_counter_pattern:I = 0x7f12041f
+.field public static final character_counter_pattern:I = 0x7f120420
-.field public static final chip_text:I = 0x7f120428
+.field public static final chip_text:I = 0x7f120429
-.field public static final clear_text_end_icon_content_description:I = 0x7f120435
+.field public static final clear_text_end_icon_content_description:I = 0x7f120436
-.field public static final common_google_play_services_enable_button:I = 0x7f120464
+.field public static final common_google_play_services_enable_button:I = 0x7f120465
-.field public static final common_google_play_services_enable_text:I = 0x7f120465
+.field public static final common_google_play_services_enable_text:I = 0x7f120466
-.field public static final common_google_play_services_enable_title:I = 0x7f120466
+.field public static final common_google_play_services_enable_title:I = 0x7f120467
-.field public static final common_google_play_services_install_button:I = 0x7f120467
+.field public static final common_google_play_services_install_button:I = 0x7f120468
-.field public static final common_google_play_services_install_text:I = 0x7f120468
+.field public static final common_google_play_services_install_text:I = 0x7f120469
-.field public static final common_google_play_services_install_title:I = 0x7f120469
+.field public static final common_google_play_services_install_title:I = 0x7f12046a
-.field public static final common_google_play_services_notification_channel_name:I = 0x7f12046a
+.field public static final common_google_play_services_notification_channel_name:I = 0x7f12046b
-.field public static final common_google_play_services_notification_ticker:I = 0x7f12046b
+.field public static final common_google_play_services_notification_ticker:I = 0x7f12046c
-.field public static final common_google_play_services_unknown_issue:I = 0x7f12046c
+.field public static final common_google_play_services_unknown_issue:I = 0x7f12046d
-.field public static final common_google_play_services_unsupported_text:I = 0x7f12046d
+.field public static final common_google_play_services_unsupported_text:I = 0x7f12046e
-.field public static final common_google_play_services_update_button:I = 0x7f12046e
+.field public static final common_google_play_services_update_button:I = 0x7f12046f
-.field public static final common_google_play_services_update_text:I = 0x7f12046f
+.field public static final common_google_play_services_update_text:I = 0x7f120470
-.field public static final common_google_play_services_update_title:I = 0x7f120470
+.field public static final common_google_play_services_update_title:I = 0x7f120471
-.field public static final common_google_play_services_updating_text:I = 0x7f120471
+.field public static final common_google_play_services_updating_text:I = 0x7f120472
-.field public static final common_google_play_services_wear_update_text:I = 0x7f120472
+.field public static final common_google_play_services_wear_update_text:I = 0x7f120473
-.field public static final common_open_on_phone:I = 0x7f120473
+.field public static final common_open_on_phone:I = 0x7f120474
-.field public static final common_signin_button_text:I = 0x7f120474
+.field public static final common_signin_button_text:I = 0x7f120475
-.field public static final common_signin_button_text_long:I = 0x7f120475
+.field public static final common_signin_button_text_long:I = 0x7f120476
-.field public static final copy:I = 0x7f1204d2
+.field public static final copy:I = 0x7f1204d3
-.field public static final error_icon_content_description:I = 0x7f120649
+.field public static final error_icon_content_description:I = 0x7f12064a
-.field public static final expand_button_title:I = 0x7f120680
+.field public static final expand_button_title:I = 0x7f120681
-.field public static final exposed_dropdown_menu_content_description:I = 0x7f12068e
+.field public static final exposed_dropdown_menu_content_description:I = 0x7f12068f
-.field public static final fab_transformation_scrim_behavior:I = 0x7f120697
+.field public static final fab_transformation_scrim_behavior:I = 0x7f120698
-.field public static final fab_transformation_sheet_behavior:I = 0x7f120698
+.field public static final fab_transformation_sheet_behavior:I = 0x7f120699
-.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120bcd
+.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120bd7
-.field public static final icon_content_description:I = 0x7f120c5a
+.field public static final icon_content_description:I = 0x7f120c64
-.field public static final item_view_role_description:I = 0x7f120d7b
+.field public static final item_view_role_description:I = 0x7f120d86
-.field public static final mtrl_badge_numberless_content_description:I = 0x7f120f01
+.field public static final mtrl_badge_numberless_content_description:I = 0x7f120f0f
-.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120f02
+.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120f10
-.field public static final mtrl_exceed_max_badge_number_content_description:I = 0x7f120f03
+.field public static final mtrl_exceed_max_badge_number_content_description:I = 0x7f120f11
-.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120f04
+.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120f12
-.field public static final mtrl_picker_a11y_next_month:I = 0x7f120f05
+.field public static final mtrl_picker_a11y_next_month:I = 0x7f120f13
-.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120f06
+.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120f14
-.field public static final mtrl_picker_announce_current_selection:I = 0x7f120f07
+.field public static final mtrl_picker_announce_current_selection:I = 0x7f120f15
-.field public static final mtrl_picker_cancel:I = 0x7f120f08
+.field public static final mtrl_picker_cancel:I = 0x7f120f16
-.field public static final mtrl_picker_confirm:I = 0x7f120f09
+.field public static final mtrl_picker_confirm:I = 0x7f120f17
-.field public static final mtrl_picker_date_header_selected:I = 0x7f120f0a
+.field public static final mtrl_picker_date_header_selected:I = 0x7f120f18
-.field public static final mtrl_picker_date_header_title:I = 0x7f120f0b
+.field public static final mtrl_picker_date_header_title:I = 0x7f120f19
-.field public static final mtrl_picker_date_header_unselected:I = 0x7f120f0c
+.field public static final mtrl_picker_date_header_unselected:I = 0x7f120f1a
-.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120f0d
+.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120f1b
-.field public static final mtrl_picker_invalid_format:I = 0x7f120f0e
+.field public static final mtrl_picker_invalid_format:I = 0x7f120f1c
-.field public static final mtrl_picker_invalid_format_example:I = 0x7f120f0f
+.field public static final mtrl_picker_invalid_format_example:I = 0x7f120f1d
-.field public static final mtrl_picker_invalid_format_use:I = 0x7f120f10
+.field public static final mtrl_picker_invalid_format_use:I = 0x7f120f1e
-.field public static final mtrl_picker_invalid_range:I = 0x7f120f11
+.field public static final mtrl_picker_invalid_range:I = 0x7f120f1f
-.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120f12
+.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120f20
-.field public static final mtrl_picker_out_of_range:I = 0x7f120f13
+.field public static final mtrl_picker_out_of_range:I = 0x7f120f21
-.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120f14
+.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120f22
-.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120f15
+.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120f23
-.field public static final mtrl_picker_range_header_selected:I = 0x7f120f16
+.field public static final mtrl_picker_range_header_selected:I = 0x7f120f24
-.field public static final mtrl_picker_range_header_title:I = 0x7f120f17
+.field public static final mtrl_picker_range_header_title:I = 0x7f120f25
-.field public static final mtrl_picker_range_header_unselected:I = 0x7f120f18
+.field public static final mtrl_picker_range_header_unselected:I = 0x7f120f26
-.field public static final mtrl_picker_save:I = 0x7f120f19
+.field public static final mtrl_picker_save:I = 0x7f120f27
-.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120f1a
+.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120f28
-.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120f1b
+.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120f29
-.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120f1c
+.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120f2a
-.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120f1d
+.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120f2b
-.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120f1e
+.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120f2c
-.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120f1f
+.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120f2d
-.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120f20
+.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120f2e
-.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120f21
+.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120f2f
-.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120f22
+.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120f30
-.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120f23
+.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120f31
-.field public static final mtrl_slider_range_content_description:I = 0x7f120f24
+.field public static final mtrl_slider_range_content_description:I = 0x7f120f32
-.field public static final not_set:I = 0x7f120fa7
+.field public static final not_set:I = 0x7f120fb5
-.field public static final password_toggle_content_description:I = 0x7f1210ca
+.field public static final password_toggle_content_description:I = 0x7f1210d8
-.field public static final path_password_eye:I = 0x7f1210cc
+.field public static final path_password_eye:I = 0x7f1210da
-.field public static final path_password_eye_mask_strike_through:I = 0x7f1210cd
+.field public static final path_password_eye_mask_strike_through:I = 0x7f1210db
-.field public static final path_password_eye_mask_visible:I = 0x7f1210ce
+.field public static final path_password_eye_mask_visible:I = 0x7f1210dc
-.field public static final path_password_strike_through:I = 0x7f1210cf
+.field public static final path_password_strike_through:I = 0x7f1210dd
-.field public static final preference_copied:I = 0x7f12113f
+.field public static final preference_copied:I = 0x7f12114d
-.field public static final search_menu_title:I = 0x7f121404
+.field public static final search_menu_title:I = 0x7f121412
-.field public static final status_bar_notification_info_overflow:I = 0x7f1214c6
+.field public static final status_bar_notification_info_overflow:I = 0x7f1214d4
-.field public static final summary_collapsed_preference_list:I = 0x7f12152a
+.field public static final summary_collapsed_preference_list:I = 0x7f121537
-.field public static final v7_preference_off:I = 0x7f121752
+.field public static final v7_preference_off:I = 0x7f12175f
-.field public static final v7_preference_on:I = 0x7f121753
+.field public static final v7_preference_on:I = 0x7f121760
# direct methods
diff --git a/com.discord/smali/com/discord/stores/SlowTtiExperimentManager$Companion$INSTANCE$2.smali b/com.discord/smali/com/discord/stores/SlowTtiExperimentManager$Companion$INSTANCE$2.smali
new file mode 100644
index 0000000000..f491095c70
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/SlowTtiExperimentManager$Companion$INSTANCE$2.smali
@@ -0,0 +1,76 @@
+.class public final Lcom/discord/stores/SlowTtiExperimentManager$Companion$INSTANCE$2;
+.super Lj0/n/c/i;
+.source "SlowTtiExperimentManager.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+ value = Lcom/discord/stores/SlowTtiExperimentManager;
+.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<",
+ "Lcom/discord/stores/SlowTtiExperimentManager;",
+ ">;"
+ }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/stores/SlowTtiExperimentManager$Companion$INSTANCE$2;
+
+
+# direct methods
+.method public static constructor ()V
+ .locals 1
+
+ new-instance v0, Lcom/discord/stores/SlowTtiExperimentManager$Companion$INSTANCE$2;
+
+ invoke-direct {v0}, Lcom/discord/stores/SlowTtiExperimentManager$Companion$INSTANCE$2;->()V
+
+ sput-object v0, Lcom/discord/stores/SlowTtiExperimentManager$Companion$INSTANCE$2;->INSTANCE:Lcom/discord/stores/SlowTtiExperimentManager$Companion$INSTANCE$2;
+
+ return-void
+.end method
+
+.method public constructor ()V
+ .locals 1
+
+ const/4 v0, 0x0
+
+ invoke-direct {p0, v0}, Lj0/n/c/i;->(I)V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public final invoke()Lcom/discord/stores/SlowTtiExperimentManager;
+ .locals 1
+
+ new-instance v0, Lcom/discord/stores/SlowTtiExperimentManager;
+
+ invoke-direct {v0}, Lcom/discord/stores/SlowTtiExperimentManager;->()V
+
+ return-object v0
+.end method
+
+.method public bridge synthetic invoke()Ljava/lang/Object;
+ .locals 1
+
+ invoke-virtual {p0}, Lcom/discord/stores/SlowTtiExperimentManager$Companion$INSTANCE$2;->invoke()Lcom/discord/stores/SlowTtiExperimentManager;
+
+ move-result-object v0
+
+ return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/stores/SlowTtiExperimentManager$Companion.smali b/com.discord/smali/com/discord/stores/SlowTtiExperimentManager$Companion.smali
new file mode 100644
index 0000000000..4b3097bc15
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/SlowTtiExperimentManager$Companion.smali
@@ -0,0 +1,52 @@
+.class public final Lcom/discord/stores/SlowTtiExperimentManager$Companion;
+.super Ljava/lang/Object;
+.source "SlowTtiExperimentManager.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+ value = Lcom/discord/stores/SlowTtiExperimentManager;
+.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/SlowTtiExperimentManager$Companion;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public final getINSTANCE()Lcom/discord/stores/SlowTtiExperimentManager;
+ .locals 2
+
+ invoke-static {}, Lcom/discord/stores/SlowTtiExperimentManager;->access$getINSTANCE$cp()Lkotlin/Lazy;
+
+ move-result-object v0
+
+ sget-object v1, Lcom/discord/stores/SlowTtiExperimentManager;->Companion:Lcom/discord/stores/SlowTtiExperimentManager$Companion;
+
+ invoke-interface {v0}, Lkotlin/Lazy;->getValue()Ljava/lang/Object;
+
+ move-result-object v0
+
+ check-cast v0, Lcom/discord/stores/SlowTtiExperimentManager;
+
+ return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/stores/SlowTtiExperimentManager$fetchExperiment$1.smali b/com.discord/smali/com/discord/stores/SlowTtiExperimentManager$fetchExperiment$1.smali
new file mode 100644
index 0000000000..7a11f85db7
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/SlowTtiExperimentManager$fetchExperiment$1.smali
@@ -0,0 +1,86 @@
+.class public final Lcom/discord/stores/SlowTtiExperimentManager$fetchExperiment$1;
+.super Lj0/n/c/i;
+.source "SlowTtiExperimentManager.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/stores/SlowTtiExperimentManager;->fetchExperiment(Lcom/discord/stores/StoreExperiments;)V
+.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/discord/stores/StoreExperiments$Experiment;",
+ "Lkotlin/Unit;",
+ ">;"
+ }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/stores/SlowTtiExperimentManager$fetchExperiment$1;
+
+
+# direct methods
+.method public static constructor ()V
+ .locals 1
+
+ new-instance v0, Lcom/discord/stores/SlowTtiExperimentManager$fetchExperiment$1;
+
+ invoke-direct {v0}, Lcom/discord/stores/SlowTtiExperimentManager$fetchExperiment$1;->()V
+
+ sput-object v0, Lcom/discord/stores/SlowTtiExperimentManager$fetchExperiment$1;->INSTANCE:Lcom/discord/stores/SlowTtiExperimentManager$fetchExperiment$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/discord/stores/StoreExperiments$Experiment;
+
+ invoke-virtual {p0, p1}, Lcom/discord/stores/SlowTtiExperimentManager$fetchExperiment$1;->invoke(Lcom/discord/stores/StoreExperiments$Experiment;)V
+
+ sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+ return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/stores/StoreExperiments$Experiment;)V
+ .locals 0
+
+ if-eqz p1, :cond_0
+
+ return-void
+
+ :cond_0
+ 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/stores/SlowTtiExperimentManager$observeExperiment$1.smali b/com.discord/smali/com/discord/stores/SlowTtiExperimentManager$observeExperiment$1.smali
new file mode 100644
index 0000000000..df7d1f447c
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/SlowTtiExperimentManager$observeExperiment$1.smali
@@ -0,0 +1,96 @@
+.class public final Lcom/discord/stores/SlowTtiExperimentManager$observeExperiment$1;
+.super Ljava/lang/Object;
+.source "SlowTtiExperimentManager.kt"
+
+# interfaces
+.implements Lr0/k/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/stores/SlowTtiExperimentManager;->observeExperiment(Lcom/discord/stores/StoreExperiments;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+ value = {
+ "",
+ "Ljava/lang/Object;",
+ "Lr0/k/b<",
+ "Lcom/discord/stores/StoreExperiments$Experiment;",
+ "Ljava/lang/Boolean;",
+ ">;"
+ }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/stores/SlowTtiExperimentManager$observeExperiment$1;
+
+
+# direct methods
+.method public static constructor ()V
+ .locals 1
+
+ new-instance v0, Lcom/discord/stores/SlowTtiExperimentManager$observeExperiment$1;
+
+ invoke-direct {v0}, Lcom/discord/stores/SlowTtiExperimentManager$observeExperiment$1;->()V
+
+ sput-object v0, Lcom/discord/stores/SlowTtiExperimentManager$observeExperiment$1;->INSTANCE:Lcom/discord/stores/SlowTtiExperimentManager$observeExperiment$1;
+
+ return-void
+.end method
+
+.method public constructor ()V
+ .locals 0
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+ .locals 0
+
+ check-cast p1, Lcom/discord/stores/StoreExperiments$Experiment;
+
+ invoke-virtual {p0, p1}, Lcom/discord/stores/SlowTtiExperimentManager$observeExperiment$1;->call(Lcom/discord/stores/StoreExperiments$Experiment;)Z
+
+ move-result p1
+
+ invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+ move-result-object p1
+
+ return-object p1
+.end method
+
+.method public final call(Lcom/discord/stores/StoreExperiments$Experiment;)Z
+ .locals 0
+
+ invoke-virtual {p1}, Lcom/discord/stores/StoreExperiments$Experiment;->getRawExperiment()Lcom/discord/models/domain/ModelExperiment;
+
+ move-result-object p1
+
+ if-eqz p1, :cond_0
+
+ const/4 p1, 0x1
+
+ goto :goto_0
+
+ :cond_0
+ const/4 p1, 0x0
+
+ :goto_0
+ return p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/SlowTtiExperimentManager$observeExperiment$2.smali b/com.discord/smali/com/discord/stores/SlowTtiExperimentManager$observeExperiment$2.smali
new file mode 100644
index 0000000000..353d09d11f
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/SlowTtiExperimentManager$observeExperiment$2.smali
@@ -0,0 +1,71 @@
+.class public final Lcom/discord/stores/SlowTtiExperimentManager$observeExperiment$2;
+.super Ljava/lang/Object;
+.source "SlowTtiExperimentManager.kt"
+
+# interfaces
+.implements Lrx/functions/Action1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/stores/SlowTtiExperimentManager;->observeExperiment(Lcom/discord/stores/StoreExperiments;)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<",
+ "Lcom/discord/stores/StoreExperiments$Experiment;",
+ ">;"
+ }
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/stores/SlowTtiExperimentManager;
+
+
+# direct methods
+.method public constructor (Lcom/discord/stores/SlowTtiExperimentManager;)V
+ .locals 0
+
+ iput-object p1, p0, Lcom/discord/stores/SlowTtiExperimentManager$observeExperiment$2;->this$0:Lcom/discord/stores/SlowTtiExperimentManager;
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public final call(Lcom/discord/stores/StoreExperiments$Experiment;)V
+ .locals 2
+
+ iget-object v0, p0, Lcom/discord/stores/SlowTtiExperimentManager$observeExperiment$2;->this$0:Lcom/discord/stores/SlowTtiExperimentManager;
+
+ const-string v1, "experiment"
+
+ invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ invoke-static {v0, p1}, Lcom/discord/stores/SlowTtiExperimentManager;->access$writeExperimentToCache(Lcom/discord/stores/SlowTtiExperimentManager;Lcom/discord/stores/StoreExperiments$Experiment;)V
+
+ return-void
+.end method
+
+.method public bridge synthetic call(Ljava/lang/Object;)V
+ .locals 0
+
+ check-cast p1, Lcom/discord/stores/StoreExperiments$Experiment;
+
+ invoke-virtual {p0, p1}, Lcom/discord/stores/SlowTtiExperimentManager$observeExperiment$2;->call(Lcom/discord/stores/StoreExperiments$Experiment;)V
+
+ return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/SlowTtiExperimentManager.smali b/com.discord/smali/com/discord/stores/SlowTtiExperimentManager.smali
new file mode 100644
index 0000000000..12841428e7
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/SlowTtiExperimentManager.smali
@@ -0,0 +1,242 @@
+.class public final Lcom/discord/stores/SlowTtiExperimentManager;
+.super Ljava/lang/Object;
+.source "SlowTtiExperimentManager.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+ value = {
+ Lcom/discord/stores/SlowTtiExperimentManager$Companion;
+ }
+.end annotation
+
+
+# static fields
+.field public static final Companion:Lcom/discord/stores/SlowTtiExperimentManager$Companion;
+
+.field public static final INSTANCE$delegate:Lkotlin/Lazy;
+
+
+# instance fields
+.field public experimentBucket:I
+
+.field public final sharedPreferences:Landroid/content/SharedPreferences;
+
+
+# direct methods
+.method public static constructor ()V
+ .locals 2
+
+ new-instance v0, Lcom/discord/stores/SlowTtiExperimentManager$Companion;
+
+ const/4 v1, 0x0
+
+ invoke-direct {v0, v1}, Lcom/discord/stores/SlowTtiExperimentManager$Companion;->(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+ sput-object v0, Lcom/discord/stores/SlowTtiExperimentManager;->Companion:Lcom/discord/stores/SlowTtiExperimentManager$Companion;
+
+ sget-object v0, Lcom/discord/stores/SlowTtiExperimentManager$Companion$INSTANCE$2;->INSTANCE:Lcom/discord/stores/SlowTtiExperimentManager$Companion$INSTANCE$2;
+
+ invoke-static {v0}, Lf/n/a/k/a;->lazy(Lkotlin/jvm/functions/Function0;)Lkotlin/Lazy;
+
+ move-result-object v0
+
+ sput-object v0, Lcom/discord/stores/SlowTtiExperimentManager;->INSTANCE$delegate:Lkotlin/Lazy;
+
+ return-void
+.end method
+
+.method public constructor ()V
+ .locals 3
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ sget-object v0, Lcom/discord/utilities/cache/SharedPreferencesProvider;->INSTANCE:Lcom/discord/utilities/cache/SharedPreferencesProvider;
+
+ invoke-virtual {v0}, Lcom/discord/utilities/cache/SharedPreferencesProvider;->get()Landroid/content/SharedPreferences;
+
+ move-result-object v0
+
+ iput-object v0, p0, Lcom/discord/stores/SlowTtiExperimentManager;->sharedPreferences:Landroid/content/SharedPreferences;
+
+ const-string v1, "SLOW_TTI_EXPERIMENT"
+
+ const/4 v2, 0x0
+
+ invoke-interface {v0, v1, v2}, Landroid/content/SharedPreferences;->getInt(Ljava/lang/String;I)I
+
+ move-result v0
+
+ iput v0, p0, Lcom/discord/stores/SlowTtiExperimentManager;->experimentBucket:I
+
+ return-void
+.end method
+
+.method public static final synthetic access$getINSTANCE$cp()Lkotlin/Lazy;
+ .locals 1
+
+ sget-object v0, Lcom/discord/stores/SlowTtiExperimentManager;->INSTANCE$delegate:Lkotlin/Lazy;
+
+ return-object v0
+.end method
+
+.method public static final synthetic access$writeExperimentToCache(Lcom/discord/stores/SlowTtiExperimentManager;Lcom/discord/stores/StoreExperiments$Experiment;)V
+ .locals 0
+
+ invoke-direct {p0, p1}, Lcom/discord/stores/SlowTtiExperimentManager;->writeExperimentToCache(Lcom/discord/stores/StoreExperiments$Experiment;)V
+
+ return-void
+.end method
+
+.method private final observeExperiment(Lcom/discord/stores/StoreExperiments;)Lrx/Observable;
+ .locals 3
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Lcom/discord/stores/StoreExperiments;",
+ ")",
+ "Lrx/Observable<",
+ "Lcom/discord/stores/StoreExperiments$Experiment;",
+ ">;"
+ }
+ .end annotation
+
+ const-string v0, "2020-08_android_tti_delay"
+
+ const/4 v1, 0x0
+
+ const/4 v2, 0x2
+
+ invoke-static {p1, v0, v1, v2, v1}, Lcom/discord/stores/StoreExperiments;->getExperiment$default(Lcom/discord/stores/StoreExperiments;Ljava/lang/String;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lrx/Observable;
+
+ move-result-object p1
+
+ sget-object v0, Lcom/discord/stores/SlowTtiExperimentManager$observeExperiment$1;->INSTANCE:Lcom/discord/stores/SlowTtiExperimentManager$observeExperiment$1;
+
+ invoke-virtual {p1, v0}, Lrx/Observable;->w(Lr0/k/b;)Lrx/Observable;
+
+ move-result-object p1
+
+ const/4 v0, 0x1
+
+ invoke-virtual {p1, v0}, Lrx/Observable;->V(I)Lrx/Observable;
+
+ move-result-object p1
+
+ new-instance v0, Lcom/discord/stores/SlowTtiExperimentManager$observeExperiment$2;
+
+ invoke-direct {v0, p0}, Lcom/discord/stores/SlowTtiExperimentManager$observeExperiment$2;->(Lcom/discord/stores/SlowTtiExperimentManager;)V
+
+ invoke-virtual {p1, v0}, Lrx/Observable;->t(Lrx/functions/Action1;)Lrx/Observable;
+
+ move-result-object p1
+
+ const-string v0, "storeExperiments.getExpe\u2026che(experiment)\n }"
+
+ invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
+
+ move-result-object p1
+
+ return-object p1
+.end method
+
+.method private final writeExperimentToCache(Lcom/discord/stores/StoreExperiments$Experiment;)V
+ .locals 2
+
+ iget-object v0, p0, Lcom/discord/stores/SlowTtiExperimentManager;->sharedPreferences:Landroid/content/SharedPreferences;
+
+ invoke-interface {v0}, Landroid/content/SharedPreferences;->edit()Landroid/content/SharedPreferences$Editor;
+
+ move-result-object v0
+
+ invoke-virtual {p1}, Lcom/discord/stores/StoreExperiments$Experiment;->getBucket()I
+
+ move-result p1
+
+ const-string v1, "SLOW_TTI_EXPERIMENT"
+
+ invoke-interface {v0, v1, p1}, Landroid/content/SharedPreferences$Editor;->putInt(Ljava/lang/String;I)Landroid/content/SharedPreferences$Editor;
+
+ move-result-object p1
+
+ invoke-interface {p1}, Landroid/content/SharedPreferences$Editor;->apply()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public final fetchExperiment(Lcom/discord/stores/StoreExperiments;)V
+ .locals 9
+
+ if-eqz p1, :cond_0
+
+ invoke-direct {p0, p1}, Lcom/discord/stores/SlowTtiExperimentManager;->observeExperiment(Lcom/discord/stores/StoreExperiments;)Lrx/Observable;
+
+ move-result-object v0
+
+ const-class v1, Lcom/discord/stores/SlowTtiExperimentManager;
+
+ const/4 v2, 0x0
+
+ const/4 v3, 0x0
+
+ const/4 v4, 0x0
+
+ const/4 v5, 0x0
+
+ sget-object v6, Lcom/discord/stores/SlowTtiExperimentManager$fetchExperiment$1;->INSTANCE:Lcom/discord/stores/SlowTtiExperimentManager$fetchExperiment$1;
+
+ const/16 v7, 0x1e
+
+ const/4 v8, 0x0
+
+ invoke-static/range {v0 .. v8}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
+
+ return-void
+
+ :cond_0
+ const-string p1, "storeExperiments"
+
+ invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+
+ const/4 p1, 0x0
+
+ throw p1
+.end method
+
+.method public final getDelayMs()J
+ .locals 2
+
+ invoke-static {}, Lcom/discord/stores/SlowTtiExperimentManagerKt;->access$getExperimentBucketToDelayMs$p()Ljava/util/Map;
+
+ move-result-object v0
+
+ iget v1, p0, Lcom/discord/stores/SlowTtiExperimentManager;->experimentBucket:I
+
+ invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+ move-result-object v1
+
+ invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+ move-result-object v0
+
+ check-cast v0, Ljava/lang/Long;
+
+ if-eqz v0, :cond_0
+
+ invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+ move-result-wide v0
+
+ goto :goto_0
+
+ :cond_0
+ const-wide/16 v0, 0x0
+
+ :goto_0
+ return-wide v0
+.end method
diff --git a/com.discord/smali/com/discord/stores/SlowTtiExperimentManagerKt.smali b/com.discord/smali/com/discord/stores/SlowTtiExperimentManagerKt.smali
new file mode 100644
index 0000000000..ba9504e8c9
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/SlowTtiExperimentManagerKt.smali
@@ -0,0 +1,118 @@
+.class public final Lcom/discord/stores/SlowTtiExperimentManagerKt;
+.super Ljava/lang/Object;
+.source "SlowTtiExperimentManager.kt"
+
+
+# static fields
+.field public static final CACHE_KEY:Ljava/lang/String; = "SLOW_TTI_EXPERIMENT"
+
+.field public static final DEFAULT_BUCKET:I
+
+.field public static final experimentBucketToDelayMs:Ljava/util/Map;
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Ljava/util/Map<",
+ "Ljava/lang/Integer;",
+ "Ljava/lang/Long;",
+ ">;"
+ }
+ .end annotation
+.end field
+
+
+# direct methods
+.method public static constructor ()V
+ .locals 7
+
+ const/4 v0, 0x4
+
+ new-array v1, v0, [Lkotlin/Pair;
+
+ const/4 v2, 0x1
+
+ invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+ move-result-object v3
+
+ const-wide/16 v4, 0x1f4
+
+ invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object v4
+
+ new-instance v5, Lkotlin/Pair;
+
+ invoke-direct {v5, v3, v4}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V
+
+ const/4 v3, 0x0
+
+ aput-object v5, v1, v3
+
+ const/4 v3, 0x2
+
+ invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+ move-result-object v4
+
+ const-wide/16 v5, 0x3e8
+
+ invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object v5
+
+ new-instance v6, Lkotlin/Pair;
+
+ invoke-direct {v6, v4, v5}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V
+
+ aput-object v6, v1, v2
+
+ const/4 v2, 0x3
+
+ invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+ move-result-object v4
+
+ const-wide/16 v5, 0x7d0
+
+ invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object v5
+
+ new-instance v6, Lkotlin/Pair;
+
+ invoke-direct {v6, v4, v5}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V
+
+ aput-object v6, v1, v3
+
+ invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+
+ move-result-object v0
+
+ const-wide/16 v3, 0xfa0
+
+ invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object v3
+
+ new-instance v4, Lkotlin/Pair;
+
+ invoke-direct {v4, v0, v3}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V
+
+ aput-object v4, v1, v2
+
+ invoke-static {v1}, Lf/n/a/k/a;->mapOf([Lkotlin/Pair;)Ljava/util/Map;
+
+ move-result-object v0
+
+ sput-object v0, Lcom/discord/stores/SlowTtiExperimentManagerKt;->experimentBucketToDelayMs:Ljava/util/Map;
+
+ return-void
+.end method
+
+.method public static final synthetic access$getExperimentBucketToDelayMs$p()Ljava/util/Map;
+ .locals 1
+
+ sget-object v0, Lcom/discord/stores/SlowTtiExperimentManagerKt;->experimentBucketToDelayMs:Ljava/util/Map;
+
+ return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreAudioDevices$VideoUseDetector.smali b/com.discord/smali/com/discord/stores/StoreAudioDevices$VideoUseDetector.smali
index 57ca869177..460520a3d2 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioDevices$VideoUseDetector.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioDevices$VideoUseDetector.smali
@@ -195,7 +195,7 @@
# virtual methods
.method public final isAnyoneUsingVideoInChannel(J)Z
- .locals 3
+ .locals 1
.annotation runtime Lcom/discord/stores/StoreThread;
.end annotation
@@ -209,34 +209,29 @@
instance-of p2, p1, Ljava/util/Collection;
- const/4 v0, 0x1
+ const/4 v0, 0x0
- const/4 v1, 0x0
-
- if-eqz p2, :cond_1
+ if-eqz p2, :cond_0
invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
move-result p2
- if-eqz p2, :cond_1
+ if-eqz p2, :cond_0
+
+ goto :goto_0
:cond_0
- const/4 v0, 0x0
-
- goto :goto_2
-
- :cond_1
invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
move-result-object p1
- :cond_2
+ :cond_1
invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z
move-result p2
- if-eqz p2, :cond_0
+ if-eqz p2, :cond_2
invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object;
@@ -244,33 +239,16 @@
check-cast p2, Lcom/discord/models/domain/ModelVoice$State;
- invoke-virtual {p2}, Lcom/discord/models/domain/ModelVoice$State;->isSelfVideo()Z
-
- move-result v2
-
- if-nez v2, :cond_4
-
- invoke-virtual {p2}, Lcom/discord/models/domain/ModelVoice$State;->isSelfStream()Z
+ invoke-virtual {p2}, Lcom/discord/models/domain/ModelVoice$State;->hasVideo()Z
move-result p2
- if-eqz p2, :cond_3
+ if-eqz p2, :cond_1
- goto :goto_0
+ const/4 v0, 0x1
- :cond_3
- const/4 p2, 0x0
-
- goto :goto_1
-
- :cond_4
+ :cond_2
:goto_0
- const/4 p2, 0x1
-
- :goto_1
- if-eqz p2, :cond_2
-
- :goto_2
return v0
.end method
@@ -291,7 +269,7 @@
const/4 v0, 0x0
- if-eqz p2, :cond_1
+ if-eqz p2, :cond_0
invoke-virtual {p2}, Lcom/discord/models/domain/ModelUser;->getId()J
@@ -307,23 +285,12 @@
check-cast p1, Lcom/discord/models/domain/ModelVoice$State;
- if-eqz p1, :cond_1
+ if-eqz p1, :cond_0
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$State;->isSelfVideo()Z
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$State;->hasVideo()Z
- move-result p2
-
- if-nez p2, :cond_0
-
- invoke-virtual {p1}, Lcom/discord/models/domain/ModelVoice$State;->isSelfStream()Z
-
- move-result p1
-
- if-eqz p1, :cond_1
+ move-result v0
:cond_0
- const/4 v0, 0x1
-
- :cond_1
return v0
.end method
diff --git a/com.discord/smali/com/discord/stores/StoreChangeLog.smali b/com.discord/smali/com/discord/stores/StoreChangeLog.smali
index d4fda00fa0..a6e4193f3a 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, 0x7f1203dd
+ const v2, 0x7f1203de
: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, 0x7f1203de
+ const v2, 0x7f1203df
if-eqz p5, :cond_3
@@ -618,19 +618,19 @@
const-string v4, "context.getString(R.string.change_log_md_body)"
- const v5, 0x7f1203dd
+ const v5, 0x7f1203de
const-string v6, "context.getString(R.string.change_log_md_video)"
- const v7, 0x7f1203e1
+ const v7, 0x7f1203e2
const-string v8, "context.getString(R.string.change_log_md_revision)"
- const v9, 0x7f1203e0
+ const v9, 0x7f1203e1
const-string v10, "context.getString(R.string.change_log_md_date)"
- const v11, 0x7f1203de
+ const v11, 0x7f1203df
const/4 v12, 0x1
diff --git a/com.discord/smali/com/discord/stores/StoreChannelCategories.smali b/com.discord/smali/com/discord/stores/StoreChannelCategories.smali
index 58f3e2ea22..efcf2daa22 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelCategories.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelCategories.smali
@@ -648,15 +648,13 @@
:cond_1
iget-object v1, p0, Lcom/discord/stores/StoreChannelCategories;->collapsedCategoriesCache:Lcom/discord/utilities/persister/Persister;
- const/4 v2, 0x2
+ const/4 v2, 0x1
- const/4 v3, 0x0
+ invoke-virtual {v1, v0, v2}, Lcom/discord/utilities/persister/Persister;->set(Ljava/lang/Object;Z)Ljava/lang/Object;
- const/4 v4, 0x0
+ const/4 v0, 0x0
- invoke-static {v1, v0, v4, v2, v3}, Lcom/discord/utilities/persister/Persister;->set$default(Lcom/discord/utilities/persister/Persister;Ljava/lang/Object;ZILjava/lang/Object;)Ljava/lang/Object;
-
- iput-boolean v4, p0, Lcom/discord/stores/StoreChannelCategories;->isDirty:Z
+ iput-boolean v0, p0, Lcom/discord/stores/StoreChannelCategories;->isDirty:Z
return-void
.end method
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembers.smali b/com.discord/smali/com/discord/stores/StoreChannelMembers.smali
index e68463ef78..88cd65768e 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, 0x7f12154f
+ const v6, 0x7f12155c
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 7778866450..3b4b7c8ff9 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, 0x7f1203cb
+ const p1, 0x7f1203cc
goto :goto_0
:cond_0
- const p1, 0x7f1203f7
+ const p1, 0x7f1203f8
:goto_0
const/4 v1, 0x0
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4$2.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4$2.smali
index dcf4fd9755..ea5eacc8ab 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected$findAndSet$4$2.smali
@@ -101,7 +101,7 @@
invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
- const-string v2, "/2131231478"
+ const-string v2, "/2131231479"
invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali
index bab63890f3..852c368e01 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, 0x4de
+ const/16 v0, 0x4df
iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I
diff --git a/com.discord/smali/com/discord/stores/StoreConnectionOpen$observeConnectionOpen$1.smali b/com.discord/smali/com/discord/stores/StoreConnectionOpen$observeConnectionOpen$1.smali
new file mode 100644
index 0000000000..da64f933e1
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreConnectionOpen$observeConnectionOpen$1.smali
@@ -0,0 +1,72 @@
+.class public final Lcom/discord/stores/StoreConnectionOpen$observeConnectionOpen$1;
+.super Lj0/n/c/i;
+.source "StoreConnectionOpen.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/stores/StoreConnectionOpen;->observeConnectionOpen(Z)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<",
+ "Ljava/lang/Boolean;",
+ ">;"
+ }
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/stores/StoreConnectionOpen;
+
+
+# direct methods
+.method public constructor (Lcom/discord/stores/StoreConnectionOpen;)V
+ .locals 0
+
+ iput-object p1, p0, Lcom/discord/stores/StoreConnectionOpen$observeConnectionOpen$1;->this$0:Lcom/discord/stores/StoreConnectionOpen;
+
+ 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/StoreConnectionOpen$observeConnectionOpen$1;->invoke()Z
+
+ move-result v0
+
+ invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+ move-result-object v0
+
+ return-object v0
+.end method
+
+.method public final invoke()Z
+ .locals 1
+
+ iget-object v0, p0, Lcom/discord/stores/StoreConnectionOpen$observeConnectionOpen$1;->this$0:Lcom/discord/stores/StoreConnectionOpen;
+
+ invoke-static {v0}, Lcom/discord/stores/StoreConnectionOpen;->access$isConnectionOpen$p(Lcom/discord/stores/StoreConnectionOpen;)Z
+
+ move-result v0
+
+ return v0
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreConnectionOpen.smali b/com.discord/smali/com/discord/stores/StoreConnectionOpen.smali
new file mode 100644
index 0000000000..55d2b5d0f8
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreConnectionOpen.smali
@@ -0,0 +1,230 @@
+.class public final Lcom/discord/stores/StoreConnectionOpen;
+.super Lcom/discord/stores/StoreV2;
+.source "StoreConnectionOpen.kt"
+
+
+# static fields
+.field public static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+
+# instance fields
+.field public final isConnectionOpen$delegate:Lcom/discord/stores/StoreV2$MarkChangedDelegate;
+
+
+# direct methods
+.method public static constructor ()V
+ .locals 5
+
+ const/4 v0, 0x1
+
+ new-array v0, v0, [Lkotlin/reflect/KProperty;
+
+ new-instance v1, Lj0/n/c/m;
+
+ const-class v2, Lcom/discord/stores/StoreConnectionOpen;
+
+ invoke-static {v2}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+
+ move-result-object v2
+
+ const-string v3, "isConnectionOpen"
+
+ const-string v4, "isConnectionOpen()Z"
+
+ invoke-direct {v1, v2, v3, v4}, Lj0/n/c/m;->(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+ invoke-static {v1}, Lj0/n/c/s;->mutableProperty1(Lj0/n/c/l;)Lj0/r/c;
+
+ const/4 v2, 0x0
+
+ aput-object v1, v0, v2
+
+ sput-object v0, Lcom/discord/stores/StoreConnectionOpen;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+ return-void
+.end method
+
+.method public constructor ()V
+ .locals 4
+
+ invoke-direct {p0}, Lcom/discord/stores/StoreV2;->()V
+
+ new-instance v0, Lcom/discord/stores/StoreV2$MarkChangedDelegate;
+
+ sget-object v1, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+ const/4 v2, 0x0
+
+ const/4 v3, 0x2
+
+ invoke-direct {v0, v1, v2, v3, v2}, Lcom/discord/stores/StoreV2$MarkChangedDelegate;->(Ljava/lang/Object;Lcom/discord/stores/updates/ObservationDeck$UpdateSource;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+ iput-object v0, p0, Lcom/discord/stores/StoreConnectionOpen;->isConnectionOpen$delegate:Lcom/discord/stores/StoreV2$MarkChangedDelegate;
+
+ return-void
+.end method
+
+.method public static final synthetic access$isConnectionOpen$p(Lcom/discord/stores/StoreConnectionOpen;)Z
+ .locals 0
+
+ invoke-direct {p0}, Lcom/discord/stores/StoreConnectionOpen;->isConnectionOpen()Z
+
+ move-result p0
+
+ return p0
+.end method
+
+.method public static final synthetic access$setConnectionOpen$p(Lcom/discord/stores/StoreConnectionOpen;Z)V
+ .locals 0
+
+ invoke-direct {p0, p1}, Lcom/discord/stores/StoreConnectionOpen;->setConnectionOpen(Z)V
+
+ return-void
+.end method
+
+.method private final isConnectionOpen()Z
+ .locals 3
+
+ iget-object v0, p0, Lcom/discord/stores/StoreConnectionOpen;->isConnectionOpen$delegate:Lcom/discord/stores/StoreV2$MarkChangedDelegate;
+
+ sget-object v1, Lcom/discord/stores/StoreConnectionOpen;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+ const/4 v2, 0x0
+
+ aget-object v1, v1, v2
+
+ invoke-virtual {v0, p0, v1}, Lcom/discord/stores/StoreV2$MarkChangedDelegate;->getValue(Lcom/discord/stores/StoreV2;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+
+ move-result-object v0
+
+ check-cast v0, Ljava/lang/Boolean;
+
+ invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
+
+ move-result v0
+
+ return v0
+.end method
+
+.method public static synthetic observeConnectionOpen$default(Lcom/discord/stores/StoreConnectionOpen;ZILjava/lang/Object;)Lrx/Observable;
+ .locals 0
+
+ const/4 p3, 0x1
+
+ and-int/2addr p2, p3
+
+ if-eqz p2, :cond_0
+
+ const/4 p1, 0x1
+
+ :cond_0
+ invoke-virtual {p0, p1}, Lcom/discord/stores/StoreConnectionOpen;->observeConnectionOpen(Z)Lrx/Observable;
+
+ move-result-object p0
+
+ return-object p0
+.end method
+
+.method private final setConnectionOpen(Z)V
+ .locals 3
+
+ iget-object v0, p0, Lcom/discord/stores/StoreConnectionOpen;->isConnectionOpen$delegate:Lcom/discord/stores/StoreV2$MarkChangedDelegate;
+
+ sget-object v1, Lcom/discord/stores/StoreConnectionOpen;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+ const/4 v2, 0x0
+
+ aget-object v1, v1, v2
+
+ invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+ move-result-object p1
+
+ invoke-virtual {v0, p0, v1, p1}, Lcom/discord/stores/StoreV2$MarkChangedDelegate;->setValue(Lcom/discord/stores/StoreV2;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public final handleConnected(Z)V
+ .locals 0
+ .annotation runtime Lcom/discord/stores/StoreThread;
+ .end annotation
+
+ if-nez p1, :cond_0
+
+ const/4 p1, 0x0
+
+ invoke-direct {p0, p1}, Lcom/discord/stores/StoreConnectionOpen;->setConnectionOpen(Z)V
+
+ :cond_0
+ return-void
+.end method
+
+.method public final handleConnectionOpen()V
+ .locals 1
+ .annotation runtime Lcom/discord/stores/StoreThread;
+ .end annotation
+
+ const/4 v0, 0x1
+
+ invoke-direct {p0, v0}, Lcom/discord/stores/StoreConnectionOpen;->setConnectionOpen(Z)V
+
+ return-void
+.end method
+
+.method public final observeConnectionOpen(Z)Lrx/Observable;
+ .locals 7
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(Z)",
+ "Lrx/Observable<",
+ "Ljava/lang/Boolean;",
+ ">;"
+ }
+ .end annotation
+
+ invoke-static {}, Lcom/discord/stores/updates/ObservationDeckProvider;->get()Lcom/discord/stores/updates/ObservationDeck;
+
+ move-result-object v0
+
+ const/4 v1, 0x1
+
+ new-array v1, v1, [Lcom/discord/stores/updates/ObservationDeck$UpdateSource;
+
+ const/4 v2, 0x0
+
+ aput-object p0, v1, v2
+
+ new-instance v4, Lcom/discord/stores/StoreConnectionOpen$observeConnectionOpen$1;
+
+ invoke-direct {v4, p0}, Lcom/discord/stores/StoreConnectionOpen$observeConnectionOpen$1;->(Lcom/discord/stores/StoreConnectionOpen;)V
+
+ const/4 v3, 0x0
+
+ const/4 v5, 0x6
+
+ const/4 v6, 0x0
+
+ invoke-static/range {v0 .. v6}, Lcom/discord/stores/updates/ObservationDeck;->connectRx$default(Lcom/discord/stores/updates/ObservationDeck;[Lcom/discord/stores/updates/ObservationDeck$UpdateSource;ZLrx/Emitter$BackpressureMode;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)Lrx/Observable;
+
+ move-result-object v0
+
+ if-eqz p1, :cond_0
+
+ const-wide/16 v1, 0x64
+
+ sget-object p1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+ invoke-virtual {v0, v1, v2, p1}, Lrx/Observable;->p(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+
+ move-result-object v0
+
+ const-string p1, "it.delay(100, TimeUnit.MILLISECONDS)"
+
+ invoke-static {v0, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ :cond_0
+ return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreConnectivity$Companion.smali b/com.discord/smali/com/discord/stores/StoreConnectivity$Companion.smali
new file mode 100644
index 0000000000..74b9c12746
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreConnectivity$Companion.smali
@@ -0,0 +1,121 @@
+.class public final Lcom/discord/stores/StoreConnectivity$Companion;
+.super Ljava/lang/Object;
+.source "StoreConnectivity.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+ value = Lcom/discord/stores/StoreConnectivity;
+.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/StoreConnectivity$Companion;->()V
+
+ return-void
+.end method
+
+.method public static final synthetic access$isDeviceConnectedOrConnecting(Lcom/discord/stores/StoreConnectivity$Companion;Landroid/content/Context;)Z
+ .locals 0
+
+ invoke-direct {p0, p1}, Lcom/discord/stores/StoreConnectivity$Companion;->isDeviceConnectedOrConnecting(Landroid/content/Context;)Z
+
+ move-result p0
+
+ return p0
+.end method
+
+.method private final isDeviceConnectedOrConnecting(Landroid/content/Context;)Z
+ .locals 6
+
+ const-string v0, "connectivity"
+
+ invoke-virtual {p1, v0}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
+
+ move-result-object p1
+
+ if-eqz p1, :cond_3
+
+ check-cast p1, Landroid/net/ConnectivityManager;
+
+ invoke-virtual {p1}, Landroid/net/ConnectivityManager;->getActiveNetworkInfo()Landroid/net/NetworkInfo;
+
+ move-result-object v0
+
+ const/4 v1, 0x1
+
+ if-eqz v0, :cond_0
+
+ invoke-virtual {v0}, Landroid/net/NetworkInfo;->isConnectedOrConnecting()Z
+
+ move-result v0
+
+ if-ne v0, v1, :cond_0
+
+ return v1
+
+ :cond_0
+ invoke-virtual {p1}, Landroid/net/ConnectivityManager;->getAllNetworks()[Landroid/net/Network;
+
+ move-result-object v0
+
+ const/4 v2, 0x0
+
+ if-eqz v0, :cond_2
+
+ array-length v3, v0
+
+ const/4 v4, 0x0
+
+ :goto_0
+ if-ge v4, v3, :cond_2
+
+ aget-object v5, v0, v4
+
+ invoke-virtual {p1, v5}, Landroid/net/ConnectivityManager;->getNetworkInfo(Landroid/net/Network;)Landroid/net/NetworkInfo;
+
+ move-result-object v5
+
+ if-eqz v5, :cond_1
+
+ invoke-virtual {v5}, Landroid/net/NetworkInfo;->isConnectedOrConnecting()Z
+
+ move-result v5
+
+ if-ne v5, v1, :cond_1
+
+ return v1
+
+ :cond_1
+ add-int/lit8 v4, v4, 0x1
+
+ goto :goto_0
+
+ :cond_2
+ return v2
+
+ :cond_3
+ new-instance p1, Lkotlin/TypeCastException;
+
+ const-string v0, "null cannot be cast to non-null type android.net.ConnectivityManager"
+
+ invoke-direct {p1, v0}, Lkotlin/TypeCastException;->(Ljava/lang/String;)V
+
+ throw p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreConnectivity$transitioningFromRecentlyForegroundedTimer$1.smali b/com.discord/smali/com/discord/stores/StoreConnectivity$transitioningFromRecentlyForegroundedTimer$1.smali
new file mode 100644
index 0000000000..91279288d4
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreConnectivity$transitioningFromRecentlyForegroundedTimer$1.smali
@@ -0,0 +1,80 @@
+.class public final Lcom/discord/stores/StoreConnectivity$transitioningFromRecentlyForegroundedTimer$1;
+.super Lj0/n/c/i;
+.source "StoreConnectivity.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/stores/StoreConnectivity;->transitioningFromRecentlyForegroundedTimer(Z)V
+.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<",
+ "Lrx/Subscription;",
+ "Lkotlin/Unit;",
+ ">;"
+ }
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/stores/StoreConnectivity;
+
+
+# direct methods
+.method public constructor (Lcom/discord/stores/StoreConnectivity;)V
+ .locals 0
+
+ iput-object p1, p0, Lcom/discord/stores/StoreConnectivity$transitioningFromRecentlyForegroundedTimer$1;->this$0:Lcom/discord/stores/StoreConnectivity;
+
+ const/4 p1, 0x1
+
+ invoke-direct {p0, p1}, 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, Lrx/Subscription;
+
+ invoke-virtual {p0, p1}, Lcom/discord/stores/StoreConnectivity$transitioningFromRecentlyForegroundedTimer$1;->invoke(Lrx/Subscription;)V
+
+ sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+ return-object p1
+.end method
+
+.method public final invoke(Lrx/Subscription;)V
+ .locals 1
+
+ if-eqz p1, :cond_0
+
+ iget-object v0, p0, Lcom/discord/stores/StoreConnectivity$transitioningFromRecentlyForegroundedTimer$1;->this$0:Lcom/discord/stores/StoreConnectivity;
+
+ invoke-static {v0, p1}, Lcom/discord/stores/StoreConnectivity;->access$setRecentlyForegroundedClearSubscription$p(Lcom/discord/stores/StoreConnectivity;Lrx/Subscription;)V
+
+ return-void
+
+ :cond_0
+ 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/stores/StoreConnectivity$transitioningFromRecentlyForegroundedTimer$2.smali b/com.discord/smali/com/discord/stores/StoreConnectivity$transitioningFromRecentlyForegroundedTimer$2.smali
new file mode 100644
index 0000000000..6ecad2e00b
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreConnectivity$transitioningFromRecentlyForegroundedTimer$2.smali
@@ -0,0 +1,69 @@
+.class public final Lcom/discord/stores/StoreConnectivity$transitioningFromRecentlyForegroundedTimer$2;
+.super Lj0/n/c/i;
+.source "StoreConnectivity.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/stores/StoreConnectivity;->transitioningFromRecentlyForegroundedTimer(Z)V
+.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<",
+ "Ljava/lang/Long;",
+ "Lkotlin/Unit;",
+ ">;"
+ }
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/stores/StoreConnectivity;
+
+
+# direct methods
+.method public constructor (Lcom/discord/stores/StoreConnectivity;)V
+ .locals 0
+
+ iput-object p1, p0, Lcom/discord/stores/StoreConnectivity$transitioningFromRecentlyForegroundedTimer$2;->this$0:Lcom/discord/stores/StoreConnectivity;
+
+ const/4 p1, 0x1
+
+ invoke-direct {p0, p1}, 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, Ljava/lang/Long;
+
+ invoke-virtual {p0, p1}, Lcom/discord/stores/StoreConnectivity$transitioningFromRecentlyForegroundedTimer$2;->invoke(Ljava/lang/Long;)V
+
+ sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+ return-object p1
+.end method
+
+.method public final invoke(Ljava/lang/Long;)V
+ .locals 0
+
+ iget-object p1, p0, Lcom/discord/stores/StoreConnectivity$transitioningFromRecentlyForegroundedTimer$2;->this$0:Lcom/discord/stores/StoreConnectivity;
+
+ invoke-static {p1}, Lcom/discord/stores/StoreConnectivity;->access$clearRecentlyForegrounded(Lcom/discord/stores/StoreConnectivity;)V
+
+ return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreConnectivity$updateConnectivityState$1.smali b/com.discord/smali/com/discord/stores/StoreConnectivity$updateConnectivityState$1.smali
new file mode 100644
index 0000000000..447ef92820
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreConnectivity$updateConnectivityState$1.smali
@@ -0,0 +1,80 @@
+.class public final Lcom/discord/stores/StoreConnectivity$updateConnectivityState$1;
+.super Lj0/n/c/i;
+.source "StoreConnectivity.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/stores/StoreConnectivity;->updateConnectivityState()V
+.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<",
+ "Lrx/Subscription;",
+ "Lkotlin/Unit;",
+ ">;"
+ }
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/stores/StoreConnectivity;
+
+
+# direct methods
+.method public constructor (Lcom/discord/stores/StoreConnectivity;)V
+ .locals 0
+
+ iput-object p1, p0, Lcom/discord/stores/StoreConnectivity$updateConnectivityState$1;->this$0:Lcom/discord/stores/StoreConnectivity;
+
+ const/4 p1, 0x1
+
+ invoke-direct {p0, p1}, 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, Lrx/Subscription;
+
+ invoke-virtual {p0, p1}, Lcom/discord/stores/StoreConnectivity$updateConnectivityState$1;->invoke(Lrx/Subscription;)V
+
+ sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+ return-object p1
+.end method
+
+.method public final invoke(Lrx/Subscription;)V
+ .locals 1
+
+ if-eqz p1, :cond_0
+
+ iget-object v0, p0, Lcom/discord/stores/StoreConnectivity$updateConnectivityState$1;->this$0:Lcom/discord/stores/StoreConnectivity;
+
+ invoke-static {v0, p1}, Lcom/discord/stores/StoreConnectivity;->access$setConnectingTransitionTimerSubscription$p(Lcom/discord/stores/StoreConnectivity;Lrx/Subscription;)V
+
+ return-void
+
+ :cond_0
+ 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/stores/StoreNavigation$init$3.smali b/com.discord/smali/com/discord/stores/StoreConnectivity$updateConnectivityState$2.smali
similarity index 51%
rename from com.discord/smali/com/discord/stores/StoreNavigation$init$3.smali
rename to com.discord/smali/com/discord/stores/StoreConnectivity$updateConnectivityState$2.smali
index 9609db83b7..008125586c 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$init$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreConnectivity$updateConnectivityState$2.smali
@@ -1,6 +1,6 @@
-.class public final Lcom/discord/stores/StoreNavigation$init$3;
+.class public final Lcom/discord/stores/StoreConnectivity$updateConnectivityState$2;
.super Lj0/n/c/i;
-.source "StoreNavigation.kt"
+.source "StoreConnectivity.kt"
# interfaces
.implements Lkotlin/jvm/functions/Function1;
@@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/stores/StoreNavigation;->init(Landroid/app/Application;)V
+ value = Lcom/discord/stores/StoreConnectivity;->updateConnectivityState()V
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
@@ -28,14 +28,14 @@
# instance fields
-.field public final synthetic this$0:Lcom/discord/stores/StoreNavigation;
+.field public final synthetic this$0:Lcom/discord/stores/StoreConnectivity;
# direct methods
-.method public constructor (Lcom/discord/stores/StoreNavigation;)V
+.method public constructor (Lcom/discord/stores/StoreConnectivity;)V
.locals 0
- iput-object p1, p0, Lcom/discord/stores/StoreNavigation$init$3;->this$0:Lcom/discord/stores/StoreNavigation;
+ iput-object p1, p0, Lcom/discord/stores/StoreConnectivity$updateConnectivityState$2;->this$0:Lcom/discord/stores/StoreConnectivity;
const/4 p1, 0x1
@@ -51,7 +51,7 @@
check-cast p1, Ljava/lang/Long;
- invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNavigation$init$3;->invoke(Ljava/lang/Long;)V
+ invoke-virtual {p0, p1}, Lcom/discord/stores/StoreConnectivity$updateConnectivityState$2;->invoke(Ljava/lang/Long;)V
sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
@@ -59,11 +59,13 @@
.end method
.method public final invoke(Ljava/lang/Long;)V
- .locals 0
+ .locals 1
- iget-object p1, p0, Lcom/discord/stores/StoreNavigation$init$3;->this$0:Lcom/discord/stores/StoreNavigation;
+ iget-object p1, p0, Lcom/discord/stores/StoreConnectivity$updateConnectivityState$2;->this$0:Lcom/discord/stores/StoreConnectivity;
- invoke-static {p1}, Lcom/discord/stores/StoreNavigation;->access$displayConnectionErrorNotice(Lcom/discord/stores/StoreNavigation;)V
+ const/4 v0, 0x3
+
+ invoke-static {p1, v0}, Lcom/discord/stores/StoreConnectivity;->access$setState(Lcom/discord/stores/StoreConnectivity;I)V
return-void
.end method
diff --git a/com.discord/smali/com/discord/stores/StoreConnectivity.smali b/com.discord/smali/com/discord/stores/StoreConnectivity.smali
index 4e97b2c78a..353aacc29b 100644
--- a/com.discord/smali/com/discord/stores/StoreConnectivity.smali
+++ b/com.discord/smali/com/discord/stores/StoreConnectivity.smali
@@ -1,6 +1,14 @@
-.class public Lcom/discord/stores/StoreConnectivity;
+.class public final Lcom/discord/stores/StoreConnectivity;
.super Landroid/content/BroadcastReceiver;
-.source "StoreConnectivity.java"
+.source "StoreConnectivity.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+ value = {
+ Lcom/discord/stores/StoreConnectivity$Companion;
+ }
+.end annotation
# static fields
@@ -8,6 +16,8 @@
.field public static final CONNECTING_DELAY_PASSIVE:J = 0x7530L
+.field public static final Companion:Lcom/discord/stores/StoreConnectivity$Companion;
+
.field public static final RECENTLY_FOREGROUNDED_WINDOW:J = 0x7530L
.field public static final STATE_CONNECTING:I = 0x3
@@ -18,21 +28,8 @@
# instance fields
-.field public final $lock:Ljava/lang/Object;
-
.field public connectingTransitionTimerSubscription:Lrx/Subscription;
-.field public final connectionOpenSubject:Lrx/subjects/Subject;
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "Lrx/subjects/Subject<",
- "Ljava/lang/Boolean;",
- "Ljava/lang/Boolean;",
- ">;"
- }
- .end annotation
-.end field
-
.field public deviceNetworkOffline:Z
.field public optimisticallyConnected:Z
@@ -56,17 +53,25 @@
# direct methods
+.method public static constructor ()V
+ .locals 2
+
+ new-instance v0, Lcom/discord/stores/StoreConnectivity$Companion;
+
+ const/4 v1, 0x0
+
+ invoke-direct {v0, v1}, Lcom/discord/stores/StoreConnectivity$Companion;->(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+ sput-object v0, Lcom/discord/stores/StoreConnectivity;->Companion:Lcom/discord/stores/StoreConnectivity$Companion;
+
+ return-void
+.end method
+
.method public constructor ()V
.locals 2
invoke-direct {p0}, Landroid/content/BroadcastReceiver;->()V
- const/4 v0, 0x0
-
- new-array v0, v0, [Ljava/lang/Object;
-
- iput-object v0, p0, Lcom/discord/stores/StoreConnectivity;->$lock:Ljava/lang/Object;
-
const/4 v0, 0x1
iput-boolean v0, p0, Lcom/discord/stores/StoreConnectivity;->recentlyForegrounded:Z
@@ -85,27 +90,85 @@
iput-object v1, p0, Lcom/discord/stores/StoreConnectivity;->statePublisher:Lrx/subjects/Subject;
- new-instance v0, Lrx/subjects/SerializedSubject;
+ return-void
+.end method
- sget-object v1, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+.method public static final synthetic access$clearRecentlyForegrounded(Lcom/discord/stores/StoreConnectivity;)V
+ .locals 0
- invoke-static {v1}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
-
- move-result-object v1
-
- invoke-direct {v0, v1}, Lrx/subjects/SerializedSubject;->(Lrx/subjects/Subject;)V
-
- iput-object v0, p0, Lcom/discord/stores/StoreConnectivity;->connectionOpenSubject:Lrx/subjects/Subject;
+ invoke-direct {p0}, Lcom/discord/stores/StoreConnectivity;->clearRecentlyForegrounded()V
return-void
.end method
-.method private handleDeviceConnectivityChange(Z)V
+.method public static final synthetic access$getConnectingTransitionTimerSubscription$p(Lcom/discord/stores/StoreConnectivity;)Lrx/Subscription;
+ .locals 0
+
+ iget-object p0, p0, Lcom/discord/stores/StoreConnectivity;->connectingTransitionTimerSubscription:Lrx/Subscription;
+
+ return-object p0
+.end method
+
+.method public static final synthetic access$getRecentlyForegroundedClearSubscription$p(Lcom/discord/stores/StoreConnectivity;)Lrx/Subscription;
+ .locals 0
+
+ iget-object p0, p0, Lcom/discord/stores/StoreConnectivity;->recentlyForegroundedClearSubscription:Lrx/Subscription;
+
+ return-object p0
+.end method
+
+.method public static final synthetic access$setConnectingTransitionTimerSubscription$p(Lcom/discord/stores/StoreConnectivity;Lrx/Subscription;)V
+ .locals 0
+
+ iput-object p1, p0, Lcom/discord/stores/StoreConnectivity;->connectingTransitionTimerSubscription:Lrx/Subscription;
+
+ return-void
+.end method
+
+.method public static final synthetic access$setRecentlyForegroundedClearSubscription$p(Lcom/discord/stores/StoreConnectivity;Lrx/Subscription;)V
+ .locals 0
+
+ iput-object p1, p0, Lcom/discord/stores/StoreConnectivity;->recentlyForegroundedClearSubscription:Lrx/Subscription;
+
+ return-void
+.end method
+
+.method public static final synthetic access$setState(Lcom/discord/stores/StoreConnectivity;I)V
+ .locals 0
+
+ invoke-direct {p0, p1}, Lcom/discord/stores/StoreConnectivity;->setState(I)V
+
+ return-void
+.end method
+
+.method private final declared-synchronized clearRecentlyForegrounded()V
.locals 1
- iget-object v0, p0, Lcom/discord/stores/StoreConnectivity;->$lock:Ljava/lang/Object;
+ monitor-enter p0
- monitor-enter v0
+ const/4 v0, 0x0
+
+ :try_start_0
+ iput-boolean v0, p0, Lcom/discord/stores/StoreConnectivity;->recentlyForegrounded:Z
+ :try_end_0
+ .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+ monitor-exit p0
+
+ return-void
+
+ :catchall_0
+ move-exception v0
+
+ monitor-exit p0
+
+ throw v0
+.end method
+
+.method private final declared-synchronized handleDeviceConnectivityChange(Z)V
+ .locals 0
+
+ monitor-enter p0
if-nez p1, :cond_0
@@ -121,165 +184,65 @@
iput-boolean p1, p0, Lcom/discord/stores/StoreConnectivity;->deviceNetworkOffline:Z
invoke-direct {p0}, Lcom/discord/stores/StoreConnectivity;->updateConnectivityState()V
+ :try_end_0
+ .catchall {:try_start_0 .. :try_end_0} :catchall_0
- monitor-exit v0
+ monitor-exit p0
return-void
:catchall_0
move-exception p1
- monitor-exit v0
- :try_end_0
- .catchall {:try_start_0 .. :try_end_0} :catchall_0
+ monitor-exit p0
throw p1
.end method
-.method public static isDeviceConnectedOrConnecting(Landroid/content/Context;)Z
- .locals 6
- .param p0 # Landroid/content/Context;
- .annotation build Landroidx/annotation/NonNull;
- .end annotation
- .end param
-
- const-string v0, "connectivity"
-
- invoke-virtual {p0, v0}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
-
- move-result-object p0
-
- check-cast p0, Landroid/net/ConnectivityManager;
-
- const/4 v0, 0x0
-
- if-nez p0, :cond_0
-
- return v0
-
- :cond_0
- invoke-virtual {p0}, Landroid/net/ConnectivityManager;->getActiveNetworkInfo()Landroid/net/NetworkInfo;
-
- move-result-object v1
-
- const/4 v2, 0x1
-
- if-eqz v1, :cond_1
-
- invoke-virtual {v1}, Landroid/net/NetworkInfo;->isConnectedOrConnecting()Z
-
- move-result v1
-
- if-eqz v1, :cond_1
-
- return v2
-
- :cond_1
- invoke-virtual {p0}, Landroid/net/ConnectivityManager;->getAllNetworks()[Landroid/net/Network;
-
- move-result-object v1
-
- if-eqz v1, :cond_3
-
- array-length v3, v1
-
- const/4 v4, 0x0
-
- :goto_0
- if-ge v4, v3, :cond_3
-
- aget-object v5, v1, v4
-
- invoke-virtual {p0, v5}, Landroid/net/ConnectivityManager;->getNetworkInfo(Landroid/net/Network;)Landroid/net/NetworkInfo;
-
- move-result-object v5
-
- if-eqz v5, :cond_2
-
- invoke-virtual {v5}, Landroid/net/NetworkInfo;->isConnectedOrConnecting()Z
-
- move-result v5
-
- if-eqz v5, :cond_2
-
- return v2
-
- :cond_2
- add-int/lit8 v4, v4, 0x1
-
- goto :goto_0
-
- :cond_3
- return v0
-.end method
-
-.method private setRecentlyForegrounded(Z)V
+.method private final declared-synchronized setState(I)V
.locals 1
- iget-object v0, p0, Lcom/discord/stores/StoreConnectivity;->$lock:Ljava/lang/Object;
-
- monitor-enter v0
+ monitor-enter p0
:try_start_0
- iput-boolean p1, p0, Lcom/discord/stores/StoreConnectivity;->recentlyForegrounded:Z
-
- monitor-exit v0
-
- return-void
-
- :catchall_0
- move-exception p1
-
- monitor-exit v0
+ iget v0, p0, Lcom/discord/stores/StoreConnectivity;->state:I
:try_end_0
.catchall {:try_start_0 .. :try_end_0} :catchall_0
- throw p1
-.end method
+ if-ne v0, p1, :cond_0
-.method private setState(I)V
- .locals 2
-
- iget-object v0, p0, Lcom/discord/stores/StoreConnectivity;->$lock:Ljava/lang/Object;
-
- monitor-enter v0
-
- :try_start_0
- iget v1, p0, Lcom/discord/stores/StoreConnectivity;->state:I
-
- if-ne v1, p1, :cond_0
-
- monitor-exit v0
+ monitor-exit p0
return-void
:cond_0
+ :try_start_1
iput p1, p0, Lcom/discord/stores/StoreConnectivity;->state:I
- iget-object v1, p0, Lcom/discord/stores/StoreConnectivity;->statePublisher:Lrx/subjects/Subject;
+ iget-object v0, p0, Lcom/discord/stores/StoreConnectivity;->statePublisher:Lrx/subjects/Subject;
invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
move-result-object p1
- invoke-interface {v1, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+ invoke-interface {v0, p1}, Lr0/g;->onNext(Ljava/lang/Object;)V
+ :try_end_1
+ .catchall {:try_start_1 .. :try_end_1} :catchall_0
- monitor-exit v0
+ monitor-exit p0
return-void
:catchall_0
move-exception p1
- monitor-exit v0
- :try_end_0
- .catchall {:try_start_0 .. :try_end_0} :catchall_0
+ monitor-exit p0
throw p1
.end method
-.method private transitioningFromRecentlyForegroundedTimer(Z)V
- .locals 6
+.method private final transitioningFromRecentlyForegroundedTimer(Z)V
+ .locals 10
iget-object v0, p0, Lcom/discord/stores/StoreConnectivity;->recentlyForegroundedClearSubscription:Lrx/Subscription;
@@ -287,11 +250,11 @@
invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
+ :cond_0
const/4 v0, 0x0
iput-object v0, p0, Lcom/discord/stores/StoreConnectivity;->recentlyForegroundedClearSubscription:Lrx/Subscription;
- :cond_0
if-eqz p1, :cond_1
return-void
@@ -305,41 +268,41 @@
move-result-object p1
- const-string v0, "observable"
+ const-string v0, "Observable\n .time\u2026W, TimeUnit.MILLISECONDS)"
invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
+ invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
- move-result-object p1
+ move-result-object v1
- new-instance v0, Lf/a/k/b;
+ const-class v2, Lcom/discord/stores/StoreConnectivity;
- invoke-direct {v0, p0}, Lf/a/k/b;->(Lcom/discord/stores/StoreConnectivity;)V
+ const/4 v3, 0x0
- const-class v1, Lcom/discord/stores/StoreConnectivity;
+ new-instance v4, Lcom/discord/stores/StoreConnectivity$transitioningFromRecentlyForegroundedTimer$1;
- const/4 v2, 0x0
+ invoke-direct {v4, p0}, Lcom/discord/stores/StoreConnectivity$transitioningFromRecentlyForegroundedTimer$1;->(Lcom/discord/stores/StoreConnectivity;)V
- new-instance v3, Lf/a/k/c;
+ const/4 v5, 0x0
- invoke-direct {v3, p0}, Lf/a/k/c;->(Lcom/discord/stores/StoreConnectivity;)V
+ const/4 v6, 0x0
- const/4 v4, 0x0
+ new-instance v7, Lcom/discord/stores/StoreConnectivity$transitioningFromRecentlyForegroundedTimer$2;
- const/16 v5, 0x10
+ invoke-direct {v7, p0}, Lcom/discord/stores/StoreConnectivity$transitioningFromRecentlyForegroundedTimer$2;->(Lcom/discord/stores/StoreConnectivity;)V
- invoke-static/range {v0 .. v5}, Lf/a/b/q;->i(Lrx/functions/Action1;Ljava/lang/Class;Lrx/functions/Action1;Lrx/functions/Action1;Landroid/content/Context;I)Lrx/Observable$c;
+ const/16 v8, 0x1a
- move-result-object v0
+ const/4 v9, 0x0
- invoke-virtual {p1, v0}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
+ invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
return-void
.end method
-.method private updateConnectivityState()V
- .locals 7
+.method private final updateConnectivityState()V
+ .locals 11
iget-object v0, p0, Lcom/discord/stores/StoreConnectivity;->connectingTransitionTimerSubscription:Lrx/Subscription;
@@ -347,11 +310,11 @@
invoke-interface {v0}, Lrx/Subscription;->unsubscribe()V
+ :cond_0
const/4 v0, 0x0
iput-object v0, p0, Lcom/discord/stores/StoreConnectivity;->connectingTransitionTimerSubscription:Lrx/Subscription;
- :cond_0
iget-boolean v0, p0, Lcom/discord/stores/StoreConnectivity;->deviceNetworkOffline:Z
const/4 v1, 0x2
@@ -403,35 +366,35 @@
move-result-object v0
- const-string v1, "observable"
+ const-string v1, "Observable\n .\u2026ILLISECONDS\n )"
invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
+ invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
- move-result-object v0
+ move-result-object v2
- new-instance v1, Lf/a/k/e;
+ const-class v3, Lcom/discord/stores/StoreConnectivity;
- invoke-direct {v1, p0}, Lf/a/k/e;->(Lcom/discord/stores/StoreConnectivity;)V
+ const/4 v4, 0x0
- const-class v2, Lcom/discord/stores/StoreConnectivity;
+ new-instance v5, Lcom/discord/stores/StoreConnectivity$updateConnectivityState$1;
- const/4 v3, 0x0
+ invoke-direct {v5, p0}, Lcom/discord/stores/StoreConnectivity$updateConnectivityState$1;->(Lcom/discord/stores/StoreConnectivity;)V
- new-instance v4, Lf/a/k/d;
+ const/4 v6, 0x0
- invoke-direct {v4, p0}, Lf/a/k/d;->(Lcom/discord/stores/StoreConnectivity;)V
+ const/4 v7, 0x0
- const/4 v5, 0x0
+ new-instance v8, Lcom/discord/stores/StoreConnectivity$updateConnectivityState$2;
- const/16 v6, 0x10
+ invoke-direct {v8, p0}, Lcom/discord/stores/StoreConnectivity$updateConnectivityState$2;->(Lcom/discord/stores/StoreConnectivity;)V
- invoke-static/range {v1 .. v6}, Lf/a/b/q;->i(Lrx/functions/Action1;Ljava/lang/Class;Lrx/functions/Action1;Lrx/functions/Action1;Landroid/content/Context;I)Lrx/Observable$c;
+ const/16 v9, 0x1a
- move-result-object v1
+ const/4 v10, 0x0
- invoke-virtual {v0, v1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
+ invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
:goto_1
return-void
@@ -439,102 +402,10 @@
# virtual methods
-.method public synthetic a(Ljava/lang/Long;)V
+.method public final declared-synchronized handleBackgrounded(Z)V
.locals 0
- const/4 p1, 0x0
-
- invoke-direct {p0, p1}, Lcom/discord/stores/StoreConnectivity;->setRecentlyForegrounded(Z)V
-
- return-void
-.end method
-
-.method public synthetic b(Lrx/Subscription;)V
- .locals 0
-
- iput-object p1, p0, Lcom/discord/stores/StoreConnectivity;->recentlyForegroundedClearSubscription:Lrx/Subscription;
-
- return-void
-.end method
-
-.method public synthetic c(Ljava/lang/Long;)V
- .locals 0
-
- const/4 p1, 0x3
-
- invoke-direct {p0, p1}, Lcom/discord/stores/StoreConnectivity;->setState(I)V
-
- return-void
-.end method
-
-.method public synthetic d(Lrx/Subscription;)V
- .locals 0
-
- iput-object p1, p0, Lcom/discord/stores/StoreConnectivity;->connectingTransitionTimerSubscription:Lrx/Subscription;
-
- return-void
-.end method
-
-.method public getConnectionOpen()Lrx/Observable;
- .locals 4
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "()",
- "Lrx/Observable<",
- "Ljava/lang/Boolean;",
- ">;"
- }
- .end annotation
-
- iget-object v0, p0, Lcom/discord/stores/StoreConnectivity;->connectionOpenSubject:Lrx/subjects/Subject;
-
- const-string v1, "observable"
-
- invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
-
- move-result-object v0
-
- const-wide/16 v1, 0x64
-
- sget-object v3, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
- invoke-virtual {v0, v1, v2, v3}, Lrx/Observable;->p(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
-
- move-result-object v0
-
- return-object v0
-.end method
-
-.method public getState()Lrx/Observable;
- .locals 2
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "()",
- "Lrx/Observable<",
- "Ljava/lang/Integer;",
- ">;"
- }
- .end annotation
-
- iget-object v0, p0, Lcom/discord/stores/StoreConnectivity;->statePublisher:Lrx/subjects/Subject;
-
- sget-object v1, Lf/a/b/o;->d:Lf/a/b/o;
-
- invoke-virtual {v0, v1}, Lrx/Observable;->k(Lrx/Observable$c;)Lrx/Observable;
-
- move-result-object v0
-
- return-object v0
-.end method
-
-.method public handleBackgrounded(Z)V
- .locals 1
-
- iget-object v0, p0, Lcom/discord/stores/StoreConnectivity;->$lock:Ljava/lang/Object;
-
- monitor-enter v0
+ monitor-enter p0
:try_start_0
invoke-direct {p0, p1}, Lcom/discord/stores/StoreConnectivity;->transitioningFromRecentlyForegroundedTimer(Z)V
@@ -552,95 +423,54 @@
iput-boolean p1, p0, Lcom/discord/stores/StoreConnectivity;->recentlyForegrounded:Z
invoke-direct {p0}, Lcom/discord/stores/StoreConnectivity;->updateConnectivityState()V
+ :try_end_0
+ .catchall {:try_start_0 .. :try_end_0} :catchall_0
- monitor-exit v0
+ monitor-exit p0
return-void
:catchall_0
move-exception p1
- monitor-exit v0
- :try_end_0
- .catchall {:try_start_0 .. :try_end_0} :catchall_0
+ monitor-exit p0
throw p1
.end method
-.method public handleConnected(Z)V
- .locals 2
+.method public final declared-synchronized handleConnected(Z)V
+ .locals 0
- iget-object v0, p0, Lcom/discord/stores/StoreConnectivity;->$lock:Ljava/lang/Object;
-
- monitor-enter v0
+ monitor-enter p0
:try_start_0
iput-boolean p1, p0, Lcom/discord/stores/StoreConnectivity;->optimisticallyConnected:Z
invoke-direct {p0}, Lcom/discord/stores/StoreConnectivity;->updateConnectivityState()V
+ :try_end_0
+ .catchall {:try_start_0 .. :try_end_0} :catchall_0
- if-nez p1, :cond_0
-
- iget-object p1, p0, Lcom/discord/stores/StoreConnectivity;->connectionOpenSubject:Lrx/subjects/Subject;
-
- sget-object v1, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-
- invoke-interface {p1, v1}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
- :cond_0
- monitor-exit v0
+ monitor-exit p0
return-void
:catchall_0
move-exception p1
- monitor-exit v0
- :try_end_0
- .catchall {:try_start_0 .. :try_end_0} :catchall_0
+ monitor-exit p0
throw p1
.end method
-.method public handleConnectionOpen()V
- .locals 3
+.method public final declared-synchronized handleConnectionReady(Z)V
+ .locals 1
- iget-object v0, p0, Lcom/discord/stores/StoreConnectivity;->$lock:Ljava/lang/Object;
-
- monitor-enter v0
+ monitor-enter p0
:try_start_0
- iget-object v1, p0, Lcom/discord/stores/StoreConnectivity;->connectionOpenSubject:Lrx/subjects/Subject;
+ iget-boolean v0, p0, Lcom/discord/stores/StoreConnectivity;->deviceNetworkOffline:Z
- sget-object v2, Ljava/lang/Boolean;->TRUE:Ljava/lang/Boolean;
-
- invoke-interface {v1, v2}, Lr0/g;->onNext(Ljava/lang/Object;)V
-
- monitor-exit v0
-
- return-void
-
- :catchall_0
- move-exception v1
-
- monitor-exit v0
- :try_end_0
- .catchall {:try_start_0 .. :try_end_0} :catchall_0
-
- throw v1
-.end method
-
-.method public handleConnectionReady(Z)V
- .locals 2
-
- iget-object v0, p0, Lcom/discord/stores/StoreConnectivity;->$lock:Ljava/lang/Object;
-
- monitor-enter v0
-
- :try_start_0
- iget-boolean v1, p0, Lcom/discord/stores/StoreConnectivity;->deviceNetworkOffline:Z
-
- if-eqz v1, :cond_0
+ if-eqz v0, :cond_0
if-eqz p1, :cond_0
@@ -650,69 +480,121 @@
:cond_0
invoke-direct {p0}, Lcom/discord/stores/StoreConnectivity;->updateConnectivityState()V
+ :try_end_0
+ .catchall {:try_start_0 .. :try_end_0} :catchall_0
- monitor-exit v0
+ monitor-exit p0
return-void
:catchall_0
move-exception p1
- monitor-exit v0
- :try_end_0
- .catchall {:try_start_0 .. :try_end_0} :catchall_0
+ monitor-exit p0
throw p1
.end method
-.method public init(Landroid/content/Context;)V
- .locals 3
- .param p1 # Landroid/content/Context;
- .annotation build Landroidx/annotation/NonNull;
- .end annotation
- .end param
+.method public final declared-synchronized init(Landroid/content/Context;)V
+ .locals 2
- iget-object v0, p0, Lcom/discord/stores/StoreConnectivity;->$lock:Ljava/lang/Object;
-
- monitor-enter v0
+ monitor-enter p0
:try_start_0
- new-instance v1, Landroid/content/IntentFilter;
+ const-string v0, "context"
- const-string v2, "android.net.conn.CONNECTIVITY_CHANGE"
+ if-eqz p1, :cond_0
- invoke-direct {v1, v2}, Landroid/content/IntentFilter;->(Ljava/lang/String;)V
+ new-instance v0, Landroid/content/IntentFilter;
- invoke-virtual {p1, p0, v1}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)Landroid/content/Intent;
+ const-string v1, "android.net.conn.CONNECTIVITY_CHANGE"
- invoke-static {p1}, Lcom/discord/stores/StoreConnectivity;->isDeviceConnectedOrConnecting(Landroid/content/Context;)Z
+ invoke-direct {v0, v1}, Landroid/content/IntentFilter;->(Ljava/lang/String;)V
+
+ invoke-virtual {p1, p0, v0}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)Landroid/content/Intent;
+
+ sget-object v0, Lcom/discord/stores/StoreConnectivity;->Companion:Lcom/discord/stores/StoreConnectivity$Companion;
+
+ invoke-static {v0, p1}, Lcom/discord/stores/StoreConnectivity$Companion;->access$isDeviceConnectedOrConnecting(Lcom/discord/stores/StoreConnectivity$Companion;Landroid/content/Context;)Z
move-result p1
invoke-direct {p0, p1}, Lcom/discord/stores/StoreConnectivity;->handleDeviceConnectivityChange(Z)V
+ :try_end_0
+ .catchall {:try_start_0 .. :try_end_0} :catchall_0
- monitor-exit v0
+ monitor-exit p0
return-void
+ :cond_0
+ :try_start_1
+ invoke-static {v0}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+ :try_end_1
+ .catchall {:try_start_1 .. :try_end_1} :catchall_0
+
+ const/4 p1, 0x0
+
+ throw p1
+
:catchall_0
move-exception p1
- monitor-exit v0
- :try_end_0
- .catchall {:try_start_0 .. :try_end_0} :catchall_0
+ monitor-exit p0
throw p1
.end method
+.method public final observeState()Lrx/Observable;
+ .locals 1
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "()",
+ "Lrx/Observable<",
+ "Ljava/lang/Integer;",
+ ">;"
+ }
+ .end annotation
+
+ iget-object v0, p0, Lcom/discord/stores/StoreConnectivity;->statePublisher:Lrx/subjects/Subject;
+
+ invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
+
+ move-result-object v0
+
+ return-object v0
+.end method
+
.method public onReceive(Landroid/content/Context;Landroid/content/Intent;)V
- .locals 0
+ .locals 1
- invoke-static {p1}, Lcom/discord/stores/StoreConnectivity;->isDeviceConnectedOrConnecting(Landroid/content/Context;)Z
+ const/4 v0, 0x0
+
+ if-eqz p1, :cond_1
+
+ if-eqz p2, :cond_0
+
+ sget-object p2, Lcom/discord/stores/StoreConnectivity;->Companion:Lcom/discord/stores/StoreConnectivity$Companion;
+
+ invoke-static {p2, p1}, Lcom/discord/stores/StoreConnectivity$Companion;->access$isDeviceConnectedOrConnecting(Lcom/discord/stores/StoreConnectivity$Companion;Landroid/content/Context;)Z
move-result p1
invoke-direct {p0, p1}, Lcom/discord/stores/StoreConnectivity;->handleDeviceConnectivityChange(Z)V
return-void
+
+ :cond_0
+ const-string p1, "intent"
+
+ invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+
+ throw v0
+
+ :cond_1
+ const-string p1, "context"
+
+ invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+
+ throw v0
.end method
diff --git a/com.discord/smali/com/discord/stores/StoreEmoji.smali b/com.discord/smali/com/discord/stores/StoreEmoji.smali
index c9bd7599bc..bc5b47536b 100644
--- a/com.discord/smali/com/discord/stores/StoreEmoji.smali
+++ b/com.discord/smali/com/discord/stores/StoreEmoji.smali
@@ -1541,6 +1541,24 @@
throw v0
.end method
+.method public final handlePreLogout()V
+ .locals 4
+ .annotation runtime Lcom/discord/stores/StoreThread;
+ .end annotation
+
+ iget-object v0, p0, Lcom/discord/stores/StoreEmoji;->frecencyCache:Lcom/discord/utilities/persister/Persister;
+
+ const/4 v1, 0x0
+
+ const/4 v2, 0x1
+
+ const/4 v3, 0x0
+
+ invoke-static {v0, v1, v2, v3}, Lcom/discord/utilities/persister/Persister;->clear$default(Lcom/discord/utilities/persister/Persister;ZILjava/lang/Object;)Ljava/lang/Object;
+
+ return-void
+.end method
+
.method public final initBlocking(Landroid/content/Context;)V
.locals 0
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali
index 5c51830486..0032604a7d 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, 0x7f1204a9
+ const p1, 0x7f1204aa
goto :goto_0
@@ -70,7 +70,7 @@
if-eqz p2, :cond_1
- const p1, 0x7f1204a6
+ const p1, 0x7f1204a7
goto :goto_0
@@ -83,7 +83,7 @@
if-eqz p2, :cond_2
- const p1, 0x7f1204a5
+ const p1, 0x7f1204a6
goto :goto_0
@@ -96,7 +96,7 @@
if-eqz p2, :cond_3
- const p1, 0x7f1204a8
+ const p1, 0x7f1204a9
goto :goto_0
@@ -109,7 +109,7 @@
if-eqz p2, :cond_4
- const p1, 0x7f1204ad
+ const p1, 0x7f1204ae
goto :goto_0
@@ -122,7 +122,7 @@
if-eqz p2, :cond_5
- const p1, 0x7f1204ac
+ const p1, 0x7f1204ad
goto :goto_0
@@ -135,7 +135,7 @@
if-eqz p2, :cond_6
- const p1, 0x7f1204a7
+ const p1, 0x7f1204a8
goto :goto_0
@@ -148,7 +148,7 @@
if-eqz p1, :cond_7
- const p1, 0x7f1204ab
+ const p1, 0x7f1204ac
: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 2e32294aec..9132de1ad2 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, 0x7f121755
+ const v1, 0x7f121762
const/4 v2, 0x0
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings.smali
index 040e343114..8358bdc7a1 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings.smali
@@ -167,6 +167,29 @@
.end annotation
.end field
+.field public voiceParticipantsHidden:Z
+
+.field public final voiceParticipantsHiddenCache:Lcom/discord/utilities/persister/Persister;
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Lcom/discord/utilities/persister/Persister<",
+ "Ljava/lang/Boolean;",
+ ">;"
+ }
+ .end annotation
+.end field
+
+.field public final voiceParticipantsHiddenSubject:Lrx/subjects/SerializedSubject;
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Lrx/subjects/SerializedSubject<",
+ "Ljava/lang/Boolean;",
+ "Ljava/lang/Boolean;",
+ ">;"
+ }
+ .end annotation
+.end field
+
# direct methods
.method public static constructor ()V
@@ -240,6 +263,16 @@
iput-object p1, p0, Lcom/discord/stores/StoreMediaSettings;->audioModeCache:Lcom/discord/utilities/persister/Persister;
+ new-instance p1, Lcom/discord/utilities/persister/Persister;
+
+ sget-object v1, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+ const-string v2, "CACHE_KEY_HIDE_VOICE_PARTICIPANTS"
+
+ invoke-direct {p1, v2, v1}, Lcom/discord/utilities/persister/Persister;->(Ljava/lang/String;Ljava/lang/Object;)V
+
+ iput-object p1, p0, Lcom/discord/stores/StoreMediaSettings;->voiceParticipantsHiddenCache:Lcom/discord/utilities/persister/Persister;
+
sget-object p1, Lcom/discord/stores/VoiceConfigurationCache;->Companion:Lcom/discord/stores/VoiceConfigurationCache$Companion;
invoke-virtual {p1}, Lcom/discord/stores/VoiceConfigurationCache$Companion;->getDEFAULT_VOICE_CONFIG$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
@@ -322,6 +355,22 @@
iput-object p1, p0, Lcom/discord/stores/StoreMediaSettings;->audioModeSubject:Lrx/subjects/SerializedSubject;
+ new-instance p1, Lrx/subjects/SerializedSubject;
+
+ iget-boolean v0, p0, Lcom/discord/stores/StoreMediaSettings;->voiceParticipantsHidden:Z
+
+ invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+ move-result-object v0
+
+ invoke-static {v0}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
+
+ move-result-object v0
+
+ invoke-direct {p1, v0}, Lrx/subjects/SerializedSubject;->(Lrx/subjects/Subject;)V
+
+ iput-object p1, p0, Lcom/discord/stores/StoreMediaSettings;->voiceParticipantsHiddenSubject:Lrx/subjects/SerializedSubject;
+
const/4 p1, 0x1
iput-boolean p1, p0, Lcom/discord/stores/StoreMediaSettings;->canUseVad:Z
@@ -525,6 +574,34 @@
throw p1
.end method
+.method private final setVoiceParticipantsHidden(Z)V
+ .locals 3
+
+ iput-boolean p1, p0, Lcom/discord/stores/StoreMediaSettings;->voiceParticipantsHidden:Z
+
+ iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings;->voiceParticipantsHiddenCache:Lcom/discord/utilities/persister/Persister;
+
+ invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+ move-result-object v1
+
+ const/4 v2, 0x1
+
+ invoke-virtual {v0, v1, v2}, Lcom/discord/utilities/persister/Persister;->set(Ljava/lang/Object;Z)Ljava/lang/Object;
+
+ iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings;->voiceParticipantsHiddenSubject:Lrx/subjects/SerializedSubject;
+
+ invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+ move-result-object p1
+
+ iget-object v0, v0, Lrx/subjects/SerializedSubject;->e:Lr0/n/c;
+
+ invoke-virtual {v0, p1}, Lr0/n/c;->onNext(Ljava/lang/Object;)V
+
+ return-void
+.end method
+
.method private final updateForceMute()V
.locals 13
@@ -1189,6 +1266,34 @@
throw v0
.end method
+.method public final getVoiceParticipantsHidden()Lrx/Observable;
+ .locals 2
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "()",
+ "Lrx/Observable<",
+ "Ljava/lang/Boolean;",
+ ">;"
+ }
+ .end annotation
+
+ iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings;->voiceParticipantsHiddenSubject:Lrx/subjects/SerializedSubject;
+
+ invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
+
+ move-result-object v0
+
+ invoke-virtual {v0}, Lrx/Observable;->q()Lrx/Observable;
+
+ move-result-object v0
+
+ const-string v1, "voiceParticipantsHiddenS\u2026 .distinctUntilChanged()"
+
+ invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ return-object v0
+.end method
+
.method public final init()V
.locals 9
@@ -1256,6 +1361,20 @@
invoke-direct {p0, v0}, Lcom/discord/stores/StoreMediaSettings;->setAudioMode(I)V
+ iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings;->voiceParticipantsHiddenCache:Lcom/discord/utilities/persister/Persister;
+
+ invoke-virtual {v0}, Lcom/discord/utilities/persister/Persister;->get()Ljava/lang/Object;
+
+ move-result-object v0
+
+ check-cast v0, Ljava/lang/Boolean;
+
+ invoke-virtual {v0}, Ljava/lang/Boolean;->booleanValue()Z
+
+ move-result v0
+
+ invoke-direct {p0, v0}, Lcom/discord/stores/StoreMediaSettings;->setVoiceParticipantsHidden(Z)V
+
iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings;->stream:Lcom/discord/stores/StoreStream;
invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getVoiceChannelSelected$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreVoiceChannelSelected;
@@ -2402,3 +2521,25 @@
throw p1
.end method
+
+.method public final declared-synchronized updateVoiceParticipantsHidden(Z)V
+ .locals 0
+
+ monitor-enter p0
+
+ :try_start_0
+ invoke-direct {p0, p1}, Lcom/discord/stores/StoreMediaSettings;->setVoiceParticipantsHidden(Z)V
+ :try_end_0
+ .catchall {:try_start_0 .. :try_end_0} :catchall_0
+
+ monitor-exit p0
+
+ return-void
+
+ :catchall_0
+ move-exception p1
+
+ monitor-exit p0
+
+ throw p1
+.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 0521148ee9..9990e4addb 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
@@ -344,7 +344,7 @@
goto :goto_1
:cond_6
- const v0, 0x7f120f46
+ const v0, 0x7f120f54
:goto_1
invoke-virtual {v2, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesHolder.smali b/com.discord/smali/com/discord/stores/StoreMessagesHolder.smali
index db6d11e557..a0a22e08e0 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesHolder.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesHolder.smali
@@ -639,11 +639,11 @@
move-result-object v1
- new-instance v2, Lf/a/k/f;
+ new-instance v2, Lf/a/k/b;
- invoke-direct {v2, p0}, Lf/a/k/f;->(Lcom/discord/stores/StoreMessagesHolder;)V
+ invoke-direct {v2, p0}, Lf/a/k/b;->(Lcom/discord/stores/StoreMessagesHolder;)V
- sget-object v3, Lf/a/k/g;->d:Lf/a/k/g;
+ sget-object v3, Lf/a/k/c;->d:Lf/a/k/c;
invoke-virtual {v1, v2, v3}, Lrx/Observable;->S(Lrx/functions/Action1;Lrx/functions/Action1;)Lrx/Subscription;
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader.smali
index 145767b9c0..f35c85942b 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader.smali
@@ -2101,17 +2101,21 @@
iget-object p3, p0, Lcom/discord/stores/StoreMessagesLoader;->stream:Lcom/discord/stores/StoreStream;
- invoke-virtual {p3}, Lcom/discord/stores/StoreStream;->getConnectivity$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreConnectivity;
+ invoke-virtual {p3}, Lcom/discord/stores/StoreStream;->getConnectionOpen$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreConnectionOpen;
move-result-object p3
- invoke-virtual {p3}, Lcom/discord/stores/StoreConnectivity;->getConnectionOpen()Lrx/Observable;
+ const/4 p4, 0x0
+
+ const/4 v0, 0x0
+
+ const/4 v2, 0x1
+
+ invoke-static {p3, p4, v2, v0}, Lcom/discord/stores/StoreConnectionOpen;->observeConnectionOpen$default(Lcom/discord/stores/StoreConnectionOpen;ZILjava/lang/Object;)Lrx/Observable;
move-result-object p3
- const/4 p4, 0x1
-
- invoke-virtual {p3, p4}, Lrx/Observable;->V(I)Lrx/Observable;
+ invoke-virtual {p3, v2}, Lrx/Observable;->V(I)Lrx/Observable;
move-result-object p3
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$1.smali
deleted file mode 100644
index 529f2783ba..0000000000
--- a/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$1.smali
+++ /dev/null
@@ -1,96 +0,0 @@
-.class public final Lcom/discord/stores/StoreNavigation$displayConnectionErrorNotice$1;
-.super Lj0/n/c/i;
-.source "StoreNavigation.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/stores/StoreNavigation;->displayConnectionErrorNotice()V
-.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<",
- "Landroid/app/Activity;",
- "Ljava/lang/String;",
- ">;"
- }
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/stores/StoreNavigation$displayConnectionErrorNotice$1;
-
-
-# direct methods
-.method public static constructor ()V
- .locals 1
-
- new-instance v0, Lcom/discord/stores/StoreNavigation$displayConnectionErrorNotice$1;
-
- invoke-direct {v0}, Lcom/discord/stores/StoreNavigation$displayConnectionErrorNotice$1;->()V
-
- sput-object v0, Lcom/discord/stores/StoreNavigation$displayConnectionErrorNotice$1;->INSTANCE:Lcom/discord/stores/StoreNavigation$displayConnectionErrorNotice$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, Landroid/app/Activity;
-
- invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNavigation$displayConnectionErrorNotice$1;->invoke(Landroid/app/Activity;)Ljava/lang/String;
-
- move-result-object p1
-
- return-object p1
-.end method
-
-.method public final invoke(Landroid/app/Activity;)Ljava/lang/String;
- .locals 1
-
- if-eqz p1, :cond_0
-
- const v0, 0x7f1204a0
-
- invoke-virtual {p1, v0}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
-
- move-result-object p1
-
- const-string v0, "activity.getString(R.str\u2026.connecting_problems_cta)"
-
- invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- return-object p1
-
- :cond_0
- const-string p1, "activity"
-
- 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/stores/StoreNavigation$displayConnectionErrorNotice$2.smali b/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$2.smali
deleted file mode 100644
index 841c8bda6e..0000000000
--- a/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$2.smali
+++ /dev/null
@@ -1,136 +0,0 @@
-.class public final Lcom/discord/stores/StoreNavigation$displayConnectionErrorNotice$2;
-.super Lj0/n/c/i;
-.source "StoreNavigation.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/stores/StoreNavigation;->displayConnectionErrorNotice()V
-.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<",
- "Landroid/app/Activity;",
- "Ljava/lang/CharSequence;",
- ">;"
- }
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/stores/StoreNavigation$displayConnectionErrorNotice$2;
-
-
-# direct methods
-.method public static constructor ()V
- .locals 1
-
- new-instance v0, Lcom/discord/stores/StoreNavigation$displayConnectionErrorNotice$2;
-
- invoke-direct {v0}, Lcom/discord/stores/StoreNavigation$displayConnectionErrorNotice$2;->()V
-
- sput-object v0, Lcom/discord/stores/StoreNavigation$displayConnectionErrorNotice$2;->INSTANCE:Lcom/discord/stores/StoreNavigation$displayConnectionErrorNotice$2;
-
- 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 final invoke(Landroid/app/Activity;)Ljava/lang/CharSequence;
- .locals 11
-
- if-eqz p1, :cond_0
-
- const v0, 0x7f1204a4
-
- const/4 v1, 0x2
-
- new-array v1, v1, [Ljava/lang/Object;
-
- const/4 v2, 0x0
-
- const v3, 0x7f1214cf
-
- invoke-virtual {p1, v3}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
-
- move-result-object v3
-
- aput-object v3, v1, v2
-
- const/4 v2, 0x1
-
- const v3, 0x7f1215ff
-
- invoke-virtual {p1, v3}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
-
- move-result-object v3
-
- aput-object v3, v1, v2
-
- invoke-virtual {p1, v0, v1}, Landroid/app/Activity;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
- move-result-object v5
-
- const-string v0, "activity.getString(\n \u2026page_url)\n )"
-
- invoke-static {v5, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- const/4 v6, 0x0
-
- const/4 v7, 0x0
-
- const/4 v8, 0x0
-
- const/16 v9, 0x1c
-
- const/4 v10, 0x0
-
- move-object v4, p1
-
- invoke-static/range {v4 .. v10}, Lcom/discord/utilities/textprocessing/Parsers;->parseMaskedLinks$default(Landroid/content/Context;Ljava/lang/CharSequence;Lkotlin/jvm/functions/Function3;Lkotlin/jvm/functions/Function1;Ljava/lang/Integer;ILjava/lang/Object;)Ljava/lang/CharSequence;
-
- move-result-object p1
-
- return-object p1
-
- :cond_0
- const-string p1, "activity"
-
- invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
- const/4 p1, 0x0
-
- throw p1
-.end method
-
-.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
- .locals 0
-
- check-cast p1, Landroid/app/Activity;
-
- invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNavigation$displayConnectionErrorNotice$2;->invoke(Landroid/app/Activity;)Ljava/lang/CharSequence;
-
- move-result-object p1
-
- return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$3.smali b/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$3.smali
deleted file mode 100644
index d5f5824929..0000000000
--- a/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$3.smali
+++ /dev/null
@@ -1,106 +0,0 @@
-.class public final Lcom/discord/stores/StoreNavigation$displayConnectionErrorNotice$3;
-.super Lj0/n/c/i;
-.source "StoreNavigation.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/stores/StoreNavigation;->displayConnectionErrorNotice()V
-.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<",
- "Landroid/view/View;",
- "Lkotlin/Unit;",
- ">;"
- }
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/stores/StoreNavigation$displayConnectionErrorNotice$3;
-
-
-# direct methods
-.method public static constructor ()V
- .locals 1
-
- new-instance v0, Lcom/discord/stores/StoreNavigation$displayConnectionErrorNotice$3;
-
- invoke-direct {v0}, Lcom/discord/stores/StoreNavigation$displayConnectionErrorNotice$3;->()V
-
- sput-object v0, Lcom/discord/stores/StoreNavigation$displayConnectionErrorNotice$3;->INSTANCE:Lcom/discord/stores/StoreNavigation$displayConnectionErrorNotice$3;
-
- 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, Landroid/view/View;
-
- invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNavigation$displayConnectionErrorNotice$3;->invoke(Landroid/view/View;)V
-
- sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
-
- return-object p1
-.end method
-
-.method public final invoke(Landroid/view/View;)V
- .locals 6
-
- if-eqz p1, :cond_0
-
- sget-object v0, Lcom/discord/utilities/uri/UriHandler;->INSTANCE:Lcom/discord/utilities/uri/UriHandler;
-
- invoke-virtual {p1}, Landroid/view/View;->getContext()Landroid/content/Context;
-
- move-result-object v1
-
- const-string p1, "it.context"
-
- invoke-static {v1, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- const/4 v3, 0x0
-
- const/4 v4, 0x4
-
- const/4 v5, 0x0
-
- const-string v2, "https://status.discord.com/"
-
- invoke-static/range {v0 .. v5}, Lcom/discord/utilities/uri/UriHandler;->handle$default(Lcom/discord/utilities/uri/UriHandler;Landroid/content/Context;Ljava/lang/String;Lkotlin/jvm/functions/Function0;ILjava/lang/Object;)V
-
- return-void
-
- :cond_0
- 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/stores/StoreNavigation$init$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$init$1.smali
deleted file mode 100644
index 65fe02634a..0000000000
--- a/com.discord/smali/com/discord/stores/StoreNavigation$init$1.smali
+++ /dev/null
@@ -1,132 +0,0 @@
-.class public final Lcom/discord/stores/StoreNavigation$init$1;
-.super Ljava/lang/Object;
-.source "StoreNavigation.kt"
-
-# interfaces
-.implements Lrx/functions/Func4;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/stores/StoreNavigation;->init(Landroid/app/Application;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
- accessFlags = 0x19
- name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
- value = {
- "",
- "Ljava/lang/Object;",
- "Lrx/functions/Func4<",
- "TT1;TT2;TT3;TT4;TR;>;"
- }
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/stores/StoreNavigation$init$1;
-
-
-# direct methods
-.method public static constructor ()V
- .locals 1
-
- new-instance v0, Lcom/discord/stores/StoreNavigation$init$1;
-
- invoke-direct {v0}, Lcom/discord/stores/StoreNavigation$init$1;->()V
-
- sput-object v0, Lcom/discord/stores/StoreNavigation$init$1;->INSTANCE:Lcom/discord/stores/StoreNavigation$init$1;
-
- return-void
-.end method
-
-.method public constructor ()V
- .locals 0
-
- invoke-direct {p0}, Ljava/lang/Object;->()V
-
- return-void
-.end method
-
-
-# virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- .locals 0
-
- check-cast p1, Ljava/lang/Boolean;
-
- check-cast p2, Ljava/lang/Boolean;
-
- check-cast p3, Ljava/lang/Boolean;
-
- check-cast p4, Ljava/lang/Boolean;
-
- invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/stores/StoreNavigation$init$1;->call(Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)Z
-
- move-result p1
-
- invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
- move-result-object p1
-
- return-object p1
-.end method
-
-.method public final call(Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)Z
- .locals 1
-
- const-string v0, "isAuthed"
-
- invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
-
- move-result p1
-
- if-eqz p1, :cond_0
-
- const-string p1, "isNetworkStablyConnected"
-
- invoke-static {p3, p1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- invoke-virtual {p3}, Ljava/lang/Boolean;->booleanValue()Z
-
- move-result p1
-
- if-eqz p1, :cond_0
-
- invoke-virtual {p2}, Ljava/lang/Boolean;->booleanValue()Z
-
- move-result p1
-
- if-nez p1, :cond_0
-
- invoke-virtual {p4}, Ljava/lang/Boolean;->booleanValue()Z
-
- move-result p1
-
- if-nez p1, :cond_0
-
- const/4 p1, 0x1
-
- goto :goto_0
-
- :cond_0
- const/4 p1, 0x0
-
- :goto_0
- return p1
-.end method
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$init$2.smali b/com.discord/smali/com/discord/stores/StoreNavigation$init$2.smali
deleted file mode 100644
index 15c0ec31ed..0000000000
--- a/com.discord/smali/com/discord/stores/StoreNavigation$init$2.smali
+++ /dev/null
@@ -1,112 +0,0 @@
-.class public final Lcom/discord/stores/StoreNavigation$init$2;
-.super Ljava/lang/Object;
-.source "StoreNavigation.kt"
-
-# interfaces
-.implements Lr0/k/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/stores/StoreNavigation;->init(Landroid/app/Application;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
- accessFlags = 0x19
- name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
- value = {
- "",
- "Ljava/lang/Object;",
- "Lr0/k/b<",
- "TT;",
- "Lrx/Observable<",
- "+TR;>;>;"
- }
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/stores/StoreNavigation$init$2;
-
-
-# direct methods
-.method public static constructor ()V
- .locals 1
-
- new-instance v0, Lcom/discord/stores/StoreNavigation$init$2;
-
- invoke-direct {v0}, Lcom/discord/stores/StoreNavigation$init$2;->()V
-
- sput-object v0, Lcom/discord/stores/StoreNavigation$init$2;->INSTANCE:Lcom/discord/stores/StoreNavigation$init$2;
-
- return-void
-.end method
-
-.method public constructor ()V
- .locals 0
-
- invoke-direct {p0}, Ljava/lang/Object;->()V
-
- return-void
-.end method
-
-
-# virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
- .locals 0
-
- check-cast p1, Ljava/lang/Boolean;
-
- invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNavigation$init$2;->call(Ljava/lang/Boolean;)Lrx/Observable;
-
- move-result-object p1
-
- return-object p1
-.end method
-
-.method public final call(Ljava/lang/Boolean;)Lrx/Observable;
- .locals 2
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "(",
- "Ljava/lang/Boolean;",
- ")",
- "Lrx/Observable<",
- "Ljava/lang/Long;",
- ">;"
- }
- .end annotation
-
- const-string v0, "isConnectionError"
-
- invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
-
- move-result p1
-
- if-eqz p1, :cond_0
-
- const-wide/16 v0, 0xf
-
- sget-object p1, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
-
- invoke-static {v0, v1, p1}, Lrx/Observable;->Z(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
-
- move-result-object p1
-
- goto :goto_0
-
- :cond_0
- sget-object p1, Lr0/l/a/f;->e:Lrx/Observable;
-
- :goto_0
- return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation.smali b/com.discord/smali/com/discord/stores/StoreNavigation.smali
index 706f42277a..979b436f92 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation.smali
@@ -111,46 +111,6 @@
throw v0
.end method
-.method public static final synthetic access$displayConnectionErrorNotice(Lcom/discord/stores/StoreNavigation;)V
- .locals 0
-
- invoke-direct {p0}, Lcom/discord/stores/StoreNavigation;->displayConnectionErrorNotice()V
-
- return-void
-.end method
-
-.method private final displayConnectionErrorNotice()V
- .locals 13
-
- sget-object v0, Lcom/discord/widgets/notice/WidgetNoticePopup;->Companion:Lcom/discord/widgets/notice/WidgetNoticePopup$Companion;
-
- sget-object v2, Lcom/discord/stores/StoreNavigation$displayConnectionErrorNotice$1;->INSTANCE:Lcom/discord/stores/StoreNavigation$displayConnectionErrorNotice$1;
-
- sget-object v3, Lcom/discord/stores/StoreNavigation$displayConnectionErrorNotice$2;->INSTANCE:Lcom/discord/stores/StoreNavigation$displayConnectionErrorNotice$2;
-
- sget-object v10, Lcom/discord/stores/StoreNavigation$displayConnectionErrorNotice$3;->INSTANCE:Lcom/discord/stores/StoreNavigation$displayConnectionErrorNotice$3;
-
- const-string v1, "CONNECTION_ISSUES"
-
- const v4, 0x7f08040d
-
- const/16 v5, 0x1e
-
- const-wide/32 v6, 0x1d4c0
-
- const/4 v8, 0x1
-
- const/4 v9, 0x0
-
- const/16 v11, 0x80
-
- const/4 v12, 0x0
-
- invoke-static/range {v0 .. v12}, Lcom/discord/widgets/notice/WidgetNoticePopup$Companion;->enqueue$default(Lcom/discord/widgets/notice/WidgetNoticePopup$Companion;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;IIJZLjava/util/List;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
-
- return-void
-.end method
-
.method public static synthetic setNavigationPanelAction$default(Lcom/discord/stores/StoreNavigation;Lcom/discord/stores/StoreNavigation$PanelAction;Lcom/discord/widgets/home/PanelLayout;ILjava/lang/Object;)V
.locals 0
@@ -220,7 +180,7 @@
.end method
.method public final init(Landroid/app/Application;)V
- .locals 10
+ .locals 3
if-eqz p1, :cond_0
@@ -234,82 +194,6 @@
invoke-virtual {p1, v0}, Landroid/app/Application;->registerActivityLifecycleCallbacks(Landroid/app/Application$ActivityLifecycleCallbacks;)V
- sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
- invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getAuthentication()Lcom/discord/stores/StoreAuthentication;
-
- move-result-object v0
-
- invoke-virtual {v0}, Lcom/discord/stores/StoreAuthentication;->getIsAuthed$app_productionDiscordExternalRelease()Lrx/Observable;
-
- move-result-object v0
-
- invoke-static {}, Lcom/miguelgaeta/backgrounded/Backgrounded;->get()Lrx/Observable;
-
- move-result-object v1
-
- new-instance v2, Lcom/discord/utilities/networking/NetworkMonitor;
-
- invoke-direct {v2, p1}, Lcom/discord/utilities/networking/NetworkMonitor;->(Landroid/content/Context;)V
-
- invoke-virtual {v2}, Lcom/discord/utilities/networking/NetworkMonitor;->isStablyConnected()Lrx/Observable;
-
- move-result-object p1
-
- iget-object v2, p0, Lcom/discord/stores/StoreNavigation;->stream:Lcom/discord/stores/StoreStream;
-
- invoke-virtual {v2}, Lcom/discord/stores/StoreStream;->getGatewaySocket$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreGatewayConnection;
-
- move-result-object v2
-
- invoke-virtual {v2}, Lcom/discord/stores/StoreGatewayConnection;->getConnected()Lrx/Observable;
-
- move-result-object v2
-
- sget-object v3, Lcom/discord/stores/StoreNavigation$init$1;->INSTANCE:Lcom/discord/stores/StoreNavigation$init$1;
-
- invoke-static {v0, v1, p1, v2, v3}, Lrx/Observable;->h(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func4;)Lrx/Observable;
-
- move-result-object p1
-
- invoke-virtual {p1}, Lrx/Observable;->q()Lrx/Observable;
-
- move-result-object p1
-
- sget-object v0, Lcom/discord/stores/StoreNavigation$init$2;->INSTANCE:Lcom/discord/stores/StoreNavigation$init$2;
-
- invoke-virtual {p1, v0}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
-
- move-result-object p1
-
- const-string v0, "Observable\n .comb\u2026y()\n }\n }"
-
- invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
-
- move-result-object v1
-
- const-class v2, Lcom/discord/stores/StoreNavigation;
-
- const/4 v3, 0x0
-
- const/4 v4, 0x0
-
- const/4 v5, 0x0
-
- const/4 v6, 0x0
-
- new-instance v7, Lcom/discord/stores/StoreNavigation$init$3;
-
- invoke-direct {v7, p0}, Lcom/discord/stores/StoreNavigation$init$3;->(Lcom/discord/stores/StoreNavigation;)V
-
- const/16 v8, 0x1e
-
- const/4 v9, 0x0
-
- invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
-
return-void
:cond_0
diff --git a/com.discord/smali/com/discord/stores/StoreNavigationKt.smali b/com.discord/smali/com/discord/stores/StoreNavigationKt.smali
deleted file mode 100644
index 439e35c344..0000000000
--- a/com.discord/smali/com/discord/stores/StoreNavigationKt.smali
+++ /dev/null
@@ -1,7 +0,0 @@
-.class public final Lcom/discord/stores/StoreNavigationKt;
-.super Ljava/lang/Object;
-.source "StoreNavigation.kt"
-
-
-# static fields
-.field public static final CONNECTIONS_NOTICE_NAME:Ljava/lang/String; = "CONNECTION_ISSUES"
diff --git a/com.discord/smali/com/discord/stores/StorePinnedMessages.smali b/com.discord/smali/com/discord/stores/StorePinnedMessages.smali
index 184096e308..93812d7719 100644
--- a/com.discord/smali/com/discord/stores/StorePinnedMessages.smali
+++ b/com.discord/smali/com/discord/stores/StorePinnedMessages.smali
@@ -243,9 +243,9 @@
move-result-object v0
- new-instance v1, Lf/a/k/j;
+ new-instance v1, Lf/a/k/f;
- invoke-direct {v1, p0, p1, p2}, Lf/a/k/j;->(Lcom/discord/stores/StorePinnedMessages;J)V
+ invoke-direct {v1, p0, p1, p2}, Lf/a/k/f;->(Lcom/discord/stores/StorePinnedMessages;J)V
invoke-static {v1, p3}, Lf/a/b/q;->l(Lrx/functions/Action1;Landroid/content/Context;)Lrx/Observable$c;
@@ -356,17 +356,17 @@
iget-object v0, p0, Lcom/discord/stores/StorePinnedMessages;->messagesPublisher:Lrx/subjects/Subject;
- new-instance v1, Lf/a/k/h;
+ new-instance v1, Lf/a/k/d;
- invoke-direct {v1, p1, p2}, Lf/a/k/h;->(J)V
+ invoke-direct {v1, p1, p2}, Lf/a/k/d;->(J)V
invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
move-result-object p1
- new-instance p2, Lf/a/k/k;
+ new-instance p2, Lf/a/k/g;
- invoke-direct {p2, p3, p4}, Lf/a/k/k;->(J)V
+ invoke-direct {p2, p3, p4}, Lf/a/k/g;->(J)V
invoke-virtual {p1, p2}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
@@ -405,9 +405,9 @@
iget-object p3, p0, Lcom/discord/stores/StorePinnedMessages;->messagesPublisher:Lrx/subjects/Subject;
- new-instance v0, Lf/a/k/i;
+ new-instance v0, Lf/a/k/e;
- invoke-direct {v0, p1, p2}, Lf/a/k/i;->(J)V
+ invoke-direct {v0, p1, p2}, Lf/a/k/e;->(J)V
invoke-virtual {p3, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
diff --git a/com.discord/smali/com/discord/stores/StoreStream$Companion.smali b/com.discord/smali/com/discord/stores/StoreStream$Companion.smali
index 792e9abe1b..e33d671ceb 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$Companion.smali
@@ -33,20 +33,6 @@
# virtual methods
-.method public final getAccessibility()Lcom/discord/stores/StoreAccessibility;
- .locals 1
-
- invoke-static {}, Lcom/discord/stores/StoreStream;->access$getCollector$cp()Lcom/discord/stores/StoreStream;
-
- move-result-object v0
-
- invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getAccessibility$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreAccessibility;
-
- move-result-object v0
-
- return-object v0
-.end method
-
.method public final getAnalytics()Lcom/discord/stores/StoreAnalytics;
.locals 1
@@ -131,20 +117,6 @@
return-object v0
.end method
-.method public final getAudioManager()Lcom/discord/stores/StoreAudioManager;
- .locals 1
-
- invoke-static {}, Lcom/discord/stores/StoreStream;->access$getCollector$cp()Lcom/discord/stores/StoreStream;
-
- move-result-object v0
-
- invoke-static {v0}, Lcom/discord/stores/StoreStream;->access$getAudioManager$p(Lcom/discord/stores/StoreStream;)Lcom/discord/stores/StoreAudioManager;
-
- move-result-object v0
-
- return-object v0
-.end method
-
.method public final getAuditLog()Lcom/discord/stores/StoreAuditLog;
.locals 1
@@ -285,6 +257,20 @@
return-object v0
.end method
+.method public final getConnectionOpen()Lcom/discord/stores/StoreConnectionOpen;
+ .locals 1
+
+ invoke-static {}, Lcom/discord/stores/StoreStream;->access$getCollector$cp()Lcom/discord/stores/StoreStream;
+
+ move-result-object v0
+
+ invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getConnectionOpen$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreConnectionOpen;
+
+ move-result-object v0
+
+ return-object v0
+.end method
+
.method public final getConnectivity()Lcom/discord/stores/StoreConnectivity;
.locals 1
@@ -1027,20 +1013,6 @@
return-object v0
.end method
-.method public final getStreamRtcConnection()Lcom/discord/stores/StoreStreamRtcConnection;
- .locals 1
-
- invoke-static {}, Lcom/discord/stores/StoreStream;->access$getCollector$cp()Lcom/discord/stores/StoreStream;
-
- move-result-object v0
-
- invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getStreamRtcConnection$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreStreamRtcConnection;
-
- move-result-object v0
-
- return-object v0
-.end method
-
.method public final getSubscriptions()Lcom/discord/stores/StoreSubscriptions;
.locals 1
@@ -1223,20 +1195,6 @@
return-object v0
.end method
-.method public final getVideoStreams()Lcom/discord/stores/StoreVideoStreams;
- .locals 1
-
- invoke-static {}, Lcom/discord/stores/StoreStream;->access$getCollector$cp()Lcom/discord/stores/StoreStream;
-
- move-result-object v0
-
- invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getVideoStreams$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreVideoStreams;
-
- move-result-object v0
-
- return-object v0
-.end method
-
.method public final getVideoSupport()Lcom/discord/stores/StoreVideoSupport;
.locals 1
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$13.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$13.smali
index 0f0bebbdba..53a7b92c03 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$13.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$13.smali
@@ -1,9 +1,9 @@
-.class public final synthetic Lcom/discord/stores/StoreStream$deferredInit$1$13;
-.super Lj0/n/c/g;
+.class public final Lcom/discord/stores/StoreStream$deferredInit$1$13;
+.super Ljava/lang/Object;
.source "StoreStream.kt"
# interfaces
-.implements Lkotlin/jvm/functions/Function1;
+.implements Lr0/k/b;
# annotations
@@ -12,82 +12,123 @@
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
- accessFlags = 0x1019
+ accessFlags = 0x19
name = null
.end annotation
.annotation system Ldalvik/annotation/Signature;
value = {
- "Lj0/n/c/g;",
- "Lkotlin/jvm/functions/Function1<",
- "Ljava/lang/Boolean;",
- "Lkotlin/Unit;",
- ">;"
+ "",
+ "Ljava/lang/Object;",
+ "Lr0/k/b<",
+ "TT;",
+ "Lrx/Observable<",
+ "+TR;>;>;"
}
.end annotation
+# static fields
+.field public static final INSTANCE:Lcom/discord/stores/StoreStream$deferredInit$1$13;
+
+
# direct methods
-.method public constructor (Lrx/subjects/BehaviorSubject;)V
+.method public static constructor ()V
.locals 1
- const/4 v0, 0x1
+ new-instance v0, Lcom/discord/stores/StoreStream$deferredInit$1$13;
- invoke-direct {p0, v0, p1}, Lj0/n/c/g;->(ILjava/lang/Object;)V
+ invoke-direct {v0}, Lcom/discord/stores/StoreStream$deferredInit$1$13;->()V
+
+ sput-object v0, Lcom/discord/stores/StoreStream$deferredInit$1$13;->INSTANCE:Lcom/discord/stores/StoreStream$deferredInit$1$13;
+
+ return-void
+.end method
+
+.method public constructor ()V
+ .locals 0
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
return-void
.end method
# virtual methods
-.method public final getName()Ljava/lang/String;
- .locals 1
-
- const-string v0, "onNext"
-
- return-object v0
-.end method
-
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
- .locals 1
-
- const-class v0, Lrx/subjects/BehaviorSubject;
-
- invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
-
- move-result-object v0
-
- return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
- .locals 1
-
- const-string v0, "onNext(Ljava/lang/Object;)V"
-
- return-object v0
-.end method
-
-.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
.locals 0
check-cast p1, Ljava/lang/Boolean;
- invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$deferredInit$1$13;->invoke(Ljava/lang/Boolean;)V
+ invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$deferredInit$1$13;->call(Ljava/lang/Boolean;)Lrx/Observable;
- sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+ move-result-object p1
return-object p1
.end method
-.method public final invoke(Ljava/lang/Boolean;)V
- .locals 1
+.method public final call(Ljava/lang/Boolean;)Lrx/Observable;
+ .locals 5
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Ljava/lang/Boolean;",
+ ")",
+ "Lrx/Observable<",
+ "Ljava/lang/Boolean;",
+ ">;"
+ }
+ .end annotation
- iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+ sget-object v0, Lcom/discord/stores/SlowTtiExperimentManager;->Companion:Lcom/discord/stores/SlowTtiExperimentManager$Companion;
- check-cast v0, Lrx/subjects/BehaviorSubject;
+ invoke-virtual {v0}, Lcom/discord/stores/SlowTtiExperimentManager$Companion;->getINSTANCE()Lcom/discord/stores/SlowTtiExperimentManager;
- invoke-virtual {v0, p1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
+ move-result-object v0
- return-void
+ invoke-virtual {v0}, Lcom/discord/stores/SlowTtiExperimentManager;->getDelayMs()J
+
+ move-result-wide v0
+
+ const-string v2, "isInitialized"
+
+ invoke-static {p1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
+
+ move-result v2
+
+ if-eqz v2, :cond_0
+
+ const-wide/16 v2, 0x0
+
+ cmp-long v4, v0, v2
+
+ if-lez v4, :cond_0
+
+ new-instance v2, Lr0/l/e/j;
+
+ invoke-direct {v2, p1}, Lr0/l/e/j;->(Ljava/lang/Object;)V
+
+ sget-object p1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+ invoke-virtual {v2, v0, v1, p1}, Lrx/Observable;->p(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+
+ move-result-object p1
+
+ goto :goto_0
+
+ :cond_0
+ new-instance v0, Lr0/l/e/j;
+
+ invoke-direct {v0, p1}, Lr0/l/e/j;->(Ljava/lang/Object;)V
+
+ move-object p1, v0
+
+ :goto_0
+ return-object p1
.end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$14.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$14.smali
new file mode 100644
index 0000000000..407bd62452
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1$14.smali
@@ -0,0 +1,93 @@
+.class public final synthetic Lcom/discord/stores/StoreStream$deferredInit$1$14;
+.super Lj0/n/c/g;
+.source "StoreStream.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/stores/StoreStream$deferredInit$1;->invoke()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x1019
+ name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Lj0/n/c/g;",
+ "Lkotlin/jvm/functions/Function1<",
+ "Ljava/lang/Boolean;",
+ "Lkotlin/Unit;",
+ ">;"
+ }
+.end annotation
+
+
+# direct methods
+.method public constructor (Lrx/subjects/BehaviorSubject;)V
+ .locals 1
+
+ const/4 v0, 0x1
+
+ invoke-direct {p0, v0, p1}, Lj0/n/c/g;->(ILjava/lang/Object;)V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public final getName()Ljava/lang/String;
+ .locals 1
+
+ const-string v0, "onNext"
+
+ return-object v0
+.end method
+
+.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
+ .locals 1
+
+ const-class v0, Lrx/subjects/BehaviorSubject;
+
+ invoke-static {v0}, Lj0/n/c/s;->getOrCreateKotlinClass(Ljava/lang/Class;)Lj0/r/b;
+
+ move-result-object v0
+
+ return-object v0
+.end method
+
+.method public final getSignature()Ljava/lang/String;
+ .locals 1
+
+ const-string v0, "onNext(Ljava/lang/Object;)V"
+
+ return-object v0
+.end method
+
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+ .locals 0
+
+ check-cast p1, Ljava/lang/Boolean;
+
+ invoke-virtual {p0, p1}, Lcom/discord/stores/StoreStream$deferredInit$1$14;->invoke(Ljava/lang/Boolean;)V
+
+ sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+ return-object p1
+.end method
+
+.method public final invoke(Ljava/lang/Boolean;)V
+ .locals 1
+
+ iget-object v0, p0, Lj0/n/c/b;->receiver:Ljava/lang/Object;
+
+ check-cast v0, Lrx/subjects/BehaviorSubject;
+
+ invoke-virtual {v0, p1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
+
+ return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali
index c4d4c35db9..97202ef9de 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali
@@ -468,7 +468,7 @@
iget-object v1, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
- invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getStreamRtcConnection$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreStreamRtcConnection;
+ invoke-static {v1}, Lcom/discord/stores/StoreStream;->access$getStreamRtcConnection$p(Lcom/discord/stores/StoreStream;)Lcom/discord/stores/StoreStreamRtcConnection;
move-result-object v1
@@ -754,6 +754,10 @@
move-result-object v1
+ invoke-virtual {v1}, Lrx/Observable;->q()Lrx/Observable;
+
+ move-result-object v1
+
sget-object v2, Lcom/discord/utilities/persister/Persister;->Companion:Lcom/discord/utilities/persister/Persister$Companion;
invoke-virtual {v2}, Lcom/discord/utilities/persister/Persister$Companion;->isPreloaded()Lrx/Observable;
@@ -766,11 +770,17 @@
move-result-object v1
- const-string v2, "Observable\n .comb\u2026chesInitialized\n }"
+ sget-object v2, Lcom/discord/stores/StoreStream$deferredInit$1$13;->INSTANCE:Lcom/discord/stores/StoreStream$deferredInit$1$13;
+
+ invoke-virtual {v1, v2}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
+
+ move-result-object v1
+
+ const-string v2, "Observable\n .comb\u2026ed)\n }\n }"
invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- new-instance v2, Lcom/discord/stores/StoreStream$deferredInit$1$13;
+ new-instance v2, Lcom/discord/stores/StoreStream$deferredInit$1$14;
iget-object v3, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
@@ -778,7 +788,7 @@
move-result-object v3
- invoke-direct {v2, v3}, Lcom/discord/stores/StoreStream$deferredInit$1$13;->(Lrx/subjects/BehaviorSubject;)V
+ invoke-direct {v2, v3}, Lcom/discord/stores/StoreStream$deferredInit$1$14;->(Lrx/subjects/BehaviorSubject;)V
const-string v3, "streamInit"
@@ -808,5 +818,19 @@
invoke-static {v0}, Lcom/discord/app/AppLog;->i(Ljava/lang/String;)V
+ sget-object v0, Lcom/discord/stores/SlowTtiExperimentManager;->Companion:Lcom/discord/stores/SlowTtiExperimentManager$Companion;
+
+ invoke-virtual {v0}, Lcom/discord/stores/SlowTtiExperimentManager$Companion;->getINSTANCE()Lcom/discord/stores/SlowTtiExperimentManager;
+
+ move-result-object v0
+
+ iget-object v1, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
+ invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getExperiments$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreExperiments;
+
+ move-result-object v1
+
+ invoke-virtual {v0, v1}, Lcom/discord/stores/SlowTtiExperimentManager;->fetchExperiment(Lcom/discord/stores/StoreExperiments;)V
+
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 3911ce890b..a568a76445 100644
--- a/com.discord/smali/com/discord/stores/StoreStream.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream.smali
@@ -65,6 +65,8 @@
.field public final clock:Lcom/discord/utilities/time/Clock;
+.field public final connectionOpen:Lcom/discord/stores/StoreConnectionOpen;
+
.field public final connectivity:Lcom/discord/stores/StoreConnectivity;
.field public final customEmojis:Lcom/discord/stores/StoreEmojiCustom;
@@ -740,6 +742,12 @@
iput-object v0, p0, Lcom/discord/stores/StoreStream;->connectivity:Lcom/discord/stores/StoreConnectivity;
+ new-instance v0, Lcom/discord/stores/StoreConnectionOpen;
+
+ invoke-direct {v0}, Lcom/discord/stores/StoreConnectionOpen;->()V
+
+ iput-object v0, p0, Lcom/discord/stores/StoreStream;->connectionOpen:Lcom/discord/stores/StoreConnectionOpen;
+
new-instance v0, Lcom/discord/stores/StoreCalls;
invoke-direct {v0, p0}, Lcom/discord/stores/StoreCalls;->(Lcom/discord/stores/StoreStream;)V
@@ -1232,7 +1240,7 @@
iput-object v0, p0, Lcom/discord/stores/StoreStream;->gifPicker:Lcom/discord/stores/StoreGifPicker;
- const/4 v3, 0x7
+ const/16 v3, 0x8
new-array v3, v3, [Lcom/discord/stores/StoreV2;
@@ -1248,25 +1256,31 @@
aput-object v1, v3, v4
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->guildWelcomeScreens:Lcom/discord/stores/StoreGuildWelcomeScreens;
+ iget-object v1, p0, Lcom/discord/stores/StoreStream;->connectionOpen:Lcom/discord/stores/StoreConnectionOpen;
const/4 v2, 0x3
aput-object v1, v3, v2
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->videoStreams:Lcom/discord/stores/StoreVideoStreams;
+ iget-object v1, p0, Lcom/discord/stores/StoreStream;->guildWelcomeScreens:Lcom/discord/stores/StoreGuildWelcomeScreens;
const/4 v2, 0x4
aput-object v1, v3, v2
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->clientDataState:Lcom/discord/stores/StoreClientDataState;
+ iget-object v1, p0, Lcom/discord/stores/StoreStream;->videoStreams:Lcom/discord/stores/StoreVideoStreams;
const/4 v2, 0x5
aput-object v1, v3, v2
- const/4 v1, 0x6
+ iget-object v1, p0, Lcom/discord/stores/StoreStream;->clientDataState:Lcom/discord/stores/StoreClientDataState;
+
+ const/4 v2, 0x6
+
+ aput-object v1, v3, v2
+
+ const/4 v1, 0x7
aput-object v0, v3, v1
@@ -1345,6 +1359,14 @@
return-object p0
.end method
+.method public static final synthetic access$getStreamRtcConnection$p(Lcom/discord/stores/StoreStream;)Lcom/discord/stores/StoreStreamRtcConnection;
+ .locals 0
+
+ iget-object p0, p0, Lcom/discord/stores/StoreStream;->streamRtcConnection:Lcom/discord/stores/StoreStreamRtcConnection;
+
+ return-object p0
+.end method
+
.method public static final synthetic access$handleAuthToken(Lcom/discord/stores/StoreStream;Ljava/lang/String;)V
.locals 0
@@ -1895,18 +1917,6 @@
return-void
.end method
-.method public static final getAccessibility()Lcom/discord/stores/StoreAccessibility;
- .locals 1
-
- sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
- invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getAccessibility()Lcom/discord/stores/StoreAccessibility;
-
- move-result-object v0
-
- return-object v0
-.end method
-
.method public static final getAnalytics()Lcom/discord/stores/StoreAnalytics;
.locals 1
@@ -2699,18 +2709,6 @@
return-object v0
.end method
-.method public static final getStreamRtcConnection()Lcom/discord/stores/StoreStreamRtcConnection;
- .locals 1
-
- sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
- invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getStreamRtcConnection()Lcom/discord/stores/StoreStreamRtcConnection;
-
- move-result-object v0
-
- return-object v0
-.end method
-
.method public static final getSubscriptions()Lcom/discord/stores/StoreSubscriptions;
.locals 1
@@ -2855,18 +2853,6 @@
return-object v0
.end method
-.method public static final getVideoStreams()Lcom/discord/stores/StoreVideoStreams;
- .locals 1
-
- sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
-
- invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getVideoStreams()Lcom/discord/stores/StoreVideoStreams;
-
- move-result-object v0
-
- return-object v0
-.end method
-
.method public static final getVideoSupport()Lcom/discord/stores/StoreVideoSupport;
.locals 1
@@ -3196,6 +3182,10 @@
invoke-virtual {v0, p1}, Lcom/discord/stores/StoreConnectivity;->handleConnected(Z)V
+ iget-object v0, p0, Lcom/discord/stores/StoreStream;->connectionOpen:Lcom/discord/stores/StoreConnectionOpen;
+
+ invoke-virtual {v0, p1}, Lcom/discord/stores/StoreConnectionOpen;->handleConnected(Z)V
+
return-void
.end method
@@ -3372,9 +3362,9 @@
invoke-virtual {v0, p1}, Lcom/discord/stores/StoreReviewRequest;->handleConnectionOpen(Lcom/discord/models/domain/ModelPayload;)V
- iget-object v0, p0, Lcom/discord/stores/StoreStream;->connectivity:Lcom/discord/stores/StoreConnectivity;
+ iget-object v0, p0, Lcom/discord/stores/StoreStream;->connectionOpen:Lcom/discord/stores/StoreConnectionOpen;
- invoke-virtual {v0}, Lcom/discord/stores/StoreConnectivity;->handleConnectionOpen()V
+ invoke-virtual {v0}, Lcom/discord/stores/StoreConnectionOpen;->handleConnectionOpen()V
iget-object v0, p0, Lcom/discord/stores/StoreStream;->library:Lcom/discord/stores/StoreLibrary;
@@ -4318,6 +4308,10 @@
invoke-virtual {v0}, Lcom/discord/stores/StoreMessages;->handlePreLogout()V
+ iget-object v0, p0, Lcom/discord/stores/StoreStream;->emojis:Lcom/discord/stores/StoreEmoji;
+
+ invoke-virtual {v0}, Lcom/discord/stores/StoreEmoji;->handlePreLogout()V
+
return-void
.end method
@@ -6091,6 +6085,14 @@
return-object v0
.end method
+.method public final getConnectionOpen$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreConnectionOpen;
+ .locals 1
+
+ iget-object v0, p0, Lcom/discord/stores/StoreStream;->connectionOpen:Lcom/discord/stores/StoreConnectionOpen;
+
+ return-object v0
+.end method
+
.method public final getConnectivity$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreConnectivity;
.locals 1
@@ -6547,14 +6549,6 @@
return-object v0
.end method
-.method public final getStreamRtcConnection$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreStreamRtcConnection;
- .locals 1
-
- iget-object v0, p0, Lcom/discord/stores/StoreStream;->streamRtcConnection:Lcom/discord/stores/StoreStreamRtcConnection;
-
- return-object v0
-.end method
-
.method public final getSubscriptions$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreSubscriptions;
.locals 1
@@ -6837,7 +6831,7 @@
iget-object v0, p0, Lcom/discord/stores/StoreStream;->streamRtcConnection:Lcom/discord/stores/StoreStreamRtcConnection;
- invoke-virtual {v0, p1}, Lcom/discord/stores/StoreStreamRtcConnection;->handleStreamDelete(Lcom/discord/models/domain/StreamDelete;)V
+ invoke-virtual {v0}, Lcom/discord/stores/StoreStreamRtcConnection;->handleStreamDelete()V
iget-object v0, p0, Lcom/discord/stores/StoreStream;->applicationStreaming:Lcom/discord/stores/StoreApplicationStreaming;
diff --git a/com.discord/smali/com/discord/stores/StoreStreamRtcConnection.smali b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection.smali
index 905108d47e..7f2835cdb2 100644
--- a/com.discord/smali/com/discord/stores/StoreStreamRtcConnection.smali
+++ b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection.smali
@@ -423,34 +423,6 @@
# virtual methods
-.method public final getRtcConnection$app_productionDiscordExternalRelease()Lcom/discord/rtcconnection/RtcConnection;
- .locals 1
-
- iget-object v0, p0, Lcom/discord/stores/StoreStreamRtcConnection;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
-
- return-object v0
-.end method
-
-.method public final getState()Lrx/Observable;
- .locals 2
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "()",
- "Lrx/Observable<",
- "Lcom/discord/stores/StoreStreamRtcConnection$State;",
- ">;"
- }
- .end annotation
-
- iget-object v0, p0, Lcom/discord/stores/StoreStreamRtcConnection;->stateSubject:Lrx/subjects/BehaviorSubject;
-
- const-string v1, "stateSubject"
-
- invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- return-object v0
-.end method
-
.method public final handleConnectionOpen(Lcom/discord/models/domain/ModelPayload;)V
.locals 0
.annotation runtime Lcom/discord/stores/StoreThread;
@@ -651,27 +623,18 @@
throw v0
.end method
-.method public final handleStreamDelete(Lcom/discord/models/domain/StreamDelete;)V
+.method public final handleStreamDelete()V
.locals 1
.annotation runtime Lcom/discord/stores/StoreThread;
.end annotation
- const/4 v0, 0x0
-
- if-eqz p1, :cond_0
-
invoke-direct {p0}, Lcom/discord/stores/StoreStreamRtcConnection;->destroyRtcConnection()V
+ const/4 v0, 0x0
+
iput-object v0, p0, Lcom/discord/stores/StoreStreamRtcConnection;->streamOwner:Ljava/lang/Long;
return-void
-
- :cond_0
- const-string p1, "streamDelete"
-
- invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
-
- throw v0
.end method
.method public final handleStreamRtcConnectionStateChange(Lcom/discord/rtcconnection/RtcConnection$State;)V
@@ -853,11 +816,3 @@
:cond_0
return-void
.end method
-
-.method public final setRtcConnection$app_productionDiscordExternalRelease(Lcom/discord/rtcconnection/RtcConnection;)V
- .locals 0
-
- iput-object p1, p0, Lcom/discord/stores/StoreStreamRtcConnection;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
-
- 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 acbb82e36a..56b7367d93 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, 0x7f12040b
+ const v1, 0x7f12040c
- const v7, 0x7f12040b
+ const v7, 0x7f12040c
goto :goto_0
:cond_0
- const v1, 0x7f1203ce
+ const v1, 0x7f1203cf
- const v7, 0x7f1203ce
+ const v7, 0x7f1203cf
: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 a712110795..e147c32851 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, 0x7f12040b
+ const v7, 0x7f12040c
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, 0x7f12040b
+ const v8, 0x7f12040c
move-object v3, p0
@@ -1109,7 +1109,7 @@
invoke-direct/range {v5 .. v14}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelMuteConfig;Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
- const v6, 0x7f121447
+ const v6, 0x7f121455
move-object v1, p0
@@ -1165,7 +1165,7 @@
invoke-direct/range {v0 .. v9}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelMuteConfig;Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
- const v5, 0x7f121447
+ const v5, 0x7f121455
move-object v0, p0
@@ -1226,7 +1226,7 @@
invoke-direct/range {v5 .. v14}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelMuteConfig;Ljava/lang/Boolean;Ljava/lang/Integer;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
- const v6, 0x7f121447
+ const v6, 0x7f121455
move-object v1, p0
diff --git a/com.discord/smali/com/discord/stores/StoreUserRelationships.smali b/com.discord/smali/com/discord/stores/StoreUserRelationships.smali
index 7e3aba0c4b..5df02758c9 100644
--- a/com.discord/smali/com/discord/stores/StoreUserRelationships.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserRelationships.smali
@@ -732,6 +732,8 @@
instance-of v2, v0, Lcom/discord/stores/StoreUserRelationships$UserRelationshipsState$Loaded;
+ const/4 v3, 0x0
+
if-eqz v2, :cond_0
new-instance v2, Ljava/util/HashMap;
@@ -746,11 +748,9 @@
iget-object v0, p0, Lcom/discord/stores/StoreUserRelationships;->relationshipsCache:Lcom/discord/utilities/persister/Persister;
- const/4 v3, 0x2
+ const/4 v4, 0x2
- const/4 v4, 0x0
-
- invoke-static {v0, v2, v1, v3, v4}, Lcom/discord/utilities/persister/Persister;->set$default(Lcom/discord/utilities/persister/Persister;Ljava/lang/Object;ZILjava/lang/Object;)Ljava/lang/Object;
+ invoke-static {v0, v2, v1, v4, v3}, Lcom/discord/utilities/persister/Persister;->set$default(Lcom/discord/utilities/persister/Persister;Ljava/lang/Object;ZILjava/lang/Object;)Ljava/lang/Object;
iget-object v0, p0, Lcom/discord/stores/StoreUserRelationships;->userRelationshipsSubject:Lrx/subjects/BehaviorSubject;
@@ -765,7 +765,9 @@
:cond_0
iget-object v0, p0, Lcom/discord/stores/StoreUserRelationships;->relationshipsCache:Lcom/discord/utilities/persister/Persister;
- invoke-virtual {v0}, Lcom/discord/utilities/persister/Persister;->clear()Ljava/lang/Object;
+ const/4 v2, 0x1
+
+ invoke-static {v0, v1, v2, v3}, Lcom/discord/utilities/persister/Persister;->clear$default(Lcom/discord/utilities/persister/Persister;ZILjava/lang/Object;)Ljava/lang/Object;
iget-object v0, p0, Lcom/discord/stores/StoreUserRelationships;->userRelationshipsSubject:Lrx/subjects/BehaviorSubject;
diff --git a/com.discord/smali/com/discord/stores/StoreUserSettings.smali b/com.discord/smali/com/discord/stores/StoreUserSettings.smali
index 401f810e11..d8a21b379f 100644
--- a/com.discord/smali/com/discord/stores/StoreUserSettings.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserSettings.smali
@@ -362,7 +362,7 @@
move-result-object v1
- sget-object v2, Lf/a/k/p;->d:Lf/a/k/p;
+ sget-object v2, Lf/a/k/l;->d:Lf/a/k/l;
invoke-static {v2, v0}, Lf/a/b/q;->l(Lrx/functions/Action1;Landroid/content/Context;)Lrx/Observable$c;
@@ -688,9 +688,9 @@
iget-object v2, p0, Lcom/discord/stores/StoreUserSettings;->dispatcher:Lcom/discord/stores/Dispatcher;
- new-instance v3, Lf/a/k/q;
+ new-instance v3, Lf/a/k/m;
- invoke-direct {v3, p0, v0, v1}, Lf/a/k/q;->(Lcom/discord/stores/StoreUserSettings;ZI)V
+ invoke-direct {v3, p0, v0, v1}, Lf/a/k/m;->(Lcom/discord/stores/StoreUserSettings;ZI)V
invoke-virtual {v2, v3}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
@@ -846,9 +846,9 @@
move-result-object p1
- new-instance v0, Lf/a/k/r;
+ new-instance v0, Lf/a/k/n;
- invoke-direct {v0, p0}, Lf/a/k/r;->(Lcom/discord/stores/StoreUserSettings;)V
+ invoke-direct {v0, p0}, Lf/a/k/n;->(Lcom/discord/stores/StoreUserSettings;)V
invoke-virtual {p1, v0}, Lrx/Observable;->R(Lrx/functions/Action1;)Lrx/Subscription;
@@ -903,9 +903,9 @@
move-result-object p1
- new-instance v0, Lf/a/k/n;
+ new-instance v0, Lf/a/k/j;
- invoke-direct {v0, p2, p0}, Lf/a/k/n;->(Ljava/lang/Integer;Lcom/discord/app/AppActivity;)V
+ invoke-direct {v0, p2, p0}, Lf/a/k/j;->(Ljava/lang/Integer;Lcom/discord/app/AppActivity;)V
invoke-static {v0, p0}, Lf/a/b/q;->l(Lrx/functions/Action1;Landroid/content/Context;)Lrx/Observable$c;
@@ -987,7 +987,7 @@
move-result-object v0
- sget-object v1, Lf/a/k/l;->d:Lf/a/k/l;
+ sget-object v1, Lf/a/k/h;->d:Lf/a/k/h;
invoke-virtual {v0, v1}, Lrx/Observable;->K(Lr0/k/b;)Lrx/Observable;
@@ -1418,9 +1418,9 @@
iget-object v0, p0, Lcom/discord/stores/StoreUserSettings;->themePublisher:Lrx/subjects/Subject;
- new-instance v1, Lf/a/k/o;
+ new-instance v1, Lf/a/k/k;
- invoke-direct {v1, p0}, Lf/a/k/o;->(Lcom/discord/stores/StoreUserSettings;)V
+ invoke-direct {v1, p0}, Lf/a/k/k;->(Lcom/discord/stores/StoreUserSettings;)V
invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
@@ -1750,7 +1750,7 @@
move-result-object v0
- const v1, 0x7f1215ad
+ const v1, 0x7f1215ba
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -1865,7 +1865,7 @@
move-result-object p2
- const v0, 0x7f120ded
+ const v0, 0x7f120df8
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -2262,7 +2262,7 @@
move-result-object v0
- const v1, 0x7f1215ad
+ const v1, 0x7f1215ba
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -2293,7 +2293,7 @@
move-result-object v0
- const v1, 0x7f1215ac
+ const v1, 0x7f1215b9
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -2355,9 +2355,9 @@
move-result-object v0
- new-instance v1, Lf/a/k/m;
+ new-instance v1, Lf/a/k/i;
- invoke-direct {v1, p0, p1}, Lf/a/k/m;->(Lcom/discord/stores/StoreUserSettings;Z)V
+ invoke-direct {v1, p0, p1}, Lf/a/k/i;->(Lcom/discord/stores/StoreUserSettings;Z)V
invoke-virtual {v0, v1}, Lrx/Observable;->t(Lrx/functions/Action1;)Lrx/Observable;
diff --git a/com.discord/smali/com/discord/stores/StoreV2$MarkChangedDelegate.smali b/com.discord/smali/com/discord/stores/StoreV2$MarkChangedDelegate.smali
new file mode 100644
index 0000000000..93eb85803c
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreV2$MarkChangedDelegate.smali
@@ -0,0 +1,162 @@
+.class public final Lcom/discord/stores/StoreV2$MarkChangedDelegate;
+.super Ljava/lang/Object;
+.source "StoreV2.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+ value = Lcom/discord/stores/StoreV2;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = "MarkChangedDelegate"
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+ value = {
+ "",
+ "Ljava/lang/Object;"
+ }
+.end annotation
+
+
+# instance fields
+.field public final overrideUpdateSource:Lcom/discord/stores/updates/ObservationDeck$UpdateSource;
+
+.field public value:Ljava/lang/Object;
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "TT;"
+ }
+ .end annotation
+.end field
+
+
+# direct methods
+.method public constructor (Ljava/lang/Object;Lcom/discord/stores/updates/ObservationDeck$UpdateSource;)V
+ .locals 0
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(TT;",
+ "Lcom/discord/stores/updates/ObservationDeck$UpdateSource;",
+ ")V"
+ }
+ .end annotation
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ iput-object p1, p0, Lcom/discord/stores/StoreV2$MarkChangedDelegate;->value:Ljava/lang/Object;
+
+ iput-object p2, p0, Lcom/discord/stores/StoreV2$MarkChangedDelegate;->overrideUpdateSource:Lcom/discord/stores/updates/ObservationDeck$UpdateSource;
+
+ return-void
+.end method
+
+.method public synthetic constructor (Ljava/lang/Object;Lcom/discord/stores/updates/ObservationDeck$UpdateSource;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ .locals 0
+
+ and-int/lit8 p3, p3, 0x2
+
+ if-eqz p3, :cond_0
+
+ const/4 p2, 0x0
+
+ :cond_0
+ invoke-direct {p0, p1, p2}, Lcom/discord/stores/StoreV2$MarkChangedDelegate;->(Ljava/lang/Object;Lcom/discord/stores/updates/ObservationDeck$UpdateSource;)V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public final getValue(Lcom/discord/stores/StoreV2;Lkotlin/reflect/KProperty;)Ljava/lang/Object;
+ .locals 0
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Lcom/discord/stores/StoreV2;",
+ "Lkotlin/reflect/KProperty<",
+ "*>;)TT;"
+ }
+ .end annotation
+
+ if-eqz p2, :cond_0
+
+ iget-object p1, p0, Lcom/discord/stores/StoreV2$MarkChangedDelegate;->value:Ljava/lang/Object;
+
+ return-object p1
+
+ :cond_0
+ const-string p1, "property"
+
+ invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+
+ const/4 p1, 0x0
+
+ throw p1
+.end method
+
+.method public final setValue(Lcom/discord/stores/StoreV2;Lkotlin/reflect/KProperty;Ljava/lang/Object;)V
+ .locals 1
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Lcom/discord/stores/StoreV2;",
+ "Lkotlin/reflect/KProperty<",
+ "*>;TT;)V"
+ }
+ .end annotation
+
+ if-eqz p2, :cond_2
+
+ iget-object p2, p0, Lcom/discord/stores/StoreV2$MarkChangedDelegate;->value:Ljava/lang/Object;
+
+ invoke-static {p2, p3}, Lj0/n/c/h;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+ move-result p2
+
+ const/4 v0, 0x1
+
+ xor-int/2addr p2, v0
+
+ if-eqz p2, :cond_1
+
+ iput-object p3, p0, Lcom/discord/stores/StoreV2$MarkChangedDelegate;->value:Ljava/lang/Object;
+
+ iget-object p2, p0, Lcom/discord/stores/StoreV2$MarkChangedDelegate;->overrideUpdateSource:Lcom/discord/stores/updates/ObservationDeck$UpdateSource;
+
+ if-eqz p2, :cond_0
+
+ if-eqz p1, :cond_1
+
+ new-array p3, v0, [Lcom/discord/stores/updates/ObservationDeck$UpdateSource;
+
+ const/4 v0, 0x0
+
+ aput-object p2, p3, v0
+
+ invoke-virtual {p1, p3}, Lcom/discord/stores/StoreV2;->markChanged([Lcom/discord/stores/updates/ObservationDeck$UpdateSource;)V
+
+ goto :goto_0
+
+ :cond_0
+ if-eqz p1, :cond_1
+
+ invoke-virtual {p1}, Lcom/discord/stores/StoreV2;->markChanged()V
+
+ :cond_1
+ :goto_0
+ return-void
+
+ :cond_2
+ const-string p1, "property"
+
+ 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/stores/StoreV2.smali b/com.discord/smali/com/discord/stores/StoreV2.smali
index 4a580b1dbb..10263e477b 100644
--- a/com.discord/smali/com/discord/stores/StoreV2.smali
+++ b/com.discord/smali/com/discord/stores/StoreV2.smali
@@ -7,6 +7,14 @@
.implements Lcom/discord/stores/updates/ObservationDeck$UpdateSource;
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+ value = {
+ Lcom/discord/stores/StoreV2$MarkChangedDelegate;
+ }
+.end annotation
+
+
# instance fields
.field public final updateSources:Ljava/util/Set;
.annotation system Ldalvik/annotation/Signature;
diff --git a/com.discord/smali/com/discord/stores/StoreVoiceSpeaking.smali b/com.discord/smali/com/discord/stores/StoreVoiceSpeaking.smali
index 45e440355e..002622cb86 100644
--- a/com.discord/smali/com/discord/stores/StoreVoiceSpeaking.smali
+++ b/com.discord/smali/com/discord/stores/StoreVoiceSpeaking.smali
@@ -99,7 +99,7 @@
move-result-object p0
- sget-object v0, Lf/a/k/s;->d:Lf/a/k/s;
+ sget-object v0, Lf/a/k/o;->d:Lf/a/k/o;
invoke-virtual {p0, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
@@ -294,9 +294,9 @@
move-result-object v0
- new-instance v1, Lf/a/k/u;
+ new-instance v1, Lf/a/k/q;
- invoke-direct {v1, p1, p2}, Lf/a/k/u;->(J)V
+ invoke-direct {v1, p1, p2}, Lf/a/k/q;->(J)V
invoke-virtual {v0, v1}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
@@ -351,15 +351,15 @@
move-result-object p1
- sget-object v0, Lf/a/k/v;->d:Lf/a/k/v;
+ sget-object v0, Lf/a/k/r;->d:Lf/a/k/r;
invoke-virtual {p1, v0}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
move-result-object p1
- new-instance v0, Lf/a/k/t;
+ new-instance v0, Lf/a/k/p;
- invoke-direct {v0, p0}, Lf/a/k/t;->(Lcom/discord/stores/StoreVoiceSpeaking;)V
+ invoke-direct {v0, p0}, Lf/a/k/p;->(Lcom/discord/stores/StoreVoiceSpeaking;)V
const-class v1, Lcom/discord/stores/StoreVoiceSpeaking;
diff --git a/com.discord/smali/com/discord/utilities/accessibility/AccessibilityFeatureFlags.smali b/com.discord/smali/com/discord/utilities/accessibility/AccessibilityFeatureFlags.smali
index 3293fba2b8..5046b2ad20 100644
--- a/com.discord/smali/com/discord/utilities/accessibility/AccessibilityFeatureFlags.smali
+++ b/com.discord/smali/com/discord/utilities/accessibility/AccessibilityFeatureFlags.smali
@@ -42,6 +42,8 @@
.field public static final enum REDUCED_MOTION:Lcom/discord/utilities/accessibility/AccessibilityFeatureFlags;
+.field public static final enum REDUCED_MOTION_FROM_USER_SETTINGS:Lcom/discord/utilities/accessibility/AccessibilityFeatureFlags;
+
.field public static final enum REDUCED_TRANSPARENCY:Lcom/discord/utilities/accessibility/AccessibilityFeatureFlags;
.field public static final enum SCREENREADER:Lcom/discord/utilities/accessibility/AccessibilityFeatureFlags;
@@ -59,7 +61,7 @@
.method public static constructor ()V
.locals 6
- const/16 v0, 0x11
+ const/16 v0, 0x12
new-array v0, v0, [Lcom/discord/utilities/accessibility/AccessibilityFeatureFlags;
@@ -301,6 +303,20 @@
aput-object v1, v0, v3
+ new-instance v1, Lcom/discord/utilities/accessibility/AccessibilityFeatureFlags;
+
+ const-string v2, "REDUCED_MOTION_FROM_USER_SETTINGS"
+
+ const/16 v3, 0x11
+
+ const-wide/32 v4, 0x10000
+
+ invoke-direct {v1, v2, v3, v4, v5}, Lcom/discord/utilities/accessibility/AccessibilityFeatureFlags;->(Ljava/lang/String;IJ)V
+
+ sput-object v1, Lcom/discord/utilities/accessibility/AccessibilityFeatureFlags;->REDUCED_MOTION_FROM_USER_SETTINGS:Lcom/discord/utilities/accessibility/AccessibilityFeatureFlags;
+
+ aput-object v1, v0, v3
+
sput-object v0, Lcom/discord/utilities/accessibility/AccessibilityFeatureFlags;->$VALUES:[Lcom/discord/utilities/accessibility/AccessibilityFeatureFlags;
return-void
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
index 0058f87a24..82905ed7b6 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/1246"
+ const-string v4, "Discord-Android/1247"
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, 0x4de
+ const/16 v2, 0x4df
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -205,7 +205,7 @@
const-string v3, "client_version"
- const-string v4, "36.5"
+ const-string v4, "37"
invoke-direct {v2, v3, v4}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali
index c2c739e479..3319384875 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, 0x7f1209a3
+ const v0, 0x7f1209ad
- const v1, 0x7f1209a2
+ const v1, 0x7f1209ac
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, 0x7f1209a1
+ const v0, 0x7f1209ab
- const v1, 0x7f1209a0
+ const v1, 0x7f1209aa
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, 0x7f1209a6
+ const v0, 0x7f1209b0
- const v1, 0x7f1209a5
+ const v1, 0x7f1209af
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, 0x7f12099f
+ const p1, 0x7f1209a9
goto/16 :goto_1
@@ -1540,7 +1540,7 @@
if-nez p1, :cond_1
- const p1, 0x7f120999
+ const p1, 0x7f1209a3
goto :goto_1
@@ -1549,7 +1549,7 @@
if-ne p1, v0, :cond_2
- const p1, 0x7f12099a
+ const p1, 0x7f1209a4
goto :goto_1
@@ -1578,9 +1578,9 @@
if-eqz v0, :cond_4
- const v0, 0x7f120998
+ const v0, 0x7f1209a2
- const v1, 0x7f120997
+ const v1, 0x7f1209a1
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, 0x7f12099e
+ const p1, 0x7f1209a8
goto :goto_1
@@ -1610,9 +1610,9 @@
if-eqz v0, :cond_4
- const v0, 0x7f120994
+ const v0, 0x7f12099e
- const v1, 0x7f120993
+ const v1, 0x7f12099d
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, 0x7f1209ab
+ const p1, 0x7f1209b5
goto :goto_1
@@ -1693,9 +1693,9 @@
if-eqz v0, :cond_3
- const v0, 0x7f1209af
+ const v0, 0x7f1209b9
- const v1, 0x7f1209ae
+ const v1, 0x7f1209b8
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, 0x7f1209ab
+ const p1, 0x7f1209b5
goto :goto_1
@@ -1877,7 +1877,7 @@
goto :goto_0
:cond_5
- const p1, 0x7f120f96
+ const p1, 0x7f120fa4
invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1944,14 +1944,14 @@
if-ne p1, v5, :cond_1
- const v1, 0x7f1209d6
+ const v1, 0x7f1209e0
goto/16 :goto_0
:cond_1
if-nez p1, :cond_2
- const v1, 0x7f1209d5
+ const v1, 0x7f1209df
goto/16 :goto_0
@@ -1980,7 +1980,7 @@
if-eqz p1, :cond_14
- const v1, 0x7f1209c1
+ const v1, 0x7f1209cb
goto/16 :goto_0
@@ -1993,9 +1993,9 @@
if-eqz v0, :cond_14
- const v0, 0x7f1209d4
+ const v0, 0x7f1209de
- const v1, 0x7f1209d3
+ const v1, 0x7f1209dd
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, 0x7f1209cd
+ const v0, 0x7f1209d7
- const v1, 0x7f1209cc
+ const v1, 0x7f1209d6
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, 0x7f1209b6
+ const v1, 0x7f1209c0
goto/16 :goto_0
:cond_5
- const v1, 0x7f1209b5
+ const v1, 0x7f1209bf
goto/16 :goto_0
@@ -2077,9 +2077,9 @@
if-eqz v0, :cond_14
- const v0, 0x7f1209cb
+ const v0, 0x7f1209d5
- const v1, 0x7f1209ca
+ const v1, 0x7f1209d4
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, 0x7f1209bf
+ const v1, 0x7f1209c9
goto/16 :goto_0
:cond_8
- const v1, 0x7f1209be
+ const v1, 0x7f1209c8
goto/16 :goto_0
@@ -2142,9 +2142,9 @@
if-eqz v0, :cond_14
- const v0, 0x7f1209c5
+ const v0, 0x7f1209cf
- const v1, 0x7f1209c4
+ const v1, 0x7f1209ce
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, 0x7f1209c6
+ const v1, 0x7f1209d0
goto/16 :goto_0
@@ -2174,7 +2174,7 @@
if-eqz p1, :cond_14
- const v1, 0x7f1209c0
+ const v1, 0x7f1209ca
goto/16 :goto_0
@@ -2187,7 +2187,7 @@
if-eqz p1, :cond_14
- const v1, 0x7f1209b3
+ const v1, 0x7f1209bd
goto/16 :goto_0
@@ -2231,27 +2231,27 @@
goto/16 :goto_0
:cond_a
- const v1, 0x7f1209d2
+ const v1, 0x7f1209dc
goto/16 :goto_0
:cond_b
- const v1, 0x7f1209ce
+ const v1, 0x7f1209d8
goto/16 :goto_0
:cond_c
- const v1, 0x7f1209d0
+ const v1, 0x7f1209da
goto/16 :goto_0
:cond_d
- const v1, 0x7f1209cf
+ const v1, 0x7f1209d9
goto/16 :goto_0
:cond_e
- const v1, 0x7f1209d1
+ const v1, 0x7f1209db
goto/16 :goto_0
@@ -2271,7 +2271,7 @@
if-eqz p1, :cond_14
- const v1, 0x7f1209c3
+ const v1, 0x7f1209cd
goto/16 :goto_0
@@ -2284,7 +2284,7 @@
if-eqz p1, :cond_14
- const v1, 0x7f1209ab
+ const v1, 0x7f1209b5
goto/16 :goto_0
@@ -2297,9 +2297,9 @@
if-eqz v0, :cond_14
- const v0, 0x7f1209c8
+ const v0, 0x7f1209d2
- const v1, 0x7f1209c7
+ const v1, 0x7f1209d1
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, 0x7f1209bd
+ const v1, 0x7f1209c7
goto :goto_0
@@ -2329,9 +2329,9 @@
if-eqz v0, :cond_14
- const v0, 0x7f1209b2
+ const v0, 0x7f1209bc
- const v1, 0x7f1209b1
+ const v1, 0x7f1209bb
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, 0x7f1209ba
+ const v1, 0x7f1209c4
goto :goto_0
:cond_11
- const v1, 0x7f1209bc
+ const v1, 0x7f1209c6
goto :goto_0
:cond_12
- const v1, 0x7f1209bb
+ const v1, 0x7f1209c5
goto :goto_0
@@ -2401,7 +2401,7 @@
if-eqz p1, :cond_14
- const v1, 0x7f1209b4
+ const v1, 0x7f1209be
:cond_14
:goto_0
@@ -2476,7 +2476,7 @@
if-eqz p1, :cond_a
- const v1, 0x7f1209dd
+ const v1, 0x7f1209e7
goto :goto_0
@@ -2510,12 +2510,12 @@
goto :goto_0
:cond_3
- const v1, 0x7f1209db
+ const v1, 0x7f1209e5
goto :goto_0
:cond_4
- const v1, 0x7f1209dc
+ const v1, 0x7f1209e6
goto :goto_0
@@ -2551,14 +2551,14 @@
if-ne p1, v4, :cond_7
- const v1, 0x7f1209da
+ const v1, 0x7f1209e4
goto :goto_0
:cond_7
if-nez p1, :cond_8
- const v1, 0x7f1209d9
+ const v1, 0x7f1209e3
goto :goto_0
@@ -2632,14 +2632,14 @@
if-ne p1, v0, :cond_1
- const p1, 0x7f1209e8
+ const p1, 0x7f1209f2
goto/16 :goto_1
:cond_1
if-nez p1, :cond_2
- const p1, 0x7f1209e7
+ const p1, 0x7f1209f1
goto/16 :goto_1
@@ -2684,12 +2684,12 @@
if-eqz p1, :cond_4
- const p1, 0x7f1209e3
+ const p1, 0x7f1209ed
goto :goto_1
:cond_4
- const p1, 0x7f1209e4
+ const p1, 0x7f1209ee
goto :goto_1
@@ -2725,12 +2725,12 @@
if-eqz p1, :cond_6
- const p1, 0x7f1209e5
+ const p1, 0x7f1209ef
goto :goto_1
:cond_6
- const p1, 0x7f1209e6
+ const p1, 0x7f1209f0
goto :goto_1
@@ -2750,7 +2750,7 @@
if-eqz p1, :cond_8
- const p1, 0x7f1209e0
+ const p1, 0x7f1209ea
goto :goto_1
@@ -2763,7 +2763,7 @@
if-eqz p1, :cond_8
- const p1, 0x7f1209ab
+ const p1, 0x7f1209b5
goto :goto_1
@@ -2776,7 +2776,7 @@
if-eqz p1, :cond_8
- const p1, 0x7f1209df
+ const p1, 0x7f1209e9
goto :goto_1
@@ -3158,7 +3158,7 @@
if-eqz p2, :cond_a
- const p2, 0x7f12099f
+ const p2, 0x7f1209a9
new-array p3, v6, [Ljava/lang/Object;
@@ -3211,7 +3211,7 @@
if-eqz p2, :cond_a
- const p2, 0x7f12099e
+ const p2, 0x7f1209a8
new-array p3, v6, [Ljava/lang/Object;
@@ -3580,14 +3580,14 @@
if-ne p1, v3, :cond_1
- const p1, 0x7f120a07
+ const p1, 0x7f120a11
goto/16 :goto_1
:cond_1
if-nez p1, :cond_2
- const p1, 0x7f120a06
+ const p1, 0x7f120a10
goto/16 :goto_1
@@ -3632,12 +3632,12 @@
if-nez p1, :cond_4
- const p1, 0x7f120a03
+ const p1, 0x7f120a0d
goto/16 :goto_1
:cond_4
- const p1, 0x7f120a01
+ const p1, 0x7f120a0b
goto/16 :goto_1
@@ -3659,7 +3659,7 @@
if-eqz p1, :cond_9
- const p1, 0x7f120a0d
+ const p1, 0x7f120a17
goto :goto_1
@@ -3686,14 +3686,14 @@
if-ne p1, v3, :cond_6
- const p1, 0x7f120a09
+ const p1, 0x7f120a13
goto :goto_1
:cond_6
if-nez p1, :cond_7
- const p1, 0x7f120a08
+ const p1, 0x7f120a12
goto :goto_1
@@ -3720,9 +3720,9 @@
if-eqz v0, :cond_9
- const v0, 0x7f120a0b
+ const v0, 0x7f120a15
- const v1, 0x7f120a0a
+ const v1, 0x7f120a14
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
@@ -3739,7 +3739,7 @@
if-eqz p1, :cond_9
- const p1, 0x7f120a0c
+ const p1, 0x7f120a16
goto :goto_1
@@ -3752,7 +3752,7 @@
if-eqz p1, :cond_9
- const p1, 0x7f1209ab
+ const p1, 0x7f1209b5
goto :goto_1
@@ -3788,7 +3788,7 @@
if-nez v2, :cond_0
- const p1, 0x7f1204fa
+ const p1, 0x7f1204fb
goto/16 :goto_0
@@ -3799,7 +3799,7 @@
if-nez v2, :cond_1
- const p1, 0x7f120de1
+ const p1, 0x7f120dec
goto/16 :goto_0
@@ -3840,12 +3840,12 @@
if-ne p1, p2, :cond_4
- const p1, 0x7f120e69
+ const p1, 0x7f120e74
goto/16 :goto_0
:cond_4
- const p1, 0x7f120e6b
+ const p1, 0x7f120e76
goto/16 :goto_0
@@ -3856,7 +3856,7 @@
if-nez p3, :cond_6
- const p1, 0x7f120e77
+ const p1, 0x7f120e82
goto/16 :goto_0
@@ -3867,7 +3867,7 @@
if-nez p3, :cond_7
- const p1, 0x7f1203e2
+ const p1, 0x7f1203e3
goto/16 :goto_0
@@ -3878,7 +3878,7 @@
if-nez p3, :cond_8
- const p1, 0x7f120e71
+ const p1, 0x7f120e7c
goto/16 :goto_0
@@ -3889,7 +3889,7 @@
if-nez p3, :cond_9
- const p1, 0x7f120e75
+ const p1, 0x7f120e80
goto/16 :goto_0
@@ -3900,7 +3900,7 @@
if-nez p3, :cond_a
- const p1, 0x7f120e7b
+ const p1, 0x7f120e86
goto/16 :goto_0
@@ -3911,7 +3911,7 @@
if-nez p3, :cond_b
- const p1, 0x7f120e6d
+ const p1, 0x7f120e78
goto/16 :goto_0
@@ -3922,7 +3922,7 @@
if-nez p3, :cond_c
- const p1, 0x7f121798
+ const p1, 0x7f1217a7
goto/16 :goto_0
@@ -3933,7 +3933,7 @@
if-nez p3, :cond_d
- const p1, 0x7f1212f8
+ const p1, 0x7f121306
goto/16 :goto_0
@@ -3944,7 +3944,7 @@
if-nez p3, :cond_e
- const p1, 0x7f12142f
+ const p1, 0x7f12143d
goto/16 :goto_0
@@ -3955,7 +3955,7 @@
if-nez p3, :cond_f
- const p1, 0x7f121431
+ const p1, 0x7f12143f
goto/16 :goto_0
@@ -3966,7 +3966,7 @@
if-nez p3, :cond_10
- const p1, 0x7f120e6e
+ const p1, 0x7f120e79
goto/16 :goto_0
@@ -3977,7 +3977,7 @@
if-nez p3, :cond_11
- const p1, 0x7f1205f0
+ const p1, 0x7f1205f1
goto/16 :goto_0
@@ -3999,7 +3999,7 @@
if-nez p3, :cond_13
- const p1, 0x7f1212f7
+ const p1, 0x7f121305
goto/16 :goto_0
@@ -4010,7 +4010,7 @@
if-nez p3, :cond_14
- const p1, 0x7f120eb5
+ const p1, 0x7f120ec0
goto/16 :goto_0
@@ -4021,7 +4021,7 @@
if-nez p3, :cond_15
- const p1, 0x7f12169c
+ const p1, 0x7f1216a9
goto :goto_0
@@ -4043,7 +4043,7 @@
if-nez p3, :cond_17
- const p1, 0x7f120488
+ const p1, 0x7f120489
goto :goto_0
@@ -4054,7 +4054,7 @@
if-nez p3, :cond_18
- const p1, 0x7f1214a8
+ const p1, 0x7f1214b6
goto :goto_0
@@ -4065,7 +4065,7 @@
if-nez p3, :cond_19
- const p1, 0x7f120f30
+ const p1, 0x7f120f3e
goto :goto_0
@@ -4076,7 +4076,7 @@
if-nez p3, :cond_1a
- const p1, 0x7f120558
+ const p1, 0x7f120559
goto :goto_0
@@ -4087,7 +4087,7 @@
if-nez p3, :cond_1b
- const p1, 0x7f120efd
+ const p1, 0x7f120f0b
goto :goto_0
@@ -4098,7 +4098,7 @@
if-nez p3, :cond_1c
- const p1, 0x7f1216a0
+ const p1, 0x7f1216ad
goto :goto_0
@@ -4109,7 +4109,7 @@
if-nez p3, :cond_1d
- const p1, 0x7f12128e
+ const p1, 0x7f12129c
goto :goto_0
@@ -4120,7 +4120,7 @@
if-nez p3, :cond_1e
- const p1, 0x7f121788
+ const p1, 0x7f121795
goto :goto_0
@@ -4232,7 +4232,7 @@
if-eqz p1, :cond_7
- const p1, 0x7f1209fb
+ const p1, 0x7f120a05
goto/16 :goto_1
@@ -4245,19 +4245,19 @@
if-eqz v0, :cond_7
- const v0, 0x7f1209f4
+ const v0, 0x7f1209fe
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
move-result-object v3
- const v0, 0x7f1209f5
+ const v0, 0x7f1209ff
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
move-result-object v4
- const v0, 0x7f1209f6
+ const v0, 0x7f120a00
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -4302,14 +4302,14 @@
if-ne p1, v3, :cond_1
- const p1, 0x7f1209f3
+ const p1, 0x7f1209fd
goto :goto_1
:cond_1
if-nez p1, :cond_2
- const p1, 0x7f1209f2
+ const p1, 0x7f1209fc
goto :goto_1
@@ -4350,14 +4350,14 @@
if-ne p1, v3, :cond_4
- const p1, 0x7f1209ee
+ const p1, 0x7f1209f8
goto :goto_1
:cond_4
if-nez p1, :cond_5
- const p1, 0x7f1209ed
+ const p1, 0x7f1209f7
goto :goto_1
@@ -4384,7 +4384,7 @@
if-eqz p1, :cond_7
- const p1, 0x7f1209fa
+ const p1, 0x7f120a04
goto :goto_1
@@ -4397,7 +4397,7 @@
if-eqz p1, :cond_7
- const p1, 0x7f1209ab
+ const p1, 0x7f1209b5
goto :goto_1
@@ -4410,7 +4410,7 @@
if-eqz p1, :cond_7
- const p1, 0x7f1209f8
+ const p1, 0x7f120a02
goto :goto_1
@@ -4464,7 +4464,7 @@
if-eqz p1, :cond_1
- const p1, 0x7f120a11
+ const p1, 0x7f120a1b
goto :goto_1
@@ -4477,9 +4477,9 @@
if-eqz v0, :cond_1
- const v0, 0x7f120a17
+ const v0, 0x7f120a21
- const v1, 0x7f120a16
+ const v1, 0x7f120a20
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
@@ -4496,7 +4496,7 @@
if-eqz p1, :cond_1
- const p1, 0x7f1209ab
+ const p1, 0x7f1209b5
goto :goto_1
@@ -4509,9 +4509,9 @@
if-eqz v0, :cond_1
- const v0, 0x7f120a13
+ const v0, 0x7f120a1d
- const v1, 0x7f120a12
+ const v1, 0x7f120a1c
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali
index 1c01eb5e51..9ae85e2ab3 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, 0x7f120a10
+ const p1, 0x7f120a1a
goto/16 :goto_0
:pswitch_0
- const p1, 0x7f12099c
+ const p1, 0x7f1209a6
goto/16 :goto_0
:pswitch_1
- const p1, 0x7f12099d
+ const p1, 0x7f1209a7
goto/16 :goto_0
:pswitch_2
- const p1, 0x7f12099b
+ const p1, 0x7f1209a5
goto/16 :goto_0
:pswitch_3
- const p1, 0x7f120996
+ const p1, 0x7f1209a0
goto/16 :goto_0
:pswitch_4
- const p1, 0x7f1209a9
+ const p1, 0x7f1209b3
goto/16 :goto_0
@@ -203,17 +203,17 @@
if-eq p1, v0, :cond_4
- const p1, 0x7f1209a4
+ const p1, 0x7f1209ae
goto/16 :goto_0
:cond_4
- const p1, 0x7f120995
+ const p1, 0x7f12099f
goto/16 :goto_0
:cond_5
- const p1, 0x7f1209aa
+ const p1, 0x7f1209b4
goto/16 :goto_0
@@ -227,147 +227,147 @@
throw p1
:pswitch_6
- const p1, 0x7f120992
+ const p1, 0x7f12099c
goto/16 :goto_0
:pswitch_7
- const p1, 0x7f1209ef
-
- goto/16 :goto_0
-
- :pswitch_8
- const p1, 0x7f1209f1
-
- goto/16 :goto_0
-
- :pswitch_9
const p1, 0x7f1209f9
goto/16 :goto_0
+ :pswitch_8
+ const p1, 0x7f1209fb
+
+ goto/16 :goto_0
+
+ :pswitch_9
+ const p1, 0x7f120a03
+
+ goto/16 :goto_0
+
:pswitch_a
- const p1, 0x7f1209fc
+ const p1, 0x7f120a06
goto/16 :goto_0
:pswitch_b
- const p1, 0x7f1209ec
+ const p1, 0x7f1209f6
goto/16 :goto_0
:pswitch_c
- const p1, 0x7f1209eb
+ const p1, 0x7f1209f5
goto/16 :goto_0
:pswitch_d
- const p1, 0x7f1209f7
+ const p1, 0x7f120a01
goto :goto_0
:pswitch_e
- const p1, 0x7f1209f0
+ const p1, 0x7f1209fa
goto :goto_0
:pswitch_f
- const p1, 0x7f120a05
+ const p1, 0x7f120a0f
goto :goto_0
:pswitch_10
- const p1, 0x7f120a0e
-
- goto :goto_0
-
- :pswitch_11
- const p1, 0x7f120a04
-
- goto :goto_0
-
- :pswitch_12
- const p1, 0x7f1209e2
-
- goto :goto_0
-
- :pswitch_13
- const p1, 0x7f1209e9
-
- goto :goto_0
-
- :pswitch_14
- const p1, 0x7f1209e1
-
- goto :goto_0
-
- :pswitch_15
- const p1, 0x7f120a15
-
- goto :goto_0
-
- :pswitch_16
const p1, 0x7f120a18
goto :goto_0
+ :pswitch_11
+ const p1, 0x7f120a0e
+
+ goto :goto_0
+
+ :pswitch_12
+ const p1, 0x7f1209ec
+
+ goto :goto_0
+
+ :pswitch_13
+ const p1, 0x7f1209f3
+
+ goto :goto_0
+
+ :pswitch_14
+ const p1, 0x7f1209eb
+
+ goto :goto_0
+
+ :pswitch_15
+ const p1, 0x7f120a1f
+
+ goto :goto_0
+
+ :pswitch_16
+ const p1, 0x7f120a22
+
+ goto :goto_0
+
:pswitch_17
- const p1, 0x7f120a14
+ const p1, 0x7f120a1e
goto :goto_0
:pswitch_18
- const p1, 0x7f1209ad
+ const p1, 0x7f1209b7
goto :goto_0
:pswitch_19
- const p1, 0x7f1209b0
+ const p1, 0x7f1209ba
goto :goto_0
:pswitch_1a
- const p1, 0x7f1209ac
+ const p1, 0x7f1209b6
goto :goto_0
:pswitch_1b
- const p1, 0x7f120a00
+ const p1, 0x7f120a0a
goto :goto_0
:pswitch_1c
- const p1, 0x7f1209ff
+ const p1, 0x7f120a09
goto :goto_0
:pswitch_1d
- const p1, 0x7f1209fd
+ const p1, 0x7f120a07
goto :goto_0
:pswitch_1e
- const p1, 0x7f1209fe
+ const p1, 0x7f120a08
goto :goto_0
:pswitch_1f
- const p1, 0x7f1209d8
+ const p1, 0x7f1209e2
goto :goto_0
:pswitch_20
- const p1, 0x7f1209de
+ const p1, 0x7f1209e8
goto :goto_0
:pswitch_21
- const p1, 0x7f1209d7
+ const p1, 0x7f1209e1
goto :goto_0
:cond_7
- const p1, 0x7f1209c9
+ const p1, 0x7f1209d3
:goto_0
return p1
@@ -1133,7 +1133,7 @@
if-gez v5, :cond_0
- const v1, 0x7f120a0f
+ const v1, 0x7f120a19
const/4 v2, 0x2
@@ -1226,182 +1226,182 @@
goto/16 :goto_0
:pswitch_0
- const p1, 0x7f12097b
+ const p1, 0x7f120985
goto/16 :goto_0
:pswitch_1
- const p1, 0x7f12097c
+ const p1, 0x7f120986
goto/16 :goto_0
:pswitch_2
- const p1, 0x7f12097a
+ const p1, 0x7f120984
goto/16 :goto_0
:pswitch_3
- const p1, 0x7f12098b
+ const p1, 0x7f120995
goto/16 :goto_0
:pswitch_4
- const p1, 0x7f12098a
+ const p1, 0x7f120994
goto/16 :goto_0
:pswitch_5
- const p1, 0x7f120988
+ const p1, 0x7f120992
goto/16 :goto_0
:pswitch_6
- const p1, 0x7f120989
+ const p1, 0x7f120993
goto/16 :goto_0
:pswitch_7
- const p1, 0x7f120977
+ const p1, 0x7f120981
goto/16 :goto_0
:pswitch_8
- const p1, 0x7f120978
+ const p1, 0x7f120982
goto/16 :goto_0
:pswitch_9
- const p1, 0x7f120976
+ const p1, 0x7f120980
goto/16 :goto_0
:pswitch_a
- const p1, 0x7f120990
+ const p1, 0x7f12099a
goto/16 :goto_0
:pswitch_b
- const p1, 0x7f120991
+ const p1, 0x7f12099b
goto/16 :goto_0
:pswitch_c
- const p1, 0x7f12098f
+ const p1, 0x7f120999
goto/16 :goto_0
:pswitch_d
- const p1, 0x7f12097e
+ const p1, 0x7f120988
goto/16 :goto_0
:pswitch_e
- const p1, 0x7f12097f
+ const p1, 0x7f120989
goto :goto_0
:pswitch_f
- const p1, 0x7f12097d
-
- goto :goto_0
-
- :pswitch_10
- const p1, 0x7f12098d
-
- goto :goto_0
-
- :pswitch_11
- const p1, 0x7f12098e
-
- goto :goto_0
-
- :pswitch_12
- const p1, 0x7f12098c
-
- goto :goto_0
-
- :pswitch_13
- const p1, 0x7f12096f
-
- goto :goto_0
-
- :pswitch_14
- const p1, 0x7f120982
-
- goto :goto_0
-
- :pswitch_15
- const p1, 0x7f120984
-
- goto :goto_0
-
- :pswitch_16
- const p1, 0x7f120986
-
- goto :goto_0
-
- :pswitch_17
const p1, 0x7f120987
goto :goto_0
- :pswitch_18
- const p1, 0x7f120981
+ :pswitch_10
+ const p1, 0x7f120997
goto :goto_0
- :pswitch_19
- const p1, 0x7f120980
+ :pswitch_11
+ const p1, 0x7f120998
goto :goto_0
- :pswitch_1a
- const p1, 0x7f120985
+ :pswitch_12
+ const p1, 0x7f120996
goto :goto_0
- :pswitch_1b
- const p1, 0x7f120983
-
- goto :goto_0
-
- :pswitch_1c
- const p1, 0x7f120973
-
- goto :goto_0
-
- :pswitch_1d
- const p1, 0x7f120974
-
- goto :goto_0
-
- :pswitch_1e
- const p1, 0x7f120972
-
- goto :goto_0
-
- :pswitch_1f
- const p1, 0x7f120971
-
- goto :goto_0
-
- :pswitch_20
- const p1, 0x7f120975
-
- goto :goto_0
-
- :pswitch_21
- const p1, 0x7f120970
-
- goto :goto_0
-
- :cond_0
+ :pswitch_13
const p1, 0x7f120979
goto :goto_0
+ :pswitch_14
+ const p1, 0x7f12098c
+
+ goto :goto_0
+
+ :pswitch_15
+ const p1, 0x7f12098e
+
+ goto :goto_0
+
+ :pswitch_16
+ const p1, 0x7f120990
+
+ goto :goto_0
+
+ :pswitch_17
+ const p1, 0x7f120991
+
+ goto :goto_0
+
+ :pswitch_18
+ const p1, 0x7f12098b
+
+ goto :goto_0
+
+ :pswitch_19
+ const p1, 0x7f12098a
+
+ goto :goto_0
+
+ :pswitch_1a
+ const p1, 0x7f12098f
+
+ goto :goto_0
+
+ :pswitch_1b
+ const p1, 0x7f12098d
+
+ goto :goto_0
+
+ :pswitch_1c
+ const p1, 0x7f12097d
+
+ goto :goto_0
+
+ :pswitch_1d
+ const p1, 0x7f12097e
+
+ goto :goto_0
+
+ :pswitch_1e
+ const p1, 0x7f12097c
+
+ goto :goto_0
+
+ :pswitch_1f
+ const p1, 0x7f12097b
+
+ goto :goto_0
+
+ :pswitch_20
+ const p1, 0x7f12097f
+
+ goto :goto_0
+
+ :pswitch_21
+ const p1, 0x7f12097a
+
+ goto :goto_0
+
+ :cond_0
+ const p1, 0x7f120983
+
+ goto :goto_0
+
:cond_1
- const p1, 0x7f120a91
+ const p1, 0x7f120a9b
:goto_0
return p1
@@ -1509,17 +1509,17 @@
goto :goto_1
:cond_1
- const p1, 0x7f08022f
-
- goto :goto_1
-
- :cond_2
const p1, 0x7f080230
goto :goto_1
+ :cond_2
+ const p1, 0x7f080231
+
+ goto :goto_1
+
:cond_3
- const p1, 0x7f08022e
+ const p1, 0x7f08022f
:goto_1
return p1
diff --git a/com.discord/smali/com/discord/utilities/billing/PremiumUtilsKt.smali b/com.discord/smali/com/discord/utilities/billing/PremiumUtilsKt.smali
index 261fc095c7..80c977dd2a 100644
--- a/com.discord/smali/com/discord/utilities/billing/PremiumUtilsKt.smali
+++ b/com.discord/smali/com/discord/utilities/billing/PremiumUtilsKt.smali
@@ -422,11 +422,11 @@
instance-of v0, p0, Lcom/discord/models/domain/ModelPaymentSource$ModelPaymentSourcePaypal;
- const v1, 0x7f080293
+ const v1, 0x7f080294
if-eqz v0, :cond_0
- const v1, 0x7f080295
+ const v1, 0x7f080296
goto/16 :goto_2
@@ -479,7 +479,7 @@
if-eqz p0, :cond_2
- const v1, 0x7f080292
+ const v1, 0x7f080293
goto :goto_2
@@ -503,7 +503,7 @@
if-eqz p0, :cond_2
- const v1, 0x7f080296
+ const v1, 0x7f080297
goto :goto_2
@@ -517,7 +517,7 @@
if-eqz p0, :cond_2
:goto_0
- const v1, 0x7f080291
+ const v1, 0x7f080292
goto :goto_2
@@ -531,7 +531,7 @@
if-eqz p0, :cond_2
:goto_1
- const v1, 0x7f080294
+ const v1, 0x7f080295
goto :goto_2
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 6b8d384109..37834eefe7 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, 0x7f1203c1
+ const v1, 0x7f1203c2
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 7eede486b9..d561ece1b8 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, 0x7f1203c0
+ const v1, 0x7f1203c1
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 c387405dd3..9927037189 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, 0x7f1203c2
+ const p2, 0x7f1203c3
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, 0x7f1203c5
+ const v2, 0x7f1203c6
invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
move-result-object v1
- const v2, 0x7f1203c6
+ const v2, 0x7f1203c7
invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
move-result-object v1
- const v2, 0x7f1203c4
+ const v2, 0x7f1203c5
new-instance v3, Lcom/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1;
@@ -320,7 +320,7 @@
move-result-object p1
- const p2, 0x7f1203b6
+ const p2, 0x7f1203b7
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 3fe1e43c13..0028545bcc 100644
--- a/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali
+++ b/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali
@@ -398,7 +398,7 @@
:cond_0
if-eqz v0, :cond_6
- const p2, 0x7f121655
+ const p2, 0x7f121662
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -409,7 +409,7 @@
:cond_1
if-eqz v0, :cond_6
- const p2, 0x7f120cec
+ const p2, 0x7f120cf7
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -420,7 +420,7 @@
:cond_2
if-eqz v0, :cond_3
- const p2, 0x7f120591
+ const p2, 0x7f120592
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -440,7 +440,7 @@
:cond_4
if-eqz v0, :cond_5
- const p2, 0x7f120ceb
+ const p2, 0x7f120cf6
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/channel/GuildChannelIconUtilsKt.smali b/com.discord/smali/com/discord/utilities/channel/GuildChannelIconUtilsKt.smali
index bbaef8e128..3b718ce9c3 100644
--- a/com.discord/smali/com/discord/utilities/channel/GuildChannelIconUtilsKt.smali
+++ b/com.discord/smali/com/discord/utilities/channel/GuildChannelIconUtilsKt.smali
@@ -136,7 +136,7 @@
if-eqz v0, :cond_0
- const p0, 0x7f080264
+ const p0, 0x7f080265
goto :goto_0
@@ -145,7 +145,7 @@
if-eqz v0, :cond_1
- const p0, 0x7f08025f
+ const p0, 0x7f080260
goto :goto_0
@@ -154,7 +154,7 @@
if-eqz v0, :cond_2
- const p0, 0x7f080269
+ const p0, 0x7f08026a
goto :goto_0
@@ -163,7 +163,7 @@
if-eqz v0, :cond_3
- const p0, 0x7f080261
+ const p0, 0x7f080262
goto :goto_0
@@ -172,7 +172,7 @@
if-eqz v0, :cond_4
- const p0, 0x7f080268
+ const p0, 0x7f080269
goto :goto_0
@@ -181,7 +181,7 @@
if-eqz p0, :cond_5
- const p0, 0x7f080260
+ const p0, 0x7f080261
:goto_0
return p0
diff --git a/com.discord/smali/com/discord/utilities/duration/DurationUtilsKt.smali b/com.discord/smali/com/discord/utilities/duration/DurationUtilsKt.smali
index a0fbbbb77d..344a149534 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, 0x7f120bdb
+ const p1, 0x7f120be5
invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -48,7 +48,7 @@
if-gtz v5, :cond_1
- const v1, 0x7f120bdf
+ const v1, 0x7f120be9
new-array v2, v4, [Ljava/lang/Object;
@@ -92,7 +92,7 @@
if-gtz v7, :cond_2
- const v5, 0x7f120bde
+ const v5, 0x7f120be8
new-array v6, v4, [Ljava/lang/Object;
@@ -131,7 +131,7 @@
if-gtz v7, :cond_3
- const v1, 0x7f120bdd
+ const v1, 0x7f120be7
new-array v2, v4, [Ljava/lang/Object;
@@ -164,7 +164,7 @@
goto :goto_0
:cond_3
- const v5, 0x7f120bdc
+ const v5, 0x7f120be6
new-array v6, v4, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/utilities/embed/EmbedResourceUtils.smali b/com.discord/smali/com/discord/utilities/embed/EmbedResourceUtils.smali
index 0c30a4360a..f63ea01c6a 100644
--- a/com.discord/smali/com/discord/utilities/embed/EmbedResourceUtils.smali
+++ b/com.discord/smali/com/discord/utilities/embed/EmbedResourceUtils.smali
@@ -563,7 +563,7 @@
goto :goto_0
:cond_1
- const p1, 0x7f0802de
+ const p1, 0x7f0802df
:goto_0
return p1
diff --git a/com.discord/smali/com/discord/utilities/embed/FileType.smali b/com.discord/smali/com/discord/utilities/embed/FileType.smali
index ece81609b9..830c9c01e2 100644
--- a/com.discord/smali/com/discord/utilities/embed/FileType.smali
+++ b/com.discord/smali/com/discord/utilities/embed/FileType.smali
@@ -420,52 +420,52 @@
throw v0
:pswitch_0
- const v0, 0x7f0802e1
+ const v0, 0x7f0802e2
goto :goto_0
:pswitch_1
- const v0, 0x7f0802dd
+ const v0, 0x7f0802de
goto :goto_0
:pswitch_2
- const v0, 0x7f0802d6
+ const v0, 0x7f0802d7
goto :goto_0
:pswitch_3
- const v0, 0x7f0802d5
+ const v0, 0x7f0802d6
goto :goto_0
:pswitch_4
- const v0, 0x7f0802d4
+ const v0, 0x7f0802d5
goto :goto_0
:pswitch_5
- const v0, 0x7f0802d3
+ const v0, 0x7f0802d4
goto :goto_0
:pswitch_6
- const v0, 0x7f0802dc
+ const v0, 0x7f0802dd
goto :goto_0
:pswitch_7
- const v0, 0x7f0802d2
+ const v0, 0x7f0802d3
goto :goto_0
:pswitch_8
- const v0, 0x7f0802d1
+ const v0, 0x7f0802d2
goto :goto_0
:pswitch_9
- const v0, 0x7f0802e0
+ const v0, 0x7f0802e1
:goto_0
return v0
diff --git a/com.discord/smali/com/discord/utilities/error/Error.smali b/com.discord/smali/com/discord/utilities/error/Error.smali
index 9602e7d86c..ef4b08c0bc 100644
--- a/com.discord/smali/com/discord/utilities/error/Error.smali
+++ b/com.discord/smali/com/discord/utilities/error/Error.smali
@@ -671,7 +671,7 @@
packed-switch v0, :pswitch_data_0
:pswitch_0
- const v0, 0x7f120f46
+ const v0, 0x7f120f54
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -684,7 +684,7 @@
return-object p1
:pswitch_1
- const v0, 0x7f120ce4
+ const v0, 0x7f120cef
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -697,7 +697,7 @@
return-object p1
:pswitch_2
- const v0, 0x7f120f45
+ const v0, 0x7f120f53
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -710,7 +710,7 @@
return-object p1
:pswitch_3
- const v0, 0x7f120f42
+ const v0, 0x7f120f50
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -723,7 +723,7 @@
return-object p1
:pswitch_4
- const v0, 0x7f1215bb
+ const v0, 0x7f1215c8
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -736,7 +736,7 @@
return-object p1
:pswitch_5
- const v0, 0x7f120f44
+ const v0, 0x7f120f52
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -749,7 +749,7 @@
return-object p1
:pswitch_6
- const v0, 0x7f120f40
+ const v0, 0x7f120f4e
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -764,7 +764,7 @@
:pswitch_7
iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response;
- const v1, 0x7f120f3d
+ const v1, 0x7f120f4b
invoke-static {v0, p1, v1}, Lcom/discord/utilities/error/Error$Response;->access$100(Lcom/discord/utilities/error/Error$Response;Landroid/content/Context;I)Ljava/lang/String;
@@ -779,7 +779,7 @@
:pswitch_8
iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response;
- const v1, 0x7f120f41
+ const v1, 0x7f120f4f
invoke-static {v0, p1, v1}, Lcom/discord/utilities/error/Error$Response;->access$100(Lcom/discord/utilities/error/Error$Response;Landroid/content/Context;I)Ljava/lang/String;
@@ -792,7 +792,7 @@
return-object p1
:pswitch_9
- const v0, 0x7f1212ea
+ const v0, 0x7f1212f8
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -805,7 +805,7 @@
return-object p1
:pswitch_a
- const v0, 0x7f120f3f
+ const v0, 0x7f120f4d
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -818,7 +818,7 @@
return-object p1
:pswitch_b
- const v0, 0x7f120f3e
+ const v0, 0x7f120f4c
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -833,7 +833,7 @@
:pswitch_c
iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response;
- const v1, 0x7f120f43
+ const v1, 0x7f120f51
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 e58fd9664a..1d891e4512 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, 0x7f120bd7
+ const p2, 0x7f120be1
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 c9ed84e90c..c99d191946 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali
@@ -1416,7 +1416,7 @@
if-eqz p2, :cond_1
- const v1, 0x7f120d7f
+ const v1, 0x7f120d8a
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -1435,7 +1435,7 @@
goto :goto_0
:cond_1
- const v1, 0x7f12055d
+ const v1, 0x7f12055e
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -1512,12 +1512,12 @@
if-eqz p2, :cond_2
- const p2, 0x7f080253
+ const p2, 0x7f080254
goto :goto_1
:cond_2
- const p2, 0x7f080254
+ const p2, 0x7f080255
:goto_1
invoke-direct {v1, p2, p1, v0}, Landroidx/core/app/NotificationCompat$Action$Builder;->(ILjava/lang/CharSequence;Landroid/app/PendingIntent;)V
@@ -1580,7 +1580,7 @@
if-eqz v0, :cond_a
- const v0, 0x7f12108f
+ const v0, 0x7f12109d
new-array v1, v7, [Ljava/lang/Object;
@@ -1644,7 +1644,7 @@
if-ne v1, v7, :cond_1
- const v0, 0x7f120fe4
+ const v0, 0x7f120ff2
new-array v1, v4, [Ljava/lang/Object;
@@ -1714,7 +1714,7 @@
if-ne v1, v7, :cond_5
- const v0, 0x7f120fe9
+ const v0, 0x7f120ff7
new-array v1, v4, [Ljava/lang/Object;
@@ -1771,7 +1771,7 @@
if-nez v0, :cond_a
- const v0, 0x7f120fe2
+ const v0, 0x7f120ff0
new-array v1, v4, [Ljava/lang/Object;
@@ -1798,7 +1798,7 @@
if-eqz v0, :cond_a
- const v0, 0x7f12081b
+ const v0, 0x7f12081c
new-array v1, v7, [Ljava/lang/Object;
@@ -1830,7 +1830,7 @@
goto :goto_2
:cond_8
- const v0, 0x7f120fed
+ const v0, 0x7f120ffb
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1839,7 +1839,7 @@
goto :goto_1
:cond_9
- const v0, 0x7f120fe0
+ const v0, 0x7f120fee
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -2182,7 +2182,7 @@
invoke-direct {p2, v0}, Landroidx/core/app/RemoteInput$Builder;->(Ljava/lang/String;)V
- const v0, 0x7f12142d
+ const v0, 0x7f12143b
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -2228,9 +2228,9 @@
new-instance v1, Landroidx/core/app/NotificationCompat$Action$Builder;
- const v3, 0x7f0803c3
+ const v3, 0x7f0803c4
- const v4, 0x7f120fee
+ const v4, 0x7f120ffc
invoke-virtual {p1, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -2698,9 +2698,9 @@
new-instance v1, Landroidx/core/app/NotificationCompat$Action$Builder;
- const v2, 0x7f08027a
+ const v2, 0x7f08027b
- const v3, 0x7f120e80
+ const v3, 0x7f120e8b
invoke-virtual {p1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -3115,7 +3115,7 @@
goto :goto_0
:cond_0
- const v1, 0x7f1205ac
+ const v1, 0x7f1205ad
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -3372,7 +3372,7 @@
if-eqz v0, :cond_3
- const v0, 0x7f08036a
+ const v0, 0x7f08036b
goto :goto_1
@@ -3385,7 +3385,7 @@
if-eqz v0, :cond_3
- const v0, 0x7f08036c
+ const v0, 0x7f08036d
goto :goto_1
@@ -3398,13 +3398,13 @@
if-eqz v0, :cond_3
- const v0, 0x7f08036b
+ const v0, 0x7f08036c
goto :goto_1
:cond_3
:goto_0
- const v0, 0x7f080369
+ const v0, 0x7f08036a
:goto_1
return v0
@@ -3481,9 +3481,9 @@
new-instance p3, Landroidx/core/app/NotificationCompat$Action$Builder;
- const v0, 0x7f08036f
+ const v0, 0x7f080370
- const v1, 0x7f120feb
+ const v1, 0x7f120ff9
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -3553,7 +3553,7 @@
goto :goto_0
:cond_0
- const v0, 0x7f120c66
+ const v0, 0x7f120c70
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -3679,7 +3679,7 @@
if-nez v0, :cond_4
- const v0, 0x7f120ff3
+ const v0, 0x7f121001
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -3696,7 +3696,7 @@
if-eqz v0, :cond_4
- const v0, 0x7f12081c
+ const v0, 0x7f12081d
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 2386bc012e..d4a2bfe379 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali
@@ -835,7 +835,7 @@
invoke-direct {v0}, Landroidx/core/app/Person$Builder;->()V
- const v1, 0x7f120ea9
+ const v1, 0x7f120eb4
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1204,12 +1204,12 @@
if-eqz p5, :cond_0
- const v2, 0x7f120ff0
+ const v2, 0x7f120ffe
goto :goto_0
:cond_0
- const v2, 0x7f120fef
+ const v2, 0x7f120ffd
:goto_0
sget-object v3, Lcom/discord/utilities/fcm/NotificationActions;->Companion:Lcom/discord/utilities/fcm/NotificationActions$Companion;
@@ -1260,7 +1260,7 @@
move-result-object v5
- const v7, 0x7f08036c
+ const v7, 0x7f08036d
invoke-virtual {v5, v7}, Landroidx/core/app/NotificationCompat$Builder;->setSmallIcon(I)Landroidx/core/app/NotificationCompat$Builder;
@@ -1337,7 +1337,7 @@
new-instance v0, Landroid/app/NotificationChannel;
- const v1, 0x7f12037c
+ const v1, 0x7f12037d
invoke-virtual {p1, v1}, Landroid/app/Application;->getString(I)Ljava/lang/String;
@@ -1351,7 +1351,7 @@
new-instance v2, Landroid/app/NotificationChannel;
- const v3, 0x7f1217a2 # 1.9419E38f
+ const v3, 0x7f1217b4
invoke-virtual {p1, v3}, Landroid/app/Application;->getString(I)Ljava/lang/String;
@@ -1365,7 +1365,7 @@
new-instance v3, Landroid/app/NotificationChannel;
- const v5, 0x7f120ed9
+ const v5, 0x7f120ee4
invoke-virtual {p1, v5}, Landroid/app/Application;->getString(I)Ljava/lang/String;
@@ -1377,7 +1377,7 @@
new-instance v5, Landroid/app/NotificationChannel;
- const v7, 0x7f120594
+ const v7, 0x7f120595
invoke-virtual {p1, v7}, Landroid/app/Application;->getString(I)Ljava/lang/String;
@@ -1389,7 +1389,7 @@
new-instance v7, Landroid/app/NotificationChannel;
- const v8, 0x7f1207b2
+ const v8, 0x7f1207b3
invoke-virtual {p1, v8}, Landroid/app/Application;->getString(I)Ljava/lang/String;
@@ -1401,7 +1401,7 @@
new-instance v8, Landroid/app/NotificationChannel;
- const v9, 0x7f1207fb
+ const v9, 0x7f1207fc
invoke-virtual {p1, v9}, Landroid/app/Application;->getString(I)Ljava/lang/String;
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 6000f46704..b8d40110d6 100644
--- a/com.discord/smali/com/discord/utilities/games/GameDetectionService$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/games/GameDetectionService$Companion.smali
@@ -106,13 +106,13 @@
move-result-object v2
- const v3, 0x7f080369
+ const v3, 0x7f08036a
invoke-virtual {v2, v3}, Landroidx/core/app/NotificationCompat$Builder;->setSmallIcon(I)Landroidx/core/app/NotificationCompat$Builder;
move-result-object v2
- const v3, 0x7f1205ac
+ const v3, 0x7f1205ad
invoke-virtual {p1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -124,7 +124,7 @@
if-nez p2, :cond_0
- const p2, 0x7f1207fb
+ const p2, 0x7f1207fc
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -133,7 +133,7 @@
goto :goto_0
:cond_0
- const v3, 0x7f1207f8
+ const v3, 0x7f1207f9
const/4 v4, 0x1
diff --git a/com.discord/smali/com/discord/utilities/icon/IconUtils.smali b/com.discord/smali/com/discord/utilities/icon/IconUtils.smali
index fc378f6f83..c7e0a6f690 100644
--- a/com.discord/smali/com/discord/utilities/icon/IconUtils.smali
+++ b/com.discord/smali/com/discord/utilities/icon/IconUtils.smali
@@ -3285,7 +3285,7 @@
if-eqz p1, :cond_1
- const p1, 0x7f08044e
+ const p1, 0x7f08044f
goto/16 :goto_3
@@ -3298,7 +3298,7 @@
if-eqz p1, :cond_1
- const p1, 0x7f08045b
+ const p1, 0x7f08045c
goto/16 :goto_3
@@ -3311,7 +3311,7 @@
if-eqz p1, :cond_1
- const p1, 0x7f08045e
+ const p1, 0x7f08045f
goto/16 :goto_3
@@ -3346,7 +3346,7 @@
if-eqz p1, :cond_1
- const p1, 0x7f080457
+ const p1, 0x7f080458
goto/16 :goto_3
@@ -3359,7 +3359,7 @@
if-eqz p1, :cond_1
- const p1, 0x7f08044a
+ const p1, 0x7f08044b
goto :goto_3
@@ -3372,7 +3372,7 @@
if-eqz p1, :cond_1
- const p1, 0x7f080463
+ const p1, 0x7f080464
goto :goto_3
@@ -3385,7 +3385,7 @@
if-eqz p1, :cond_1
- const p1, 0x7f080456
+ const p1, 0x7f080457
goto :goto_3
@@ -3398,7 +3398,7 @@
if-eqz p1, :cond_1
- const p1, 0x7f080461
+ const p1, 0x7f080462
goto :goto_3
@@ -3433,7 +3433,7 @@
if-eqz p1, :cond_1
- const p1, 0x7f080464
+ const p1, 0x7f080465
goto :goto_3
@@ -3447,7 +3447,7 @@
if-eqz p1, :cond_1
:goto_0
- const p1, 0x7f080451
+ const p1, 0x7f080452
goto :goto_3
@@ -3461,13 +3461,13 @@
if-eqz p1, :cond_1
:goto_1
- const p1, 0x7f080453
+ const p1, 0x7f080454
goto :goto_3
:cond_1
:goto_2
- const p1, 0x7f080469
+ const p1, 0x7f08046a
:goto_3
return p1
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 404eb1b2ee..2bc7932aab 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, 0x7f12163e
+ const v3, 0x7f12164b
const/4 v4, 0x1
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali
index 2dc4f2bda8..3389ea5bd2 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali
@@ -607,7 +607,7 @@
if-eqz p3, :cond_0
- const p2, 0x7f121476
+ const p2, 0x7f121484
invoke-virtual {p0, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/io/NetworkUtils.smali b/com.discord/smali/com/discord/utilities/io/NetworkUtils.smali
index a5443202b0..cadc8a824c 100644
--- a/com.discord/smali/com/discord/utilities/io/NetworkUtils.smali
+++ b/com.discord/smali/com/discord/utilities/io/NetworkUtils.smali
@@ -65,29 +65,6 @@
return-object p0
.end method
-.method private final checkNetworkStatePermission(Landroid/content/Context;)V
- .locals 1
-
- const-string v0, "android.permission.ACCESS_NETWORK_STATE"
-
- invoke-static {p1, v0}, Landroidx/core/content/ContextCompat;->checkSelfPermission(Landroid/content/Context;Ljava/lang/String;)I
-
- move-result p1
-
- if-nez p1, :cond_0
-
- return-void
-
- :cond_0
- new-instance p1, Ljava/lang/RuntimeException;
-
- const-string v0, "Must grant ACCESS_NETWORK_STATE permission."
-
- invoke-direct {p1, v0}, Ljava/lang/RuntimeException;->(Ljava/lang/String;)V
-
- throw p1
-.end method
-
.method public static final downloadFile(Landroid/content/Context;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/String;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
.locals 7
.annotation build Landroidx/annotation/RequiresPermission;
@@ -310,15 +287,14 @@
if-eqz p1, :cond_2
- invoke-direct {p0, p1}, Lcom/discord/utilities/io/NetworkUtils;->checkNetworkStatePermission(Landroid/content/Context;)V
-
+ :try_start_0
const-string v1, "connectivity"
invoke-virtual {p1, v1}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
move-result-object p1
- if-eqz p1, :cond_1
+ if-eqz p1, :cond_0
check-cast p1, Landroid/net/ConnectivityManager;
@@ -326,7 +302,7 @@
move-result-object p1
- if-eqz p1, :cond_0
+ if-eqz p1, :cond_1
invoke-virtual {p1}, Landroid/net/NetworkInfo;->getType()I
@@ -334,19 +310,27 @@
invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
- move-result-object v0
+ move-result-object p1
+
+ move-object v0, p1
+
+ goto :goto_0
:cond_0
- return-object v0
-
- :cond_1
new-instance p1, Lkotlin/TypeCastException;
- const-string v0, "null cannot be cast to non-null type android.net.ConnectivityManager"
+ const-string v1, "null cannot be cast to non-null type android.net.ConnectivityManager"
- invoke-direct {p1, v0}, Lkotlin/TypeCastException;->(Ljava/lang/String;)V
+ invoke-direct {p1, v1}, Lkotlin/TypeCastException;->(Ljava/lang/String;)V
throw p1
+ :try_end_0
+ .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+ :catch_0
+ :cond_1
+ :goto_0
+ return-object v0
:cond_2
const-string p1, "context"
@@ -358,16 +342,10 @@
.method public final isDeviceConnected(Landroid/content/Context;)Z
.locals 1
- .annotation build Landroid/annotation/SuppressLint;
- value = {
- "MissingPermission"
- }
- .end annotation
if-eqz p1, :cond_2
- invoke-direct {p0, p1}, Lcom/discord/utilities/io/NetworkUtils;->checkNetworkStatePermission(Landroid/content/Context;)V
-
+ :try_start_0
const-string v0, "connectivity"
invoke-virtual {p1, v0}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
@@ -393,8 +371,7 @@
:cond_0
const/4 p1, 0x0
- :goto_0
- return p1
+ goto :goto_0
:cond_1
new-instance p1, Lkotlin/TypeCastException;
@@ -404,6 +381,14 @@
invoke-direct {p1, v0}, Lkotlin/TypeCastException;->(Ljava/lang/String;)V
throw p1
+ :try_end_0
+ .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0
+
+ :catch_0
+ const/4 p1, 0x1
+
+ :goto_0
+ return p1
:cond_2
const-string p1, "context"
diff --git a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$isStablyConnected$1$1.smali b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$isStablyConnected$1$1.smali
deleted file mode 100644
index 1f4907916a..0000000000
--- a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$isStablyConnected$1$1.smali
+++ /dev/null
@@ -1,82 +0,0 @@
-.class public final Lcom/discord/utilities/networking/NetworkMonitor$isStablyConnected$1$1;
-.super Ljava/lang/Object;
-.source "NetworkMonitor.kt"
-
-# interfaces
-.implements Lr0/k/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/utilities/networking/NetworkMonitor$isStablyConnected$1;->call(Ljava/lang/Boolean;)Lrx/Observable;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
- accessFlags = 0x19
- name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
- value = {
- "",
- "Ljava/lang/Object;",
- "Lr0/k/b<",
- "TT;TR;>;"
- }
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/utilities/networking/NetworkMonitor$isStablyConnected$1$1;
-
-
-# direct methods
-.method public static constructor ()V
- .locals 1
-
- new-instance v0, Lcom/discord/utilities/networking/NetworkMonitor$isStablyConnected$1$1;
-
- invoke-direct {v0}, Lcom/discord/utilities/networking/NetworkMonitor$isStablyConnected$1$1;->()V
-
- sput-object v0, Lcom/discord/utilities/networking/NetworkMonitor$isStablyConnected$1$1;->INSTANCE:Lcom/discord/utilities/networking/NetworkMonitor$isStablyConnected$1$1;
-
- return-void
-.end method
-
-.method public constructor ()V
- .locals 0
-
- invoke-direct {p0}, Ljava/lang/Object;->()V
-
- return-void
-.end method
-
-
-# virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
- .locals 0
-
- check-cast p1, Ljava/lang/Long;
-
- invoke-virtual {p0, p1}, Lcom/discord/utilities/networking/NetworkMonitor$isStablyConnected$1$1;->call(Ljava/lang/Long;)Z
-
- move-result p1
-
- invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
- move-result-object p1
-
- return-object p1
-.end method
-
-.method public final call(Ljava/lang/Long;)Z
- .locals 0
-
- const/4 p1, 0x1
-
- return p1
-.end method
diff --git a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$isStablyConnected$1.smali b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$isStablyConnected$1.smali
deleted file mode 100644
index 43c1248e55..0000000000
--- a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$isStablyConnected$1.smali
+++ /dev/null
@@ -1,124 +0,0 @@
-.class public final Lcom/discord/utilities/networking/NetworkMonitor$isStablyConnected$1;
-.super Ljava/lang/Object;
-.source "NetworkMonitor.kt"
-
-# interfaces
-.implements Lr0/k/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/utilities/networking/NetworkMonitor;->isStablyConnected()Lrx/Observable;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
- accessFlags = 0x19
- name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
- value = {
- "",
- "Ljava/lang/Object;",
- "Lr0/k/b<",
- "TT;",
- "Lrx/Observable<",
- "+TR;>;>;"
- }
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/utilities/networking/NetworkMonitor$isStablyConnected$1;
-
-
-# direct methods
-.method public static constructor ()V
- .locals 1
-
- new-instance v0, Lcom/discord/utilities/networking/NetworkMonitor$isStablyConnected$1;
-
- invoke-direct {v0}, Lcom/discord/utilities/networking/NetworkMonitor$isStablyConnected$1;->()V
-
- sput-object v0, Lcom/discord/utilities/networking/NetworkMonitor$isStablyConnected$1;->INSTANCE:Lcom/discord/utilities/networking/NetworkMonitor$isStablyConnected$1;
-
- return-void
-.end method
-
-.method public constructor ()V
- .locals 0
-
- invoke-direct {p0}, Ljava/lang/Object;->()V
-
- return-void
-.end method
-
-
-# virtual methods
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
- .locals 0
-
- check-cast p1, Ljava/lang/Boolean;
-
- invoke-virtual {p0, p1}, Lcom/discord/utilities/networking/NetworkMonitor$isStablyConnected$1;->call(Ljava/lang/Boolean;)Lrx/Observable;
-
- move-result-object p1
-
- return-object p1
-.end method
-
-.method public final call(Ljava/lang/Boolean;)Lrx/Observable;
- .locals 2
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "(",
- "Ljava/lang/Boolean;",
- ")",
- "Lrx/Observable<",
- "Ljava/lang/Boolean;",
- ">;"
- }
- .end annotation
-
- const-string v0, "isNetworkAvailable"
-
- invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
-
- move-result p1
-
- if-eqz p1, :cond_0
-
- const-wide/16 v0, 0xa
-
- sget-object p1, Ljava/util/concurrent/TimeUnit;->SECONDS:Ljava/util/concurrent/TimeUnit;
-
- invoke-static {v0, v1, p1}, Lrx/Observable;->Z(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
-
- move-result-object p1
-
- sget-object v0, Lcom/discord/utilities/networking/NetworkMonitor$isStablyConnected$1$1;->INSTANCE:Lcom/discord/utilities/networking/NetworkMonitor$isStablyConnected$1$1;
-
- invoke-virtual {p1, v0}, Lrx/Observable;->E(Lr0/k/b;)Lrx/Observable;
-
- move-result-object p1
-
- goto :goto_0
-
- :cond_0
- sget-object p1, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
-
- new-instance v0, Lr0/l/e/j;
-
- invoke-direct {v0, p1}, Lr0/l/e/j;->(Ljava/lang/Object;)V
-
- move-object p1, v0
-
- :goto_0
- return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1.smali b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1.smali
index 6753c891e2..aeedbed13d 100644
--- a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1.smali
+++ b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1.smali
@@ -1,5 +1,5 @@
.class public final Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1;
-.super Landroid/net/ConnectivityManager$NetworkCallback;
+.super Landroid/content/BroadcastReceiver;
.source "NetworkMonitor.kt"
@@ -15,87 +15,53 @@
# instance fields
-.field public final synthetic $context:Landroid/content/Context;
-
.field public final synthetic this$0:Lcom/discord/utilities/networking/NetworkMonitor;
# direct methods
-.method public constructor (Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;)V
+.method public constructor (Lcom/discord/utilities/networking/NetworkMonitor;)V
.locals 0
.annotation system Ldalvik/annotation/Signature;
value = {
- "(",
- "Landroid/content/Context;",
- ")V"
+ "()V"
}
.end annotation
iput-object p1, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor;
- iput-object p2, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1;->$context:Landroid/content/Context;
-
- invoke-direct {p0}, Landroid/net/ConnectivityManager$NetworkCallback;->()V
+ invoke-direct {p0}, Landroid/content/BroadcastReceiver;->()V
return-void
.end method
# virtual methods
-.method public onAvailable(Landroid/net/Network;)V
+.method public onReceive(Landroid/content/Context;Landroid/content/Intent;)V
.locals 1
- if-eqz p1, :cond_0
+ const/4 v0, 0x0
- iget-object p1, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor;
+ if-eqz p1, :cond_1
- iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1;->$context:Landroid/content/Context;
+ if-eqz p2, :cond_0
- invoke-static {p1, v0}, Lcom/discord/utilities/networking/NetworkMonitor;->access$isDeviceConnected(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;)V
+ iget-object p2, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor;
+
+ invoke-static {p2, p1}, Lcom/discord/utilities/networking/NetworkMonitor;->access$updateIsConnected(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;)V
return-void
:cond_0
- const-string p1, "network"
+ const-string p1, "intent"
invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
- const/4 p1, 0x0
+ throw v0
- throw p1
-.end method
-
-.method public onLost(Landroid/net/Network;)V
- .locals 1
-
- if-eqz p1, :cond_0
-
- iget-object p1, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor;
-
- iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1;->$context:Landroid/content/Context;
-
- invoke-static {p1, v0}, Lcom/discord/utilities/networking/NetworkMonitor;->access$isDeviceConnected(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;)V
-
- return-void
-
- :cond_0
- const-string p1, "network"
+ :cond_1
+ const-string p1, "context"
invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
- const/4 p1, 0x0
-
- throw p1
-.end method
-
-.method public onUnavailable()V
- .locals 2
-
- iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor;
-
- iget-object v1, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1;->$context:Landroid/content/Context;
-
- invoke-static {v0, v1}, Lcom/discord/utilities/networking/NetworkMonitor;->access$isDeviceConnected(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;)V
-
- return-void
+ throw v0
.end method
diff --git a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1.smali b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1.smali
new file mode 100644
index 0000000000..2933089c2a
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1.smali
@@ -0,0 +1,101 @@
+.class public final Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;
+.super Landroid/net/ConnectivityManager$NetworkCallback;
+.source "NetworkMonitor.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/utilities/networking/NetworkMonitor;->registerConnectivityNetworkMonitor(Landroid/content/Context;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = null
+.end annotation
+
+
+# instance fields
+.field public final synthetic $context:Landroid/content/Context;
+
+.field public final synthetic this$0:Lcom/discord/utilities/networking/NetworkMonitor;
+
+
+# direct methods
+.method public constructor (Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;)V
+ .locals 0
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Landroid/content/Context;",
+ ")V"
+ }
+ .end annotation
+
+ iput-object p1, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor;
+
+ iput-object p2, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->$context:Landroid/content/Context;
+
+ invoke-direct {p0}, Landroid/net/ConnectivityManager$NetworkCallback;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public onAvailable(Landroid/net/Network;)V
+ .locals 1
+
+ if-eqz p1, :cond_0
+
+ iget-object p1, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor;
+
+ iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->$context:Landroid/content/Context;
+
+ invoke-static {p1, v0}, Lcom/discord/utilities/networking/NetworkMonitor;->access$updateIsConnected(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;)V
+
+ return-void
+
+ :cond_0
+ const-string p1, "network"
+
+ invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+
+ const/4 p1, 0x0
+
+ throw p1
+.end method
+
+.method public onLost(Landroid/net/Network;)V
+ .locals 1
+
+ if-eqz p1, :cond_0
+
+ iget-object p1, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor;
+
+ iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->$context:Landroid/content/Context;
+
+ invoke-static {p1, v0}, Lcom/discord/utilities/networking/NetworkMonitor;->access$updateIsConnected(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;)V
+
+ return-void
+
+ :cond_0
+ const-string p1, "network"
+
+ invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+
+ const/4 p1, 0x0
+
+ throw p1
+.end method
+
+.method public onUnavailable()V
+ .locals 2
+
+ iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->this$0:Lcom/discord/utilities/networking/NetworkMonitor;
+
+ iget-object v1, p0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->$context:Landroid/content/Context;
+
+ invoke-static {v0, v1}, Lcom/discord/utilities/networking/NetworkMonitor;->access$updateIsConnected(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;)V
+
+ return-void
+.end method
diff --git a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor.smali b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor.smali
index 4a80c4a7ee..896438cdc0 100644
--- a/com.discord/smali/com/discord/utilities/networking/NetworkMonitor.smali
+++ b/com.discord/smali/com/discord/utilities/networking/NetworkMonitor.smali
@@ -23,7 +23,13 @@
invoke-direct {p0}, Ljava/lang/Object;->()V
- sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+ invoke-direct {p0, p1}, Lcom/discord/utilities/networking/NetworkMonitor;->isDeviceConnected(Landroid/content/Context;)Z
+
+ move-result v0
+
+ invoke-static {v0}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+ move-result-object v0
invoke-static {v0}, Lrx/subjects/BehaviorSubject;->h0(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
@@ -33,8 +39,6 @@
invoke-direct {p0, p1}, Lcom/discord/utilities/networking/NetworkMonitor;->registerConnectivityNetworkMonitor(Landroid/content/Context;)V
- invoke-direct {p0, p1}, Lcom/discord/utilities/networking/NetworkMonitor;->isDeviceConnected(Landroid/content/Context;)V
-
return-void
:cond_0
@@ -47,36 +51,28 @@
throw p1
.end method
-.method public static final synthetic access$isDeviceConnected(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;)V
+.method public static final synthetic access$updateIsConnected(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;)V
.locals 0
- invoke-direct {p0, p1}, Lcom/discord/utilities/networking/NetworkMonitor;->isDeviceConnected(Landroid/content/Context;)V
+ invoke-direct {p0, p1}, Lcom/discord/utilities/networking/NetworkMonitor;->updateIsConnected(Landroid/content/Context;)V
return-void
.end method
-.method private final isDeviceConnected(Landroid/content/Context;)V
- .locals 2
+.method private final isDeviceConnected(Landroid/content/Context;)Z
+ .locals 1
- iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor;->isConnectedSubject:Lrx/subjects/BehaviorSubject;
+ sget-object v0, Lcom/discord/utilities/io/NetworkUtils;->INSTANCE:Lcom/discord/utilities/io/NetworkUtils;
- sget-object v1, Lcom/discord/utilities/io/NetworkUtils;->INSTANCE:Lcom/discord/utilities/io/NetworkUtils;
-
- invoke-virtual {v1, p1}, Lcom/discord/utilities/io/NetworkUtils;->isDeviceConnected(Landroid/content/Context;)Z
+ invoke-virtual {v0, p1}, Lcom/discord/utilities/io/NetworkUtils;->isDeviceConnected(Landroid/content/Context;)Z
move-result p1
- invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
- move-result-object p1
-
- invoke-virtual {v0, p1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
-
- return-void
+ return p1
.end method
.method private final registerConnectivityNetworkMonitor(Landroid/content/Context;)V
- .locals 3
+ .locals 4
const-string v0, "connectivity"
@@ -93,23 +89,65 @@
:cond_0
check-cast v0, Landroid/net/ConnectivityManager;
- if-eqz v0, :cond_1
+ if-eqz v0, :cond_2
- new-instance v1, Landroid/net/NetworkRequest$Builder;
+ new-instance v1, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;
- invoke-direct {v1}, Landroid/net/NetworkRequest$Builder;->()V
+ invoke-direct {v1, p0, p1}, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$networkCallback$1;->(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;)V
- invoke-virtual {v1}, Landroid/net/NetworkRequest$Builder;->build()Landroid/net/NetworkRequest;
+ sget v2, Landroid/os/Build$VERSION;->SDK_INT:I
- move-result-object v1
+ const/16 v3, 0x18
- new-instance v2, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1;
+ if-lt v2, v3, :cond_1
- invoke-direct {v2, p0, p1}, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1;->(Lcom/discord/utilities/networking/NetworkMonitor;Landroid/content/Context;)V
+ invoke-virtual {v0, v1}, Landroid/net/ConnectivityManager;->registerDefaultNetworkCallback(Landroid/net/ConnectivityManager$NetworkCallback;)V
- invoke-virtual {v0, v1, v2}, Landroid/net/ConnectivityManager;->registerNetworkCallback(Landroid/net/NetworkRequest;Landroid/net/ConnectivityManager$NetworkCallback;)V
+ goto :goto_0
:cond_1
+ new-instance v2, Landroid/content/IntentFilter;
+
+ const-string v3, "android.net.conn.CONNECTIVITY_CHANGE"
+
+ invoke-direct {v2, v3}, Landroid/content/IntentFilter;->(Ljava/lang/String;)V
+
+ new-instance v3, Landroid/net/NetworkRequest$Builder;
+
+ invoke-direct {v3}, Landroid/net/NetworkRequest$Builder;->()V
+
+ invoke-virtual {v3}, Landroid/net/NetworkRequest$Builder;->build()Landroid/net/NetworkRequest;
+
+ move-result-object v3
+
+ invoke-virtual {v0, v3, v1}, Landroid/net/ConnectivityManager;->registerNetworkCallback(Landroid/net/NetworkRequest;Landroid/net/ConnectivityManager$NetworkCallback;)V
+
+ new-instance v0, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1;
+
+ invoke-direct {v0, p0}, Lcom/discord/utilities/networking/NetworkMonitor$registerConnectivityNetworkMonitor$1;->(Lcom/discord/utilities/networking/NetworkMonitor;)V
+
+ invoke-virtual {p1, v0, v2}, Landroid/content/Context;->registerReceiver(Landroid/content/BroadcastReceiver;Landroid/content/IntentFilter;)Landroid/content/Intent;
+
+ :cond_2
+ :goto_0
+ return-void
+.end method
+
+.method private final updateIsConnected(Landroid/content/Context;)V
+ .locals 1
+
+ iget-object v0, p0, Lcom/discord/utilities/networking/NetworkMonitor;->isConnectedSubject:Lrx/subjects/BehaviorSubject;
+
+ invoke-direct {p0, p1}, Lcom/discord/utilities/networking/NetworkMonitor;->isDeviceConnected(Landroid/content/Context;)Z
+
+ move-result p1
+
+ invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+ move-result-object p1
+
+ invoke-virtual {v0, p1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V
+
return-void
.end method
@@ -138,49 +176,3 @@
return-object v0
.end method
-
-.method public final isStablyConnected()Lrx/Observable;
- .locals 3
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "()",
- "Lrx/Observable<",
- "Ljava/lang/Boolean;",
- ">;"
- }
- .end annotation
-
- invoke-virtual {p0}, Lcom/discord/utilities/networking/NetworkMonitor;->getIsConnected()Lrx/Observable;
-
- move-result-object v0
-
- const/4 v1, 0x1
-
- invoke-virtual {v0, v1}, Lrx/Observable;->V(I)Lrx/Observable;
-
- move-result-object v0
-
- invoke-virtual {p0}, Lcom/discord/utilities/networking/NetworkMonitor;->getIsConnected()Lrx/Observable;
-
- move-result-object v1
-
- sget-object v2, Lcom/discord/utilities/networking/NetworkMonitor$isStablyConnected$1;->INSTANCE:Lcom/discord/utilities/networking/NetworkMonitor$isStablyConnected$1;
-
- invoke-virtual {v1, v2}, Lrx/Observable;->U(Lr0/k/b;)Lrx/Observable;
-
- move-result-object v1
-
- invoke-static {v0, v1}, Lrx/Observable;->m(Lrx/Observable;Lrx/Observable;)Lrx/Observable;
-
- move-result-object v0
-
- invoke-virtual {v0}, Lrx/Observable;->q()Lrx/Observable;
-
- move-result-object v0
-
- const-string v1, "Observable.concat(\n \u2026 .distinctUntilChanged()"
-
- invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/utilities/networking/NetworkMonitorKt.smali b/com.discord/smali/com/discord/utilities/networking/NetworkMonitorKt.smali
deleted file mode 100644
index 264e5ec3d9..0000000000
--- a/com.discord/smali/com/discord/utilities/networking/NetworkMonitorKt.smali
+++ /dev/null
@@ -1,7 +0,0 @@
-.class public final Lcom/discord/utilities/networking/NetworkMonitorKt;
-.super Ljava/lang/Object;
-.source "NetworkMonitor.kt"
-
-
-# static fields
-.field public static final NETWORK_STABILITY_WINDOW_SECS:J = 0xaL
diff --git a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali
index 4666eb6eb8..f16de4dbb2 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, 0x7f1205a9
+ const v1, 0x7f1205aa
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, 0x7f1205a8
+ const v0, 0x7f1205a9
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, 0x7f0a0630
+ const v0, 0x7f0a062e
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -188,13 +188,13 @@
move-result-object v7
- const p2, 0x7f1203b6
+ const p2, 0x7f1203b7
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
move-result-object v6
- const p2, 0x7f1205a6
+ const p2, 0x7f1205a7
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, 0x7f1212ec
+ const v0, 0x7f1212fa
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, 0x7f1212eb
+ const v0, 0x7f1212f9
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -266,7 +266,7 @@
const/4 v3, 0x1
- const v4, 0x7f0a0630
+ const v4, 0x7f0a062e
invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -282,7 +282,7 @@
const/4 v3, 0x2
- const v4, 0x7f0a062b
+ const v4, 0x7f0a0629
invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -300,13 +300,13 @@
move-result-object v5
- const v0, 0x7f12106e
+ const v0, 0x7f12107c
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
move-result-object v3
- const v0, 0x7f120f95
+ const v0, 0x7f120fa3
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/persister/Persister$Companion.smali b/com.discord/smali/com/discord/utilities/persister/Persister$Companion.smali
index 72ca3a7615..cbcdd9ce05 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister$Companion.smali
@@ -384,7 +384,7 @@
.end method
.method public final reset()V
- .locals 2
+ .locals 5
invoke-static {}, Lcom/discord/utilities/persister/Persister;->access$getPreferences$cp()Ljava/util/List;
@@ -416,7 +416,13 @@
if-eqz v1, :cond_0
- invoke-virtual {v1}, Lcom/discord/utilities/persister/Persister;->clear()Ljava/lang/Object;
+ const/4 v2, 0x0
+
+ const/4 v3, 0x1
+
+ const/4 v4, 0x0
+
+ invoke-static {v1, v2, v3, v4}, Lcom/discord/utilities/persister/Persister;->clear$default(Lcom/discord/utilities/persister/Persister;ZILjava/lang/Object;)Ljava/lang/Object;
goto :goto_0
diff --git a/com.discord/smali/com/discord/utilities/persister/Persister.smali b/com.discord/smali/com/discord/utilities/persister/Persister.smali
index 71429fe977..8d893a2403 100644
--- a/com.discord/smali/com/discord/utilities/persister/Persister.smali
+++ b/com.discord/smali/com/discord/utilities/persister/Persister.smali
@@ -326,6 +326,25 @@
return-void
.end method
+.method public static synthetic clear$default(Lcom/discord/utilities/persister/Persister;ZILjava/lang/Object;)Ljava/lang/Object;
+ .locals 0
+
+ const/4 p3, 0x1
+
+ and-int/2addr p2, p3
+
+ if-eqz p2, :cond_0
+
+ const/4 p1, 0x1
+
+ :cond_0
+ invoke-virtual {p0, p1}, Lcom/discord/utilities/persister/Persister;->clear(Z)Ljava/lang/Object;
+
+ move-result-object p0
+
+ return-object p0
+.end method
+
.method public static synthetic fileValue$annotations()V
.locals 0
@@ -890,28 +909,43 @@
# virtual methods
.method public final clear()Ljava/lang/Object;
- .locals 4
+ .locals 3
.annotation system Ldalvik/annotation/Signature;
value = {
"()TT;"
}
.end annotation
- iget-object v0, p0, Lcom/discord/utilities/persister/Persister;->defaultValue:Ljava/lang/Object;
+ const/4 v0, 0x0
- const/4 v1, 0x0
+ const/4 v1, 0x1
- const/4 v2, 0x2
+ const/4 v2, 0x0
- const/4 v3, 0x0
-
- invoke-static {p0, v0, v1, v2, v3}, Lcom/discord/utilities/persister/Persister;->set$default(Lcom/discord/utilities/persister/Persister;Ljava/lang/Object;ZILjava/lang/Object;)Ljava/lang/Object;
+ invoke-static {p0, v0, v1, v2}, Lcom/discord/utilities/persister/Persister;->clear$default(Lcom/discord/utilities/persister/Persister;ZILjava/lang/Object;)Ljava/lang/Object;
move-result-object v0
return-object v0
.end method
+.method public final clear(Z)Ljava/lang/Object;
+ .locals 1
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(Z)TT;"
+ }
+ .end annotation
+
+ iget-object v0, p0, Lcom/discord/utilities/persister/Persister;->defaultValue:Ljava/lang/Object;
+
+ invoke-virtual {p0, v0, p1}, Lcom/discord/utilities/persister/Persister;->set(Ljava/lang/Object;Z)Ljava/lang/Object;
+
+ move-result-object p1
+
+ return-object p1
+.end method
+
.method public final declared-synchronized get()Ljava/lang/Object;
.locals 1
.annotation system Ldalvik/annotation/Signature;
diff --git a/com.discord/smali/com/discord/utilities/platform/Platform.smali b/com.discord/smali/com/discord/utilities/platform/Platform.smali
index 25b2464088..5fb4d53459 100644
--- a/com.discord/smali/com/discord/utilities/platform/Platform.smali
+++ b/com.discord/smali/com/discord/utilities/platform/Platform.smali
@@ -95,13 +95,13 @@
move-result-object v5
- const v1, 0x7f08020c
+ const v1, 0x7f08020d
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
move-result-object v6
- const v1, 0x7f080447
+ const v1, 0x7f080448
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -141,13 +141,13 @@
move-result-object v18
- const v2, 0x7f0801fa
+ const v2, 0x7f0801fb
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
move-result-object v19
- const v2, 0x7f08024b
+ const v2, 0x7f08024c
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -187,13 +187,13 @@
move-result-object v7
- const v2, 0x7f0801ff
+ const v2, 0x7f080200
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
move-result-object v8
- const v2, 0x7f0802c6
+ const v2, 0x7f0802c7
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -231,13 +231,13 @@
move-result-object v7
- const v2, 0x7f080201
+ const v2, 0x7f080202
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
move-result-object v8
- const v2, 0x7f0802f3
+ const v2, 0x7f0802f4
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -273,13 +273,13 @@
move-result-object v7
- const v2, 0x7f080202
+ const v2, 0x7f080203
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
move-result-object v8
- const v2, 0x7f080336
+ const v2, 0x7f080337
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -303,7 +303,7 @@
new-instance v1, Lcom/discord/utilities/platform/Platform;
- const v2, 0x7f080204
+ const v2, 0x7f080205
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -333,7 +333,7 @@
new-instance v1, Lcom/discord/utilities/platform/Platform;
- const v2, 0x7f080205
+ const v2, 0x7f080206
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -363,13 +363,13 @@
move-result-object v7
- const v2, 0x7f080206
+ const v2, 0x7f080207
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
move-result-object v8
- const v2, 0x7f0803b2
+ const v2, 0x7f0803b3
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -433,13 +433,13 @@
move-result-object v7
- const v2, 0x7f080207
+ const v2, 0x7f080208
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
move-result-object v8
- const v2, 0x7f0803d8
+ const v2, 0x7f0803d9
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -473,13 +473,13 @@
move-result-object v7
- const v2, 0x7f080208
+ const v2, 0x7f080209
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
move-result-object v8
- const v2, 0x7f0803e2
+ const v2, 0x7f0803e3
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -515,13 +515,13 @@
move-result-object v7
- const v2, 0x7f080209
+ const v2, 0x7f08020a
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
move-result-object v8
- const v2, 0x7f0803ec
+ const v2, 0x7f0803ed
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -555,13 +555,13 @@
move-result-object v7
- const v2, 0x7f08020a
+ const v2, 0x7f08020b
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
move-result-object v8
- const v2, 0x7f08040a
+ const v2, 0x7f08040b
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -591,13 +591,13 @@
move-result-object v7
- const v2, 0x7f08020b
+ const v2, 0x7f08020c
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
move-result-object v8
- const v2, 0x7f08040c
+ const v2, 0x7f08040d
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -621,7 +621,7 @@
new-instance v1, Lcom/discord/utilities/platform/Platform;
- const v2, 0x7f08020d
+ const v2, 0x7f08020e
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -659,13 +659,13 @@
move-result-object v7
- const v2, 0x7f08020e
+ const v2, 0x7f08020f
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
move-result-object v8
- const v2, 0x7f080448
+ const v2, 0x7f080449
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -699,13 +699,13 @@
move-result-object v7
- const v2, 0x7f080200
+ const v2, 0x7f080201
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
move-result-object v8
- const v2, 0x7f0802f1
+ const v2, 0x7f0802f2
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
diff --git a/com.discord/smali/com/discord/utilities/premium/PremiumUtils.smali b/com.discord/smali/com/discord/utilities/premium/PremiumUtils.smali
index ed836514e7..8d4efd8bff 100644
--- a/com.discord/smali/com/discord/utilities/premium/PremiumUtils.smali
+++ b/com.discord/smali/com/discord/utilities/premium/PremiumUtils.smali
@@ -276,12 +276,12 @@
goto :goto_2
:cond_2
- const p1, 0x7f080162
+ const p1, 0x7f080163
goto :goto_2
:cond_3
- const p1, 0x7f080161
+ const p1, 0x7f080162
:goto_2
return p1
diff --git a/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali b/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali
index 31f7067f6d..ad9a5feb11 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, 0x7f1216b4
+ const v1, 0x7f1216c1
const/4 v2, 0x0
@@ -104,7 +104,7 @@
goto :goto_1
:cond_0
- const v0, 0x7f1216b7
+ const v0, 0x7f1216c4
new-array v1, v3, [Ljava/lang/Object;
@@ -121,7 +121,7 @@
goto :goto_1
:cond_1
- const v0, 0x7f1216b2
+ const v0, 0x7f1216bf
new-array v1, v3, [Ljava/lang/Object;
@@ -138,7 +138,7 @@
goto :goto_1
:cond_2
- const v0, 0x7f1216b3
+ const v0, 0x7f1216c0
new-array v1, v3, [Ljava/lang/Object;
@@ -185,7 +185,7 @@
:goto_0
if-eqz p1, :cond_5
- const v0, 0x7f1216b5
+ const v0, 0x7f1216c2
new-array v3, v3, [Ljava/lang/Object;
@@ -267,7 +267,7 @@
goto :goto_2
:cond_1
- const v1, 0x7f1217bf
+ const v1, 0x7f1217d1
new-array v3, v3, [Ljava/lang/Object;
@@ -294,7 +294,7 @@
goto :goto_2
:cond_3
- const v1, 0x7f120e0f
+ const v1, 0x7f120e1a
new-array v3, v3, [Ljava/lang/Object;
@@ -311,7 +311,7 @@
goto :goto_2
:cond_4
- const v1, 0x7f121522
+ const v1, 0x7f12152f
new-array v3, v3, [Ljava/lang/Object;
@@ -338,7 +338,7 @@
goto :goto_2
:cond_6
- const v1, 0x7f121139
+ const v1, 0x7f121147
new-array v3, v3, [Ljava/lang/Object;
@@ -376,7 +376,7 @@
if-eqz p2, :cond_0
- const v0, 0x7f121522
+ const v0, 0x7f12152f
const/4 v1, 0x1
@@ -399,7 +399,7 @@
goto :goto_0
:cond_0
- const p2, 0x7f121523
+ const p2, 0x7f121530
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -562,22 +562,22 @@
if-eq p1, v0, :cond_2
:goto_1
- const p1, 0x7f1214cc
+ const p1, 0x7f1214da
goto :goto_2
:cond_2
- const p1, 0x7f1214c7
+ const p1, 0x7f1214d5
goto :goto_2
:cond_3
- const p1, 0x7f1214c9
+ const p1, 0x7f1214d7
goto :goto_2
:cond_4
- const p1, 0x7f1214cd
+ const p1, 0x7f1214db
:goto_2
return p1
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali
index 61fe88692b..5ac056ca77 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali
@@ -159,7 +159,7 @@
.method public getUserAgent()Ljava/lang/String;
.locals 1
- const-string v0, "Discord-Android/1246"
+ const-string v0, "Discord-Android/1247"
return-object v0
.end method
diff --git a/com.discord/smali/com/discord/utilities/rest/SendUtils.smali b/com.discord/smali/com/discord/utilities/rest/SendUtils.smali
index 59c6fcf30e..a151090503 100644
--- a/com.discord/smali/com/discord/utilities/rest/SendUtils.smali
+++ b/com.discord/smali/com/discord/utilities/rest/SendUtils.smali
@@ -105,17 +105,17 @@
goto :goto_0
:cond_0
- const p2, 0x7f1206a5
+ const p2, 0x7f1206a6
goto :goto_0
:cond_1
- const p2, 0x7f1206a4
+ const p2, 0x7f1206a5
goto :goto_0
:cond_2
- const p2, 0x7f1206a6
+ const p2, 0x7f1206a7
:goto_0
const v0, 0x7f0d018b
@@ -142,7 +142,7 @@
invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v3, 0x7f0a0210
+ const v3, 0x7f0a0212
invoke-virtual {v0, v3}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -546,7 +546,7 @@
goto :goto_0
:cond_1
- const p3, 0x7f120f3d
+ const p3, 0x7f120f4b
const/16 v2, 0xc
@@ -649,7 +649,7 @@
const/4 v5, 0x3
- const v1, 0x7f12128a
+ const v1, 0x7f121298
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/search/strings/ContextSearchStringProvider.smali b/com.discord/smali/com/discord/utilities/search/strings/ContextSearchStringProvider.smali
index 381ae953ef..72092299dc 100644
--- a/com.discord/smali/com/discord/utilities/search/strings/ContextSearchStringProvider.smali
+++ b/com.discord/smali/com/discord/utilities/search/strings/ContextSearchStringProvider.smali
@@ -36,7 +36,7 @@
invoke-direct {p0}, Ljava/lang/Object;->()V
- const v0, 0x7f1213ec
+ const v0, 0x7f1213fa
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -48,7 +48,7 @@
iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->fromFilterString:Ljava/lang/String;
- const v0, 0x7f1213ee
+ const v0, 0x7f1213fc
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -60,7 +60,7 @@
iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->inFilterString:Ljava/lang/String;
- const v0, 0x7f1213f0
+ const v0, 0x7f1213fe
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -72,7 +72,7 @@
iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->mentionsFilterString:Ljava/lang/String;
- const v0, 0x7f1213ed
+ const v0, 0x7f1213fb
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -84,7 +84,7 @@
iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->hasFilterString:Ljava/lang/String;
- const v0, 0x7f1213d7
+ const v0, 0x7f1213e5
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -96,7 +96,7 @@
iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->linkAnswerString:Ljava/lang/String;
- const v0, 0x7f1213d5
+ const v0, 0x7f1213e3
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -108,7 +108,7 @@
iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->embedAnswerString:Ljava/lang/String;
- const v0, 0x7f1213d4
+ const v0, 0x7f1213e2
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -120,7 +120,7 @@
iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->fileAnswerString:Ljava/lang/String;
- const v0, 0x7f1213d9
+ const v0, 0x7f1213e7
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -132,7 +132,7 @@
iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->videoAnswerString:Ljava/lang/String;
- const v0, 0x7f1213d6
+ const v0, 0x7f1213e4
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -144,7 +144,7 @@
iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->imageAnswerString:Ljava/lang/String;
- const v0, 0x7f1213d8
+ const v0, 0x7f1213e6
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler.smali b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler.smali
index e6afeafc3e..cd438e136b 100644
--- a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler.smali
+++ b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler.smali
@@ -170,7 +170,7 @@
invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v2, 0x7f0a0a36
+ const v2, 0x7f0a0a34
invoke-virtual {v0, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -178,7 +178,7 @@
check-cast v2, Landroid/widget/TextView;
- const v3, 0x7f0a0a37
+ const v3, 0x7f0a0a35
invoke-virtual {v0, v3}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -186,7 +186,7 @@
check-cast v3, Landroid/widget/TextView;
- const v4, 0x7f0a0a34
+ const v4, 0x7f0a0a32
invoke-virtual {v0, v4}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -194,7 +194,7 @@
check-cast v4, Landroid/widget/TextView;
- const v5, 0x7f0a0a35
+ const v5, 0x7f0a0a33
invoke-virtual {v0, v5}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -202,11 +202,11 @@
check-cast v0, Landroid/widget/TextView;
- const v5, 0x7f1205a2
+ const v5, 0x7f1205a3
invoke-virtual {v2, v5}, Landroid/widget/TextView;->setText(I)V
- const v2, 0x7f1205a3
+ const v2, 0x7f1205a4
invoke-virtual {v3, v2}, Landroid/widget/TextView;->setText(I)V
@@ -216,7 +216,7 @@
invoke-virtual {v4, v2}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
- const v2, 0x7f12106e
+ const v2, 0x7f12107c
invoke-virtual {v0, v2}, Landroid/widget/TextView;->setText(I)V
diff --git a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$CovidNewUserSurvey$1.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$CovidNewUserSurvey$1.smali
index 77db1a1354..50b03aba9a 100644
--- a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$CovidNewUserSurvey$1.smali
+++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey$CovidNewUserSurvey$1.smali
@@ -73,7 +73,7 @@
if-eqz p1, :cond_0
- const v0, 0x7f1204e1
+ const v0, 0x7f1204e2
invoke-virtual {p1, v0}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey.smali b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey.smali
index 29216d8cfd..61ef9ff5dc 100644
--- a/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey.smali
+++ b/com.discord/smali/com/discord/utilities/surveys/SurveyUtils$Survey.smali
@@ -141,7 +141,7 @@
throw v0
:cond_1
- const v0, 0x7f120fda
+ const v0, 0x7f120fe8
invoke-virtual {p1, v0}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali
index 593c8b657c..dee23e3efc 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali
@@ -33,19 +33,19 @@
:array_0
.array-data 4
- 0x7f121561
- 0x7f121562
- 0x7f121563
- 0x7f121564
- 0x7f121565
- 0x7f121566
- 0x7f121567
- 0x7f121568
- 0x7f121569
- 0x7f12156a
- 0x7f12156b
- 0x7f12156c
- 0x7f12156d
+ 0x7f12156e
+ 0x7f12156f
+ 0x7f121570
+ 0x7f121571
+ 0x7f121572
+ 0x7f121573
+ 0x7f121574
+ 0x7f121575
+ 0x7f121576
+ 0x7f121577
+ 0x7f121578
+ 0x7f121579
+ 0x7f12157a # 1.941788E38f
.end array-data
.end method
diff --git a/com.discord/smali/com/discord/utilities/uri/UriHandler.smali b/com.discord/smali/com/discord/utilities/uri/UriHandler.smali
index 5f30172863..2a15a644f8 100644
--- a/com.discord/smali/com/discord/utilities/uri/UriHandler.smali
+++ b/com.discord/smali/com/discord/utilities/uri/UriHandler.smali
@@ -910,7 +910,7 @@
move-result-object p1
- const v1, 0x7f0a09b2
+ const v1, 0x7f0a09b0
invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -918,7 +918,7 @@
check-cast v1, Landroid/widget/TextView;
- const v2, 0x7f0a09b3
+ const v2, 0x7f0a09b1
invoke-virtual {v0, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -1199,7 +1199,7 @@
return-void
:cond_6
- const p2, 0x7f12164a
+ const p2, 0x7f121657
const/16 v1, 0xc
diff --git a/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$animatorFactoryScaleUp$1.smali b/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$animatorFactoryScaleUp$1.smali
index 3909eb7b62..36a6410134 100644
--- a/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$animatorFactoryScaleUp$1.smali
+++ b/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer$animatorFactoryScaleUp$1.smali
@@ -56,7 +56,7 @@
if-eqz p1, :cond_1
- const v1, 0x7f0a0385
+ const v1, 0x7f0a0387
invoke-virtual {p1, v1}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
diff --git a/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer.smali b/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer.smali
index 756f75b45b..3389a86cd3 100644
--- a/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer.smali
+++ b/com.discord/smali/com/discord/utilities/views/FloatingButtonMenuInitializer.smali
@@ -205,7 +205,7 @@
move-result v0
- const v1, 0x7f0a0384
+ const v1, 0x7f0a0386
if-ne v0, v1, :cond_0
diff --git a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$Companion.smali b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$Companion.smali
index a0d25ed63e..6074df523a 100644
--- a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$Companion.smali
@@ -76,7 +76,7 @@
if-nez v1, :cond_0
- const v1, 0x7f121099
+ const v1, 0x7f1210a7
const/4 v2, 0x1
diff --git a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$createVoiceBubble$1.smali b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$createVoiceBubble$1.smali
index 2ed9026cfb..0560773670 100644
--- a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$createVoiceBubble$1.smali
+++ b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService$createVoiceBubble$1.smali
@@ -63,7 +63,7 @@
move-result-object v1
- const v2, 0x7f0a0676
+ const v2, 0x7f0a0674
invoke-virtual {v1, v2}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
diff --git a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService.smali b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService.smali
index a34b16c6f7..36757456c7 100644
--- a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService.smali
+++ b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService.smali
@@ -278,7 +278,7 @@
move-result-object v1
- const v3, 0x7f080369
+ const v3, 0x7f08036a
invoke-virtual {v1, v3}, Landroidx/core/app/NotificationCompat$Builder;->setSmallIcon(I)Landroidx/core/app/NotificationCompat$Builder;
@@ -294,7 +294,7 @@
move-result-object v1
- const v3, 0x7f121088
+ const v3, 0x7f121096
invoke-virtual {p0, v3}, Landroid/app/Service;->getString(I)Ljava/lang/String;
@@ -304,7 +304,7 @@
move-result-object v1
- const v3, 0x7f12109a
+ const v3, 0x7f1210a8
invoke-virtual {p0, v3}, Landroid/app/Service;->getString(I)Ljava/lang/String;
@@ -318,25 +318,25 @@
move-result-object v1
- const v2, 0x7f120439
+ const v2, 0x7f12043a
invoke-virtual {p0, v2}, Landroid/app/Service;->getString(I)Ljava/lang/String;
move-result-object v2
- const v3, 0x7f080289
+ const v3, 0x7f08028a
invoke-virtual {v1, v3, v2, p1}, Landroidx/core/app/NotificationCompat$Builder;->addAction(ILjava/lang/CharSequence;Landroid/app/PendingIntent;)Landroidx/core/app/NotificationCompat$Builder;
move-result-object p1
- const v1, 0x7f121455
+ const v1, 0x7f121463
invoke-virtual {p0, v1}, Landroid/app/Service;->getString(I)Ljava/lang/String;
move-result-object v1
- const v2, 0x7f0803c7
+ const v2, 0x7f0803c8
invoke-virtual {p1, v2, v1, v0}, Landroidx/core/app/NotificationCompat$Builder;->addAction(ILjava/lang/CharSequence;Landroid/app/PendingIntent;)Landroidx/core/app/NotificationCompat$Builder;
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali
index 868d7da2f3..45790c0ffb 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali
@@ -130,13 +130,13 @@
new-instance v6, Landroidx/core/app/NotificationCompat$Action;
- const v7, 0x7f080254
+ const v7, 0x7f080255
invoke-virtual {p2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
move-result-object v8
- const v9, 0x7f1205a6
+ const v9, 0x7f1205a7
invoke-virtual {v8, v9}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -152,13 +152,13 @@
new-instance v0, Landroidx/core/app/NotificationCompat$Action;
- const v2, 0x7f08034b
+ const v2, 0x7f08034c
invoke-virtual {p2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
move-result-object v6
- const v7, 0x7f12164f
+ const v7, 0x7f12165c
invoke-virtual {v6, v7}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -171,13 +171,13 @@
:cond_0
new-instance v0, Landroidx/core/app/NotificationCompat$Action;
- const v2, 0x7f08034a
+ const v2, 0x7f08034b
invoke-virtual {p2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
move-result-object v6
- const v7, 0x7f120f25
+ const v7, 0x7f120f33
invoke-virtual {v6, v7}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -194,13 +194,13 @@
new-instance p1, Landroidx/core/app/NotificationCompat$Action;
- const v1, 0x7f080318
+ const v1, 0x7f080319
invoke-virtual {p2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
move-result-object p2
- const v2, 0x7f121648
+ const v2, 0x7f121655
invoke-virtual {p2, v2}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -213,13 +213,13 @@
:cond_1
new-instance p1, Landroidx/core/app/NotificationCompat$Action;
- const v1, 0x7f080317
+ const v1, 0x7f080318
invoke-virtual {p2}, Landroid/content/Context;->getResources()Landroid/content/res/Resources;
move-result-object p2
- const v2, 0x7f120557
+ const v2, 0x7f120558
invoke-virtual {p2, v2}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -306,7 +306,7 @@
move-result-object v1
- const v2, 0x7f080369
+ const v2, 0x7f08036a
invoke-virtual {v1, v2}, Landroidx/core/app/NotificationCompat$Builder;->setSmallIcon(I)Landroidx/core/app/NotificationCompat$Builder;
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceViewUtils.smali b/com.discord/smali/com/discord/utilities/voice/VoiceViewUtils.smali
index fea5f45648..74e9c75101 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceViewUtils.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceViewUtils.smali
@@ -60,19 +60,19 @@
if-ne p2, v0, :cond_0
- const p1, 0x7f080255
+ const p1, 0x7f080256
goto :goto_0
:cond_0
if-eqz p1, :cond_1
- const p1, 0x7f080256
+ const p1, 0x7f080257
goto :goto_0
:cond_1
- const p1, 0x7f080257
+ const p1, 0x7f080258
:goto_0
return p1
@@ -97,7 +97,7 @@
if-ne v0, v1, :cond_1
- const p2, 0x7f1204ae
+ const p2, 0x7f1204af
new-array p4, v1, [Ljava/lang/Object;
@@ -142,7 +142,7 @@
if-eqz p3, :cond_2
- const p2, 0x7f1204a8
+ const p2, 0x7f1204a9
goto :goto_2
@@ -155,7 +155,7 @@
if-eqz p3, :cond_3
- const p2, 0x7f1204ab
+ const p2, 0x7f1204ac
goto :goto_2
@@ -168,7 +168,7 @@
if-eqz p3, :cond_4
- const p2, 0x7f1204a6
+ const p2, 0x7f1204a7
goto :goto_2
@@ -181,7 +181,7 @@
if-eqz p3, :cond_5
- const p2, 0x7f1204a5
+ const p2, 0x7f1204a6
goto :goto_2
@@ -194,7 +194,7 @@
if-eqz p3, :cond_6
- const p2, 0x7f1204ac
+ const p2, 0x7f1204ad
goto :goto_2
@@ -209,12 +209,12 @@
if-eqz p4, :cond_7
- const p2, 0x7f1204af
+ const p2, 0x7f1204b0
goto :goto_2
:cond_7
- const p2, 0x7f1204b0
+ const p2, 0x7f1204b1
goto :goto_2
@@ -240,7 +240,7 @@
if-nez p2, :cond_b
:goto_1
- const p2, 0x7f1204a9
+ const p2, 0x7f1204aa
:goto_2
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -453,7 +453,7 @@
.annotation build Landroidx/annotation/DrawableRes;
.end annotation
- const v0, 0x7f08043d
+ const v0, 0x7f08043e
if-nez p1, :cond_0
@@ -481,17 +481,17 @@
goto :goto_0
:cond_1
- const v0, 0x7f08043c
+ const v0, 0x7f08043d
goto :goto_0
:cond_2
- const v0, 0x7f08043a
+ const v0, 0x7f08043b
goto :goto_0
:cond_3
- const v0, 0x7f08043b
+ const v0, 0x7f08043c
:cond_4
:goto_0
diff --git a/com.discord/smali/com/discord/utils/R$b.smali b/com.discord/smali/com/discord/utils/R$b.smali
index 158065cfbd..3d61cb5a66 100644
--- a/com.discord/smali/com/discord/utils/R$b.smali
+++ b/com.discord/smali/com/discord/utils/R$b.smali
@@ -14,333 +14,333 @@
# static fields
-.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080031
+.field public static final abc_ab_share_pack_mtrl_alpha:I = 0x7f080032
-.field public static final abc_action_bar_item_background_material:I = 0x7f080032
+.field public static final abc_action_bar_item_background_material:I = 0x7f080033
-.field public static final abc_btn_borderless_material:I = 0x7f080033
+.field public static final abc_btn_borderless_material:I = 0x7f080034
-.field public static final abc_btn_check_material:I = 0x7f080034
+.field public static final abc_btn_check_material:I = 0x7f080035
-.field public static final abc_btn_check_material_anim:I = 0x7f080035
+.field public static final abc_btn_check_material_anim:I = 0x7f080036
-.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f080036
+.field public static final abc_btn_check_to_on_mtrl_000:I = 0x7f080037
-.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f080037
+.field public static final abc_btn_check_to_on_mtrl_015:I = 0x7f080038
-.field public static final abc_btn_colored_material:I = 0x7f080038
+.field public static final abc_btn_colored_material:I = 0x7f080039
-.field public static final abc_btn_default_mtrl_shape:I = 0x7f080039
+.field public static final abc_btn_default_mtrl_shape:I = 0x7f08003a
-.field public static final abc_btn_radio_material:I = 0x7f08003a
+.field public static final abc_btn_radio_material:I = 0x7f08003b
-.field public static final abc_btn_radio_material_anim:I = 0x7f08003b
+.field public static final abc_btn_radio_material_anim:I = 0x7f08003c
-.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08003c
+.field public static final abc_btn_radio_to_on_mtrl_000:I = 0x7f08003d
-.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f08003d
+.field public static final abc_btn_radio_to_on_mtrl_015:I = 0x7f08003e
-.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f08003e
+.field public static final abc_btn_switch_to_on_mtrl_00001:I = 0x7f08003f
-.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f08003f
+.field public static final abc_btn_switch_to_on_mtrl_00012:I = 0x7f080040
-.field public static final abc_cab_background_internal_bg:I = 0x7f080040
+.field public static final abc_cab_background_internal_bg:I = 0x7f080041
-.field public static final abc_cab_background_top_material:I = 0x7f080041
+.field public static final abc_cab_background_top_material:I = 0x7f080042
-.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080042
+.field public static final abc_cab_background_top_mtrl_alpha:I = 0x7f080043
-.field public static final abc_control_background_material:I = 0x7f080043
+.field public static final abc_control_background_material:I = 0x7f080044
-.field public static final abc_dialog_material_background:I = 0x7f080044
+.field public static final abc_dialog_material_background:I = 0x7f080045
-.field public static final abc_edit_text_material:I = 0x7f080045
+.field public static final abc_edit_text_material:I = 0x7f080046
-.field public static final abc_ic_ab_back_material:I = 0x7f080046
+.field public static final abc_ic_ab_back_material:I = 0x7f080047
-.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f080047
+.field public static final abc_ic_arrow_drop_right_black_24dp:I = 0x7f080048
-.field public static final abc_ic_clear_material:I = 0x7f080048
+.field public static final abc_ic_clear_material:I = 0x7f080049
-.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f080049
+.field public static final abc_ic_commit_search_api_mtrl_alpha:I = 0x7f08004a
-.field public static final abc_ic_go_search_api_material:I = 0x7f08004a
+.field public static final abc_ic_go_search_api_material:I = 0x7f08004b
-.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08004b
+.field public static final abc_ic_menu_copy_mtrl_am_alpha:I = 0x7f08004c
-.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08004c
+.field public static final abc_ic_menu_cut_mtrl_alpha:I = 0x7f08004d
-.field public static final abc_ic_menu_overflow_material:I = 0x7f08004d
+.field public static final abc_ic_menu_overflow_material:I = 0x7f08004e
-.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f08004e
+.field public static final abc_ic_menu_paste_mtrl_am_alpha:I = 0x7f08004f
-.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f08004f
+.field public static final abc_ic_menu_selectall_mtrl_alpha:I = 0x7f080050
-.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080050
+.field public static final abc_ic_menu_share_mtrl_alpha:I = 0x7f080051
-.field public static final abc_ic_search_api_material:I = 0x7f080051
+.field public static final abc_ic_search_api_material:I = 0x7f080052
-.field public static final abc_ic_star_black_16dp:I = 0x7f080052
+.field public static final abc_ic_star_black_16dp:I = 0x7f080053
-.field public static final abc_ic_star_black_36dp:I = 0x7f080053
+.field public static final abc_ic_star_black_36dp:I = 0x7f080054
-.field public static final abc_ic_star_black_48dp:I = 0x7f080054
+.field public static final abc_ic_star_black_48dp:I = 0x7f080055
-.field public static final abc_ic_star_half_black_16dp:I = 0x7f080055
+.field public static final abc_ic_star_half_black_16dp:I = 0x7f080056
-.field public static final abc_ic_star_half_black_36dp:I = 0x7f080056
+.field public static final abc_ic_star_half_black_36dp:I = 0x7f080057
-.field public static final abc_ic_star_half_black_48dp:I = 0x7f080057
+.field public static final abc_ic_star_half_black_48dp:I = 0x7f080058
-.field public static final abc_ic_voice_search_api_material:I = 0x7f080058
+.field public static final abc_ic_voice_search_api_material:I = 0x7f080059
-.field public static final abc_item_background_holo_dark:I = 0x7f080059
+.field public static final abc_item_background_holo_dark:I = 0x7f08005a
-.field public static final abc_item_background_holo_light:I = 0x7f08005a
+.field public static final abc_item_background_holo_light:I = 0x7f08005b
-.field public static final abc_list_divider_material:I = 0x7f08005b
+.field public static final abc_list_divider_material:I = 0x7f08005c
-.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08005c
+.field public static final abc_list_divider_mtrl_alpha:I = 0x7f08005d
-.field public static final abc_list_focused_holo:I = 0x7f08005d
+.field public static final abc_list_focused_holo:I = 0x7f08005e
-.field public static final abc_list_longpressed_holo:I = 0x7f08005e
+.field public static final abc_list_longpressed_holo:I = 0x7f08005f
-.field public static final abc_list_pressed_holo_dark:I = 0x7f08005f
+.field public static final abc_list_pressed_holo_dark:I = 0x7f080060
-.field public static final abc_list_pressed_holo_light:I = 0x7f080060
+.field public static final abc_list_pressed_holo_light:I = 0x7f080061
-.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080061
+.field public static final abc_list_selector_background_transition_holo_dark:I = 0x7f080062
-.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080062
+.field public static final abc_list_selector_background_transition_holo_light:I = 0x7f080063
-.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080063
+.field public static final abc_list_selector_disabled_holo_dark:I = 0x7f080064
-.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080064
+.field public static final abc_list_selector_disabled_holo_light:I = 0x7f080065
-.field public static final abc_list_selector_holo_dark:I = 0x7f080065
+.field public static final abc_list_selector_holo_dark:I = 0x7f080066
-.field public static final abc_list_selector_holo_light:I = 0x7f080066
+.field public static final abc_list_selector_holo_light:I = 0x7f080067
-.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f080067
+.field public static final abc_menu_hardkey_panel_mtrl_mult:I = 0x7f080068
-.field public static final abc_popup_background_mtrl_mult:I = 0x7f080068
+.field public static final abc_popup_background_mtrl_mult:I = 0x7f080069
-.field public static final abc_ratingbar_indicator_material:I = 0x7f080069
+.field public static final abc_ratingbar_indicator_material:I = 0x7f08006a
-.field public static final abc_ratingbar_material:I = 0x7f08006a
+.field public static final abc_ratingbar_material:I = 0x7f08006b
-.field public static final abc_ratingbar_small_material:I = 0x7f08006b
+.field public static final abc_ratingbar_small_material:I = 0x7f08006c
-.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08006c
+.field public static final abc_scrubber_control_off_mtrl_alpha:I = 0x7f08006d
-.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f08006d
+.field public static final abc_scrubber_control_to_pressed_mtrl_000:I = 0x7f08006e
-.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f08006e
+.field public static final abc_scrubber_control_to_pressed_mtrl_005:I = 0x7f08006f
-.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f08006f
+.field public static final abc_scrubber_primary_mtrl_alpha:I = 0x7f080070
-.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080070
+.field public static final abc_scrubber_track_mtrl_alpha:I = 0x7f080071
-.field public static final abc_seekbar_thumb_material:I = 0x7f080071
+.field public static final abc_seekbar_thumb_material:I = 0x7f080072
-.field public static final abc_seekbar_tick_mark_material:I = 0x7f080072
+.field public static final abc_seekbar_tick_mark_material:I = 0x7f080073
-.field public static final abc_seekbar_track_material:I = 0x7f080073
+.field public static final abc_seekbar_track_material:I = 0x7f080074
-.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080074
+.field public static final abc_spinner_mtrl_am_alpha:I = 0x7f080075
-.field public static final abc_spinner_textfield_background_material:I = 0x7f080075
+.field public static final abc_spinner_textfield_background_material:I = 0x7f080076
-.field public static final abc_switch_thumb_material:I = 0x7f080076
+.field public static final abc_switch_thumb_material:I = 0x7f080077
-.field public static final abc_switch_track_mtrl_alpha:I = 0x7f080077
+.field public static final abc_switch_track_mtrl_alpha:I = 0x7f080078
-.field public static final abc_tab_indicator_material:I = 0x7f080078
+.field public static final abc_tab_indicator_material:I = 0x7f080079
-.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f080079
+.field public static final abc_tab_indicator_mtrl_alpha:I = 0x7f08007a
-.field public static final abc_text_cursor_material:I = 0x7f08007a
+.field public static final abc_text_cursor_material:I = 0x7f08007b
-.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08007b
+.field public static final abc_text_select_handle_left_mtrl_dark:I = 0x7f08007c
-.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08007c
+.field public static final abc_text_select_handle_left_mtrl_light:I = 0x7f08007d
-.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f08007d
+.field public static final abc_text_select_handle_middle_mtrl_dark:I = 0x7f08007e
-.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f08007e
+.field public static final abc_text_select_handle_middle_mtrl_light:I = 0x7f08007f
-.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f08007f
+.field public static final abc_text_select_handle_right_mtrl_dark:I = 0x7f080080
-.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080080
+.field public static final abc_text_select_handle_right_mtrl_light:I = 0x7f080081
-.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080081
+.field public static final abc_textfield_activated_mtrl_alpha:I = 0x7f080082
-.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080082
+.field public static final abc_textfield_default_mtrl_alpha:I = 0x7f080083
-.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080083
+.field public static final abc_textfield_search_activated_mtrl_alpha:I = 0x7f080084
-.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080084
+.field public static final abc_textfield_search_default_mtrl_alpha:I = 0x7f080085
-.field public static final abc_textfield_search_material:I = 0x7f080085
+.field public static final abc_textfield_search_material:I = 0x7f080086
-.field public static final abc_vector_test:I = 0x7f080086
+.field public static final abc_vector_test:I = 0x7f080087
-.field public static final avd_hide_password:I = 0x7f0800a4
+.field public static final avd_hide_password:I = 0x7f0800a5
-.field public static final avd_show_password:I = 0x7f0800a5
+.field public static final avd_show_password:I = 0x7f0800a6
-.field public static final btn_checkbox_checked_mtrl:I = 0x7f0800c0
+.field public static final btn_checkbox_checked_mtrl:I = 0x7f0800c1
-.field public static final btn_checkbox_checked_to_unchecked_mtrl_animation:I = 0x7f0800c1
+.field public static final btn_checkbox_checked_to_unchecked_mtrl_animation:I = 0x7f0800c2
-.field public static final btn_checkbox_unchecked_mtrl:I = 0x7f0800c2
+.field public static final btn_checkbox_unchecked_mtrl:I = 0x7f0800c3
-.field public static final btn_checkbox_unchecked_to_checked_mtrl_animation:I = 0x7f0800c3
+.field public static final btn_checkbox_unchecked_to_checked_mtrl_animation:I = 0x7f0800c4
-.field public static final btn_radio_off_mtrl:I = 0x7f0800c4
+.field public static final btn_radio_off_mtrl:I = 0x7f0800c5
-.field public static final btn_radio_off_to_on_mtrl_animation:I = 0x7f0800c5
+.field public static final btn_radio_off_to_on_mtrl_animation:I = 0x7f0800c6
-.field public static final btn_radio_on_mtrl:I = 0x7f0800c6
+.field public static final btn_radio_on_mtrl:I = 0x7f0800c7
-.field public static final btn_radio_on_to_off_mtrl_animation:I = 0x7f0800c7
+.field public static final btn_radio_on_to_off_mtrl_animation:I = 0x7f0800c8
-.field public static final common_full_open_on_phone:I = 0x7f0800d2
+.field public static final common_full_open_on_phone:I = 0x7f0800d3
-.field public static final common_google_signin_btn_icon_dark:I = 0x7f0800d3
+.field public static final common_google_signin_btn_icon_dark:I = 0x7f0800d4
-.field public static final common_google_signin_btn_icon_dark_focused:I = 0x7f0800d4
+.field public static final common_google_signin_btn_icon_dark_focused:I = 0x7f0800d5
-.field public static final common_google_signin_btn_icon_dark_normal:I = 0x7f0800d5
+.field public static final common_google_signin_btn_icon_dark_normal:I = 0x7f0800d6
-.field public static final common_google_signin_btn_icon_dark_normal_background:I = 0x7f0800d6
+.field public static final common_google_signin_btn_icon_dark_normal_background:I = 0x7f0800d7
-.field public static final common_google_signin_btn_icon_disabled:I = 0x7f0800d7
+.field public static final common_google_signin_btn_icon_disabled:I = 0x7f0800d8
-.field public static final common_google_signin_btn_icon_light:I = 0x7f0800d8
+.field public static final common_google_signin_btn_icon_light:I = 0x7f0800d9
-.field public static final common_google_signin_btn_icon_light_focused:I = 0x7f0800d9
+.field public static final common_google_signin_btn_icon_light_focused:I = 0x7f0800da
-.field public static final common_google_signin_btn_icon_light_normal:I = 0x7f0800da
+.field public static final common_google_signin_btn_icon_light_normal:I = 0x7f0800db
-.field public static final common_google_signin_btn_icon_light_normal_background:I = 0x7f0800db
+.field public static final common_google_signin_btn_icon_light_normal_background:I = 0x7f0800dc
-.field public static final common_google_signin_btn_text_dark:I = 0x7f0800dc
+.field public static final common_google_signin_btn_text_dark:I = 0x7f0800dd
-.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f0800dd
+.field public static final common_google_signin_btn_text_dark_focused:I = 0x7f0800de
-.field public static final common_google_signin_btn_text_dark_normal:I = 0x7f0800de
+.field public static final common_google_signin_btn_text_dark_normal:I = 0x7f0800df
-.field public static final common_google_signin_btn_text_dark_normal_background:I = 0x7f0800df
+.field public static final common_google_signin_btn_text_dark_normal_background:I = 0x7f0800e0
-.field public static final common_google_signin_btn_text_disabled:I = 0x7f0800e0
+.field public static final common_google_signin_btn_text_disabled:I = 0x7f0800e1
-.field public static final common_google_signin_btn_text_light:I = 0x7f0800e1
+.field public static final common_google_signin_btn_text_light:I = 0x7f0800e2
-.field public static final common_google_signin_btn_text_light_focused:I = 0x7f0800e2
+.field public static final common_google_signin_btn_text_light_focused:I = 0x7f0800e3
-.field public static final common_google_signin_btn_text_light_normal:I = 0x7f0800e3
+.field public static final common_google_signin_btn_text_light_normal:I = 0x7f0800e4
-.field public static final common_google_signin_btn_text_light_normal_background:I = 0x7f0800e4
+.field public static final common_google_signin_btn_text_light_normal_background:I = 0x7f0800e5
-.field public static final design_bottom_navigation_item_background:I = 0x7f0800ea
+.field public static final design_bottom_navigation_item_background:I = 0x7f0800eb
-.field public static final design_fab_background:I = 0x7f0800eb
+.field public static final design_fab_background:I = 0x7f0800ec
-.field public static final design_ic_visibility:I = 0x7f0800ec
+.field public static final design_ic_visibility:I = 0x7f0800ed
-.field public static final design_ic_visibility_off:I = 0x7f0800ed
+.field public static final design_ic_visibility_off:I = 0x7f0800ee
-.field public static final design_password_eye:I = 0x7f0800ee
+.field public static final design_password_eye:I = 0x7f0800ef
-.field public static final design_snackbar_background:I = 0x7f0800ef
+.field public static final design_snackbar_background:I = 0x7f0800f0
-.field public static final drawable_chip_background:I = 0x7f08012a
+.field public static final drawable_chip_background:I = 0x7f08012b
-.field public static final drawable_chip_circle:I = 0x7f08012b
+.field public static final drawable_chip_circle:I = 0x7f08012c
-.field public static final drawable_chip_delete:I = 0x7f08012c
+.field public static final drawable_chip_delete:I = 0x7f08012d
-.field public static final googleg_disabled_color_18:I = 0x7f0801f8
+.field public static final googleg_disabled_color_18:I = 0x7f0801f9
-.field public static final googleg_standard_color_18:I = 0x7f0801f9
+.field public static final googleg_standard_color_18:I = 0x7f0801fa
-.field public static final ic_arrow_down_24dp:I = 0x7f080221
+.field public static final ic_arrow_down_24dp:I = 0x7f080222
-.field public static final ic_mtrl_checked_circle:I = 0x7f080353
+.field public static final ic_mtrl_checked_circle:I = 0x7f080354
-.field public static final ic_mtrl_chip_checked_black:I = 0x7f080354
+.field public static final ic_mtrl_chip_checked_black:I = 0x7f080355
-.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080355
+.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080356
-.field public static final ic_mtrl_chip_close_circle:I = 0x7f080356
+.field public static final ic_mtrl_chip_close_circle:I = 0x7f080357
-.field public static final material_ic_calendar_black_24dp:I = 0x7f0804ef
+.field public static final material_ic_calendar_black_24dp:I = 0x7f0804f0
-.field public static final material_ic_clear_black_24dp:I = 0x7f0804f0
+.field public static final material_ic_clear_black_24dp:I = 0x7f0804f1
-.field public static final material_ic_edit_black_24dp:I = 0x7f0804f1
+.field public static final material_ic_edit_black_24dp:I = 0x7f0804f2
-.field public static final material_ic_keyboard_arrow_left_black_24dp:I = 0x7f0804f2
+.field public static final material_ic_keyboard_arrow_left_black_24dp:I = 0x7f0804f3
-.field public static final material_ic_keyboard_arrow_right_black_24dp:I = 0x7f0804f3
+.field public static final material_ic_keyboard_arrow_right_black_24dp:I = 0x7f0804f4
-.field public static final material_ic_menu_arrow_down_black_24dp:I = 0x7f0804f4
+.field public static final material_ic_menu_arrow_down_black_24dp:I = 0x7f0804f5
-.field public static final material_ic_menu_arrow_up_black_24dp:I = 0x7f0804f5
+.field public static final material_ic_menu_arrow_up_black_24dp:I = 0x7f0804f6
-.field public static final mtrl_dialog_background:I = 0x7f0804f6
+.field public static final mtrl_dialog_background:I = 0x7f0804f7
-.field public static final mtrl_dropdown_arrow:I = 0x7f0804f7
+.field public static final mtrl_dropdown_arrow:I = 0x7f0804f8
-.field public static final mtrl_ic_arrow_drop_down:I = 0x7f0804f8
+.field public static final mtrl_ic_arrow_drop_down:I = 0x7f0804f9
-.field public static final mtrl_ic_arrow_drop_up:I = 0x7f0804f9
+.field public static final mtrl_ic_arrow_drop_up:I = 0x7f0804fa
-.field public static final mtrl_ic_cancel:I = 0x7f0804fa
+.field public static final mtrl_ic_cancel:I = 0x7f0804fb
-.field public static final mtrl_ic_error:I = 0x7f0804fb
+.field public static final mtrl_ic_error:I = 0x7f0804fc
-.field public static final mtrl_popupmenu_background:I = 0x7f0804fc
+.field public static final mtrl_popupmenu_background:I = 0x7f0804fd
-.field public static final mtrl_popupmenu_background_dark:I = 0x7f0804fd
+.field public static final mtrl_popupmenu_background_dark:I = 0x7f0804fe
-.field public static final mtrl_tabs_default_indicator:I = 0x7f0804fe
+.field public static final mtrl_tabs_default_indicator:I = 0x7f0804ff
-.field public static final navigation_empty_icon:I = 0x7f0804ff
+.field public static final navigation_empty_icon:I = 0x7f080500
-.field public static final notification_action_background:I = 0x7f080500
+.field public static final notification_action_background:I = 0x7f080501
-.field public static final notification_bg:I = 0x7f080501
+.field public static final notification_bg:I = 0x7f080502
-.field public static final notification_bg_low:I = 0x7f080502
+.field public static final notification_bg_low:I = 0x7f080503
-.field public static final notification_bg_low_normal:I = 0x7f080503
+.field public static final notification_bg_low_normal:I = 0x7f080504
-.field public static final notification_bg_low_pressed:I = 0x7f080504
+.field public static final notification_bg_low_pressed:I = 0x7f080505
-.field public static final notification_bg_normal:I = 0x7f080505
+.field public static final notification_bg_normal:I = 0x7f080506
-.field public static final notification_bg_normal_pressed:I = 0x7f080506
+.field public static final notification_bg_normal_pressed:I = 0x7f080507
-.field public static final notification_icon_background:I = 0x7f080507
+.field public static final notification_icon_background:I = 0x7f080508
-.field public static final notification_template_icon_bg:I = 0x7f080508
+.field public static final notification_template_icon_bg:I = 0x7f080509
-.field public static final notification_template_icon_low_bg:I = 0x7f080509
+.field public static final notification_template_icon_low_bg:I = 0x7f08050a
-.field public static final notification_tile_bg:I = 0x7f08050a
+.field public static final notification_tile_bg:I = 0x7f08050b
-.field public static final notify_panel_notification_icon_bg:I = 0x7f08050b
+.field public static final notify_panel_notification_icon_bg:I = 0x7f08050c
-.field public static final preference_list_divider_material:I = 0x7f08050c
+.field public static final preference_list_divider_material:I = 0x7f08050d
-.field public static final test_custom_background:I = 0x7f08051e
+.field public static final test_custom_background:I = 0x7f08051f
-.field public static final tooltip_frame_dark:I = 0x7f08051f
+.field public static final tooltip_frame_dark:I = 0x7f080520
-.field public static final tooltip_frame_light:I = 0x7f080520
+.field public static final tooltip_frame_light:I = 0x7f080521
# direct methods
diff --git a/com.discord/smali/com/discord/utils/R$c.smali b/com.discord/smali/com/discord/utils/R$c.smali
index 515e142fb6..d0c1165ccc 100644
--- a/com.discord/smali/com/discord/utils/R$c.smali
+++ b/com.discord/smali/com/discord/utils/R$c.smali
@@ -150,471 +150,471 @@
.field public static final buttonPanel:I = 0x7f0a0125
-.field public static final cancel_action:I = 0x7f0a013a
+.field public static final cancel_action:I = 0x7f0a013c
-.field public static final cancel_button:I = 0x7f0a013b
+.field public static final cancel_button:I = 0x7f0a013d
-.field public static final center:I = 0x7f0a013f
+.field public static final center:I = 0x7f0a0141
-.field public static final centerCrop:I = 0x7f0a0140
+.field public static final centerCrop:I = 0x7f0a0142
-.field public static final centerInside:I = 0x7f0a0141
+.field public static final centerInside:I = 0x7f0a0143
-.field public static final checkbox:I = 0x7f0a0260
+.field public static final checkbox:I = 0x7f0a0262
-.field public static final checked:I = 0x7f0a0262
+.field public static final checked:I = 0x7f0a0264
-.field public static final chip:I = 0x7f0a0263
+.field public static final chip:I = 0x7f0a0265
-.field public static final chip1:I = 0x7f0a0264
+.field public static final chip1:I = 0x7f0a0266
-.field public static final chip2:I = 0x7f0a0265
+.field public static final chip2:I = 0x7f0a0267
-.field public static final chip3:I = 0x7f0a0266
+.field public static final chip3:I = 0x7f0a0268
-.field public static final chip_group:I = 0x7f0a0267
+.field public static final chip_group:I = 0x7f0a0269
-.field public static final chip_image:I = 0x7f0a0268
+.field public static final chip_image:I = 0x7f0a026a
-.field public static final chip_text:I = 0x7f0a0269
+.field public static final chip_text:I = 0x7f0a026b
-.field public static final chronometer:I = 0x7f0a026a
+.field public static final chronometer:I = 0x7f0a026c
-.field public static final circular:I = 0x7f0a026c
+.field public static final circular:I = 0x7f0a026e
-.field public static final clear_text:I = 0x7f0a026d
+.field public static final clear_text:I = 0x7f0a026f
-.field public static final column:I = 0x7f0a0276
+.field public static final column:I = 0x7f0a0278
-.field public static final column_reverse:I = 0x7f0a0277
+.field public static final column_reverse:I = 0x7f0a0279
-.field public static final confirm_button:I = 0x7f0a0278
+.field public static final confirm_button:I = 0x7f0a027a
-.field public static final container:I = 0x7f0a0289
+.field public static final container:I = 0x7f0a028b
-.field public static final content:I = 0x7f0a028a
+.field public static final content:I = 0x7f0a028c
-.field public static final contentPanel:I = 0x7f0a028b
+.field public static final contentPanel:I = 0x7f0a028d
-.field public static final coordinator:I = 0x7f0a028f
+.field public static final coordinator:I = 0x7f0a0291
-.field public static final custom:I = 0x7f0a02b5
+.field public static final custom:I = 0x7f0a02b7
-.field public static final customPanel:I = 0x7f0a02b6
+.field public static final customPanel:I = 0x7f0a02b8
-.field public static final cut:I = 0x7f0a02b7
+.field public static final cut:I = 0x7f0a02b9
-.field public static final dark:I = 0x7f0a02b8
+.field public static final dark:I = 0x7f0a02ba
-.field public static final date_picker_actions:I = 0x7f0a02ba
+.field public static final date_picker_actions:I = 0x7f0a02bc
-.field public static final decor_content_parent:I = 0x7f0a02be
+.field public static final decor_content_parent:I = 0x7f0a02c0
-.field public static final default_activity_button:I = 0x7f0a02bf
+.field public static final default_activity_button:I = 0x7f0a02c1
-.field public static final design_bottom_sheet:I = 0x7f0a02c3
+.field public static final design_bottom_sheet:I = 0x7f0a02c5
-.field public static final design_menu_item_action_area:I = 0x7f0a02c4
+.field public static final design_menu_item_action_area:I = 0x7f0a02c6
-.field public static final design_menu_item_action_area_stub:I = 0x7f0a02c5
+.field public static final design_menu_item_action_area_stub:I = 0x7f0a02c7
-.field public static final design_menu_item_text:I = 0x7f0a02c6
+.field public static final design_menu_item_text:I = 0x7f0a02c8
-.field public static final design_navigation_view:I = 0x7f0a02c7
+.field public static final design_navigation_view:I = 0x7f0a02c9
-.field public static final dialog_button:I = 0x7f0a02cd
+.field public static final dialog_button:I = 0x7f0a02cf
-.field public static final dropdown_menu:I = 0x7f0a02f9
+.field public static final dropdown_menu:I = 0x7f0a02fb
-.field public static final edit_query:I = 0x7f0a031e
+.field public static final edit_query:I = 0x7f0a0320
-.field public static final end:I = 0x7f0a034b
+.field public static final end:I = 0x7f0a034d
-.field public static final end_padder:I = 0x7f0a034c
+.field public static final end_padder:I = 0x7f0a034e
-.field public static final expand_activities_button:I = 0x7f0a0368
+.field public static final expand_activities_button:I = 0x7f0a036a
-.field public static final expanded_menu:I = 0x7f0a0369
+.field public static final expanded_menu:I = 0x7f0a036b
-.field public static final fade:I = 0x7f0a0387
+.field public static final fade:I = 0x7f0a0389
-.field public static final fill:I = 0x7f0a039e
+.field public static final fill:I = 0x7f0a03a0
-.field public static final filled:I = 0x7f0a03a1
+.field public static final filled:I = 0x7f0a03a3
-.field public static final fitBottomStart:I = 0x7f0a03a5
+.field public static final fitBottomStart:I = 0x7f0a03a7
-.field public static final fitCenter:I = 0x7f0a03a6
+.field public static final fitCenter:I = 0x7f0a03a8
-.field public static final fitEnd:I = 0x7f0a03a7
+.field public static final fitEnd:I = 0x7f0a03a9
-.field public static final fitStart:I = 0x7f0a03a8
+.field public static final fitStart:I = 0x7f0a03aa
-.field public static final fitXY:I = 0x7f0a03aa
+.field public static final fitXY:I = 0x7f0a03ac
-.field public static final fixed:I = 0x7f0a03ab
+.field public static final fixed:I = 0x7f0a03ad
-.field public static final flex_end:I = 0x7f0a03ae
+.field public static final flex_end:I = 0x7f0a03b0
-.field public static final flex_start:I = 0x7f0a03bf
+.field public static final flex_start:I = 0x7f0a03c1
-.field public static final floating:I = 0x7f0a03c0
+.field public static final floating:I = 0x7f0a03c2
-.field public static final focusCrop:I = 0x7f0a03c2
+.field public static final focusCrop:I = 0x7f0a03c4
-.field public static final forever:I = 0x7f0a03c7
+.field public static final forever:I = 0x7f0a03c9
-.field public static final fragment_container_view_tag:I = 0x7f0a03c8
+.field public static final fragment_container_view_tag:I = 0x7f0a03ca
-.field public static final ghost_view:I = 0x7f0a03e3
+.field public static final ghost_view:I = 0x7f0a03e5
-.field public static final ghost_view_holder:I = 0x7f0a03e4
+.field public static final ghost_view_holder:I = 0x7f0a03e6
-.field public static final gone:I = 0x7f0a0410
+.field public static final gone:I = 0x7f0a0412
-.field public static final group_divider:I = 0x7f0a0412
+.field public static final group_divider:I = 0x7f0a0414
-.field public static final home:I = 0x7f0a04c1
+.field public static final home:I = 0x7f0a04c3
-.field public static final icon:I = 0x7f0a04d4
+.field public static final icon:I = 0x7f0a04d6
-.field public static final icon_frame:I = 0x7f0a04d5
+.field public static final icon_frame:I = 0x7f0a04d7
-.field public static final icon_group:I = 0x7f0a04d6
+.field public static final icon_group:I = 0x7f0a04d8
-.field public static final icon_only:I = 0x7f0a04d7
+.field public static final icon_only:I = 0x7f0a04d9
-.field public static final image:I = 0x7f0a04e0
+.field public static final image:I = 0x7f0a04e2
-.field public static final incoming:I = 0x7f0a04e8
+.field public static final incoming:I = 0x7f0a04ea
-.field public static final info:I = 0x7f0a04f8
+.field public static final info:I = 0x7f0a04fa
-.field public static final italic:I = 0x7f0a0531
+.field public static final italic:I = 0x7f0a0533
-.field public static final item_touch_helper_previous_elevation:I = 0x7f0a056f
+.field public static final item_touch_helper_previous_elevation:I = 0x7f0a0571
-.field public static final labeled:I = 0x7f0a0577
+.field public static final labeled:I = 0x7f0a0579
-.field public static final largeLabel:I = 0x7f0a0579
+.field public static final largeLabel:I = 0x7f0a057b
-.field public static final left:I = 0x7f0a0584
+.field public static final left:I = 0x7f0a0586
-.field public static final light:I = 0x7f0a0585
+.field public static final light:I = 0x7f0a0587
-.field public static final line1:I = 0x7f0a0586
+.field public static final line1:I = 0x7f0a0588
-.field public static final line3:I = 0x7f0a0587
+.field public static final line3:I = 0x7f0a0589
-.field public static final linear:I = 0x7f0a0588
+.field public static final linear:I = 0x7f0a058a
-.field public static final listMode:I = 0x7f0a058a
+.field public static final listMode:I = 0x7f0a058c
-.field public static final list_item:I = 0x7f0a058b
+.field public static final list_item:I = 0x7f0a058d
-.field public static final masked:I = 0x7f0a059b
+.field public static final masked:I = 0x7f0a059d
-.field public static final media_actions:I = 0x7f0a05a1
+.field public static final media_actions:I = 0x7f0a05a3
-.field public static final message:I = 0x7f0a05de
+.field public static final message:I = 0x7f0a05dc
-.field public static final mini:I = 0x7f0a05e3
+.field public static final mini:I = 0x7f0a05e1
-.field public static final month_grid:I = 0x7f0a05e5
+.field public static final month_grid:I = 0x7f0a05e3
-.field public static final month_navigation_bar:I = 0x7f0a05e6
+.field public static final month_navigation_bar:I = 0x7f0a05e4
-.field public static final month_navigation_fragment_toggle:I = 0x7f0a05e7
+.field public static final month_navigation_fragment_toggle:I = 0x7f0a05e5
-.field public static final month_navigation_next:I = 0x7f0a05e8
+.field public static final month_navigation_next:I = 0x7f0a05e6
-.field public static final month_navigation_previous:I = 0x7f0a05e9
+.field public static final month_navigation_previous:I = 0x7f0a05e7
-.field public static final month_title:I = 0x7f0a05ea
+.field public static final month_title:I = 0x7f0a05e8
-.field public static final mtrl_calendar_day_selector_frame:I = 0x7f0a05eb
+.field public static final mtrl_calendar_day_selector_frame:I = 0x7f0a05e9
-.field public static final mtrl_calendar_days_of_week:I = 0x7f0a05ec
+.field public static final mtrl_calendar_days_of_week:I = 0x7f0a05ea
-.field public static final mtrl_calendar_frame:I = 0x7f0a05ed
+.field public static final mtrl_calendar_frame:I = 0x7f0a05eb
-.field public static final mtrl_calendar_main_pane:I = 0x7f0a05ee
+.field public static final mtrl_calendar_main_pane:I = 0x7f0a05ec
-.field public static final mtrl_calendar_months:I = 0x7f0a05ef
+.field public static final mtrl_calendar_months:I = 0x7f0a05ed
-.field public static final mtrl_calendar_selection_frame:I = 0x7f0a05f0
+.field public static final mtrl_calendar_selection_frame:I = 0x7f0a05ee
-.field public static final mtrl_calendar_text_input_frame:I = 0x7f0a05f1
+.field public static final mtrl_calendar_text_input_frame:I = 0x7f0a05ef
-.field public static final mtrl_calendar_year_selector_frame:I = 0x7f0a05f2
+.field public static final mtrl_calendar_year_selector_frame:I = 0x7f0a05f0
-.field public static final mtrl_card_checked_layer_id:I = 0x7f0a05f3
+.field public static final mtrl_card_checked_layer_id:I = 0x7f0a05f1
-.field public static final mtrl_child_content_container:I = 0x7f0a05f4
+.field public static final mtrl_child_content_container:I = 0x7f0a05f2
-.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a05f5
+.field public static final mtrl_internal_children_alpha_tag:I = 0x7f0a05f3
-.field public static final mtrl_motion_snapshot_view:I = 0x7f0a05f6
+.field public static final mtrl_motion_snapshot_view:I = 0x7f0a05f4
-.field public static final mtrl_picker_fullscreen:I = 0x7f0a05f7
+.field public static final mtrl_picker_fullscreen:I = 0x7f0a05f5
-.field public static final mtrl_picker_header:I = 0x7f0a05f8
+.field public static final mtrl_picker_header:I = 0x7f0a05f6
-.field public static final mtrl_picker_header_selection_text:I = 0x7f0a05f9
+.field public static final mtrl_picker_header_selection_text:I = 0x7f0a05f7
-.field public static final mtrl_picker_header_title_and_selection:I = 0x7f0a05fa
+.field public static final mtrl_picker_header_title_and_selection:I = 0x7f0a05f8
-.field public static final mtrl_picker_header_toggle:I = 0x7f0a05fb
+.field public static final mtrl_picker_header_toggle:I = 0x7f0a05f9
-.field public static final mtrl_picker_text_input_date:I = 0x7f0a05fc
+.field public static final mtrl_picker_text_input_date:I = 0x7f0a05fa
-.field public static final mtrl_picker_text_input_range_end:I = 0x7f0a05fd
+.field public static final mtrl_picker_text_input_range_end:I = 0x7f0a05fb
-.field public static final mtrl_picker_text_input_range_start:I = 0x7f0a05fe
+.field public static final mtrl_picker_text_input_range_start:I = 0x7f0a05fc
-.field public static final mtrl_picker_title_text:I = 0x7f0a05ff
+.field public static final mtrl_picker_title_text:I = 0x7f0a05fd
-.field public static final multiply:I = 0x7f0a0600
+.field public static final multiply:I = 0x7f0a05fe
-.field public static final navigation_header_container:I = 0x7f0a0612
+.field public static final navigation_header_container:I = 0x7f0a0610
-.field public static final none:I = 0x7f0a0627
+.field public static final none:I = 0x7f0a0625
-.field public static final normal:I = 0x7f0a0628
+.field public static final normal:I = 0x7f0a0626
-.field public static final notification_background:I = 0x7f0a0632
+.field public static final notification_background:I = 0x7f0a0630
-.field public static final notification_main_column:I = 0x7f0a0633
+.field public static final notification_main_column:I = 0x7f0a0631
-.field public static final notification_main_column_container:I = 0x7f0a0634
+.field public static final notification_main_column_container:I = 0x7f0a0632
-.field public static final nowrap:I = 0x7f0a0638
+.field public static final nowrap:I = 0x7f0a0636
-.field public static final off:I = 0x7f0a0668
+.field public static final off:I = 0x7f0a0666
-.field public static final on:I = 0x7f0a066c
+.field public static final on:I = 0x7f0a066a
-.field public static final outgoing:I = 0x7f0a066e
+.field public static final outgoing:I = 0x7f0a066c
-.field public static final outline:I = 0x7f0a066f
+.field public static final outline:I = 0x7f0a066d
-.field public static final parallax:I = 0x7f0a067f
+.field public static final parallax:I = 0x7f0a067d
-.field public static final parentPanel:I = 0x7f0a0681
+.field public static final parentPanel:I = 0x7f0a067f
-.field public static final parent_matrix:I = 0x7f0a0682
+.field public static final parent_matrix:I = 0x7f0a0680
-.field public static final password_toggle:I = 0x7f0a0690
+.field public static final password_toggle:I = 0x7f0a068e
-.field public static final pin:I = 0x7f0a06bd
+.field public static final pin:I = 0x7f0a06bb
-.field public static final progress_circular:I = 0x7f0a072c
+.field public static final progress_circular:I = 0x7f0a072a
-.field public static final progress_horizontal:I = 0x7f0a072f
+.field public static final progress_horizontal:I = 0x7f0a072d
-.field public static final radio:I = 0x7f0a073d
+.field public static final radio:I = 0x7f0a073b
-.field public static final recycler_view:I = 0x7f0a0743
+.field public static final recycler_view:I = 0x7f0a0741
-.field public static final right:I = 0x7f0a075f
+.field public static final right:I = 0x7f0a075d
-.field public static final right_icon:I = 0x7f0a0760
+.field public static final right_icon:I = 0x7f0a075e
-.field public static final right_side:I = 0x7f0a0761
+.field public static final right_side:I = 0x7f0a075f
-.field public static final rounded:I = 0x7f0a0789
+.field public static final rounded:I = 0x7f0a0787
-.field public static final row:I = 0x7f0a078a
+.field public static final row:I = 0x7f0a0788
-.field public static final row_index_key:I = 0x7f0a078b
+.field public static final row_index_key:I = 0x7f0a0789
-.field public static final row_reverse:I = 0x7f0a078c
+.field public static final row_reverse:I = 0x7f0a078a
-.field public static final save_non_transition_alpha:I = 0x7f0a078d
+.field public static final save_non_transition_alpha:I = 0x7f0a078b
-.field public static final save_overlay_view:I = 0x7f0a078e
+.field public static final save_overlay_view:I = 0x7f0a078c
-.field public static final scale:I = 0x7f0a078f
+.field public static final scale:I = 0x7f0a078d
-.field public static final screen:I = 0x7f0a0791
+.field public static final screen:I = 0x7f0a078f
-.field public static final scrollIndicatorDown:I = 0x7f0a0795
+.field public static final scrollIndicatorDown:I = 0x7f0a0793
-.field public static final scrollIndicatorUp:I = 0x7f0a0796
+.field public static final scrollIndicatorUp:I = 0x7f0a0794
-.field public static final scrollView:I = 0x7f0a0797
+.field public static final scrollView:I = 0x7f0a0795
-.field public static final scrollable:I = 0x7f0a0799
+.field public static final scrollable:I = 0x7f0a0797
-.field public static final search_badge:I = 0x7f0a079a
+.field public static final search_badge:I = 0x7f0a0798
-.field public static final search_bar:I = 0x7f0a079b
+.field public static final search_bar:I = 0x7f0a0799
-.field public static final search_button:I = 0x7f0a079c
+.field public static final search_button:I = 0x7f0a079a
-.field public static final search_close_btn:I = 0x7f0a079d
+.field public static final search_close_btn:I = 0x7f0a079b
-.field public static final search_edit_frame:I = 0x7f0a079e
+.field public static final search_edit_frame:I = 0x7f0a079c
-.field public static final search_go_btn:I = 0x7f0a07a0
+.field public static final search_go_btn:I = 0x7f0a079e
-.field public static final search_mag_icon:I = 0x7f0a07a1
+.field public static final search_mag_icon:I = 0x7f0a079f
-.field public static final search_plate:I = 0x7f0a07a2
+.field public static final search_plate:I = 0x7f0a07a0
-.field public static final search_src_text:I = 0x7f0a07a5
+.field public static final search_src_text:I = 0x7f0a07a3
-.field public static final search_voice_btn:I = 0x7f0a07b1
+.field public static final search_voice_btn:I = 0x7f0a07af
-.field public static final seekbar:I = 0x7f0a07b2
+.field public static final seekbar:I = 0x7f0a07b0
-.field public static final seekbar_value:I = 0x7f0a07b3
+.field public static final seekbar_value:I = 0x7f0a07b1
-.field public static final select_dialog_listview:I = 0x7f0a07b4
+.field public static final select_dialog_listview:I = 0x7f0a07b2
-.field public static final selected:I = 0x7f0a07b5
+.field public static final selected:I = 0x7f0a07b3
-.field public static final shortcut:I = 0x7f0a0914
+.field public static final shortcut:I = 0x7f0a0912
-.field public static final slide:I = 0x7f0a0919
+.field public static final slide:I = 0x7f0a0917
-.field public static final smallLabel:I = 0x7f0a091a
+.field public static final smallLabel:I = 0x7f0a0918
-.field public static final snackbar_action:I = 0x7f0a091b
+.field public static final snackbar_action:I = 0x7f0a0919
-.field public static final snackbar_text:I = 0x7f0a091c
+.field public static final snackbar_text:I = 0x7f0a091a
-.field public static final space_around:I = 0x7f0a0920
+.field public static final space_around:I = 0x7f0a091e
-.field public static final space_between:I = 0x7f0a0921
+.field public static final space_between:I = 0x7f0a091f
-.field public static final space_evenly:I = 0x7f0a0922
+.field public static final space_evenly:I = 0x7f0a0920
-.field public static final spacer:I = 0x7f0a0923
+.field public static final spacer:I = 0x7f0a0921
-.field public static final spinner:I = 0x7f0a0926
+.field public static final spinner:I = 0x7f0a0924
-.field public static final split_action_bar:I = 0x7f0a0927
+.field public static final split_action_bar:I = 0x7f0a0925
-.field public static final src_atop:I = 0x7f0a092b
+.field public static final src_atop:I = 0x7f0a0929
-.field public static final src_in:I = 0x7f0a092c
+.field public static final src_in:I = 0x7f0a092a
-.field public static final src_over:I = 0x7f0a092d
+.field public static final src_over:I = 0x7f0a092b
-.field public static final standard:I = 0x7f0a092f
+.field public static final standard:I = 0x7f0a092d
-.field public static final start:I = 0x7f0a0930
+.field public static final start:I = 0x7f0a092e
-.field public static final status_bar_latest_event_content:I = 0x7f0a0934
+.field public static final status_bar_latest_event_content:I = 0x7f0a0932
-.field public static final stretch:I = 0x7f0a0949
+.field public static final stretch:I = 0x7f0a0947
-.field public static final submenuarrow:I = 0x7f0a094a
+.field public static final submenuarrow:I = 0x7f0a0948
-.field public static final submit_area:I = 0x7f0a094b
+.field public static final submit_area:I = 0x7f0a0949
-.field public static final switchWidget:I = 0x7f0a0959
+.field public static final switchWidget:I = 0x7f0a0957
-.field public static final tabMode:I = 0x7f0a095b
+.field public static final tabMode:I = 0x7f0a0959
-.field public static final tag_accessibility_actions:I = 0x7f0a0969
+.field public static final tag_accessibility_actions:I = 0x7f0a0967
-.field public static final tag_accessibility_clickable_spans:I = 0x7f0a096a
+.field public static final tag_accessibility_clickable_spans:I = 0x7f0a0968
-.field public static final tag_accessibility_heading:I = 0x7f0a096b
+.field public static final tag_accessibility_heading:I = 0x7f0a0969
-.field public static final tag_accessibility_pane_title:I = 0x7f0a096c
+.field public static final tag_accessibility_pane_title:I = 0x7f0a096a
-.field public static final tag_screen_reader_focusable:I = 0x7f0a096d
+.field public static final tag_screen_reader_focusable:I = 0x7f0a096b
-.field public static final tag_transition_group:I = 0x7f0a096e
+.field public static final tag_transition_group:I = 0x7f0a096c
-.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096f
+.field public static final tag_unhandled_key_event_manager:I = 0x7f0a096d
-.field public static final tag_unhandled_key_listeners:I = 0x7f0a0970
+.field public static final tag_unhandled_key_listeners:I = 0x7f0a096e
-.field public static final test_checkbox_android_button_tint:I = 0x7f0a0977
+.field public static final test_checkbox_android_button_tint:I = 0x7f0a0975
-.field public static final test_checkbox_app_button_tint:I = 0x7f0a0978
+.field public static final test_checkbox_app_button_tint:I = 0x7f0a0976
-.field public static final test_radiobutton_android_button_tint:I = 0x7f0a0979
+.field public static final test_radiobutton_android_button_tint:I = 0x7f0a0977
-.field public static final test_radiobutton_app_button_tint:I = 0x7f0a097a
+.field public static final test_radiobutton_app_button_tint:I = 0x7f0a0978
-.field public static final text:I = 0x7f0a097b
+.field public static final text:I = 0x7f0a0979
-.field public static final text2:I = 0x7f0a097d
+.field public static final text2:I = 0x7f0a097b
-.field public static final textSpacerNoButtons:I = 0x7f0a097f
+.field public static final textSpacerNoButtons:I = 0x7f0a097d
-.field public static final textSpacerNoTitle:I = 0x7f0a0980
+.field public static final textSpacerNoTitle:I = 0x7f0a097e
-.field public static final text_input_end_icon:I = 0x7f0a0982
+.field public static final text_input_end_icon:I = 0x7f0a0980
-.field public static final text_input_start_icon:I = 0x7f0a0983
+.field public static final text_input_start_icon:I = 0x7f0a0981
-.field public static final textinput_counter:I = 0x7f0a0986
+.field public static final textinput_counter:I = 0x7f0a0984
-.field public static final textinput_error:I = 0x7f0a0987
+.field public static final textinput_error:I = 0x7f0a0985
-.field public static final textinput_helper_text:I = 0x7f0a0988
+.field public static final textinput_helper_text:I = 0x7f0a0986
-.field public static final textinput_placeholder:I = 0x7f0a0989
+.field public static final textinput_placeholder:I = 0x7f0a0987
-.field public static final textinput_prefix_text:I = 0x7f0a098a
+.field public static final textinput_prefix_text:I = 0x7f0a0988
-.field public static final textinput_suffix_text:I = 0x7f0a098b
+.field public static final textinput_suffix_text:I = 0x7f0a0989
-.field public static final time:I = 0x7f0a0991
+.field public static final time:I = 0x7f0a098f
-.field public static final title:I = 0x7f0a0992
+.field public static final title:I = 0x7f0a0990
-.field public static final titleDividerNoCustom:I = 0x7f0a0993
+.field public static final titleDividerNoCustom:I = 0x7f0a0991
-.field public static final title_template:I = 0x7f0a0994
+.field public static final title_template:I = 0x7f0a0992
-.field public static final top:I = 0x7f0a099a
+.field public static final top:I = 0x7f0a0998
-.field public static final topPanel:I = 0x7f0a099b
+.field public static final topPanel:I = 0x7f0a0999
-.field public static final touch_outside:I = 0x7f0a099d
+.field public static final touch_outside:I = 0x7f0a099b
-.field public static final transition_current_scene:I = 0x7f0a099e
+.field public static final transition_current_scene:I = 0x7f0a099c
-.field public static final transition_layout_save:I = 0x7f0a099f
+.field public static final transition_layout_save:I = 0x7f0a099d
-.field public static final transition_position:I = 0x7f0a09a0
+.field public static final transition_position:I = 0x7f0a099e
-.field public static final transition_scene_layoutid_cache:I = 0x7f0a09a1
+.field public static final transition_scene_layoutid_cache:I = 0x7f0a099f
-.field public static final transition_transform:I = 0x7f0a09a2
+.field public static final transition_transform:I = 0x7f0a09a0
-.field public static final unchecked:I = 0x7f0a09b1
+.field public static final unchecked:I = 0x7f0a09af
-.field public static final uniform:I = 0x7f0a09b4
+.field public static final uniform:I = 0x7f0a09b2
-.field public static final unlabeled:I = 0x7f0a09b5
+.field public static final unlabeled:I = 0x7f0a09b3
-.field public static final up:I = 0x7f0a09b6
+.field public static final up:I = 0x7f0a09b4
-.field public static final view_offset_helper:I = 0x7f0a0a39
+.field public static final view_offset_helper:I = 0x7f0a0a37
-.field public static final visible:I = 0x7f0a0a4d
+.field public static final visible:I = 0x7f0a0a4b
-.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a4e
+.field public static final visible_removing_fragment_view_tag:I = 0x7f0a0a4c
-.field public static final wide:I = 0x7f0a0a7d
+.field public static final wide:I = 0x7f0a0a80
-.field public static final withinBounds:I = 0x7f0a0ab4
+.field public static final withinBounds:I = 0x7f0a0ab7
-.field public static final wrap:I = 0x7f0a0ab5
+.field public static final wrap:I = 0x7f0a0ab8
-.field public static final wrap_content:I = 0x7f0a0ab6
+.field public static final wrap_content:I = 0x7f0a0ab9
-.field public static final wrap_reverse:I = 0x7f0a0ab7
+.field public static final wrap_reverse:I = 0x7f0a0aba
-.field public static final zero_corner_chip:I = 0x7f0a0abc
+.field public static final zero_corner_chip:I = 0x7f0a0abf
# direct methods
diff --git a/com.discord/smali/com/discord/views/ActiveSubscriptionView$ActiveSubscriptionType.smali b/com.discord/smali/com/discord/views/ActiveSubscriptionView$ActiveSubscriptionType.smali
index 1b3cefbdb9..c99059f6e6 100644
--- a/com.discord/smali/com/discord/views/ActiveSubscriptionView$ActiveSubscriptionType.smali
+++ b/com.discord/smali/com/discord/views/ActiveSubscriptionView$ActiveSubscriptionType.smali
@@ -62,19 +62,19 @@
const/4 v3, 0x0
- const v4, 0x7f0804cd
+ const v4, 0x7f0804ce
- const v5, 0x7f0804cb
+ const v5, 0x7f0804cc
- const v6, 0x7f0804ce
+ const v6, 0x7f0804cf
- const v7, 0x7f0804cc
+ const v7, 0x7f0804cd
- const v8, 0x7f0800b0
+ const v8, 0x7f0800b1
- const v9, 0x7f0800b6
+ const v9, 0x7f0800b7
- const v10, 0x7f0800b5
+ const v10, 0x7f0800b6
move-object v1, v11
@@ -92,19 +92,19 @@
const/4 v14, 0x1
- const v15, 0x7f0804d5
+ const v15, 0x7f0804d6
- const v16, 0x7f0804d3
+ const v16, 0x7f0804d4
- const v17, 0x7f0804d6
+ const v17, 0x7f0804d7
- const v18, 0x7f0804d4
+ const v18, 0x7f0804d5
- const v19, 0x7f0800b4
+ const v19, 0x7f0800b5
- const v20, 0x7f0800b6
+ const v20, 0x7f0800b7
- const v21, 0x7f0800b5
+ const v21, 0x7f0800b6
move-object v12, v1
@@ -122,19 +122,19 @@
const/4 v5, 0x2
- const v6, 0x7f0804d1
+ const v6, 0x7f0804d2
- const v7, 0x7f0804cf
+ const v7, 0x7f0804d0
- const v8, 0x7f0804d2
+ const v8, 0x7f0804d3
- const v9, 0x7f0804d0
+ const v9, 0x7f0804d1
- const v10, 0x7f0800b1
+ const v10, 0x7f0800b2
- const v11, 0x7f0800b3
+ const v11, 0x7f0800b4
- const v12, 0x7f0800b2
+ const v12, 0x7f0800b3
move-object v3, v1
diff --git a/com.discord/smali/com/discord/views/ActiveSubscriptionView.smali b/com.discord/smali/com/discord/views/ActiveSubscriptionView.smali
index 94a14ae5b9..8017d5eb39 100644
--- a/com.discord/smali/com/discord/views/ActiveSubscriptionView.smali
+++ b/com.discord/smali/com/discord/views/ActiveSubscriptionView.smali
@@ -384,7 +384,7 @@
aput-object p5, v12, v7
- const v11, 0x7f121200
+ const v11, 0x7f12120e
invoke-static {v0, v11, v12}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
@@ -409,7 +409,7 @@
aput-object p5, v12, v7
- const v11, 0x7f121202
+ const v11, 0x7f121210
invoke-static {v0, v11, v12}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
@@ -438,7 +438,7 @@
if-eq v11, v12, :cond_d
- const v11, 0x7f121247
+ const v11, 0x7f121255
new-array v12, v7, [Ljava/lang/Object;
@@ -464,7 +464,7 @@
:cond_d
const/4 v13, 0x1
- const v11, 0x7f121248
+ const v11, 0x7f121256
new-array v12, v7, [Ljava/lang/Object;
@@ -491,7 +491,7 @@
if-eq v7, v11, :cond_f
- const v7, 0x7f121245
+ const v7, 0x7f121253
new-array v11, v13, [Ljava/lang/Object;
@@ -504,7 +504,7 @@
goto :goto_a
:cond_f
- const v7, 0x7f121246
+ const v7, 0x7f121254
new-array v11, v13, [Ljava/lang/Object;
@@ -616,7 +616,7 @@
if-ne v1, v7, :cond_14
- const v1, 0x7f121195
+ const v1, 0x7f1211a3
goto :goto_10
@@ -641,7 +641,7 @@
goto :goto_10
:cond_16
- const v1, 0x7f121349
+ const v1, 0x7f121357
:goto_10
invoke-virtual {v3, v1}, Landroid/widget/Button;->setText(I)V
diff --git a/com.discord/smali/com/discord/views/ChatActionItem.smali b/com.discord/smali/com/discord/views/ChatActionItem.smali
index 076d78b3f8..0fb953bbbf 100644
--- a/com.discord/smali/com/discord/views/ChatActionItem.smali
+++ b/com.discord/smali/com/discord/views/ChatActionItem.smali
@@ -27,7 +27,7 @@
invoke-static {p1, v1, p0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
- const p1, 0x7f0a01fc
+ const p1, 0x7f0a01fe
invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
@@ -41,7 +41,7 @@
iput-object p1, p0, Lcom/discord/views/ChatActionItem;->e:Landroid/widget/TextView;
- const p1, 0x7f0a01fb
+ const p1, 0x7f0a01fd
invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
@@ -79,7 +79,7 @@
invoke-virtual {p2, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
- const p2, 0x7f08013f
+ const p2, 0x7f080140
invoke-virtual {p1, v2, p2}, Landroid/content/res/TypedArray;->getResourceId(II)I
diff --git a/com.discord/smali/com/discord/views/CheckedSetting.smali b/com.discord/smali/com/discord/views/CheckedSetting.smali
index ddd4cd502e..6bbbdf378b 100644
--- a/com.discord/smali/com/discord/views/CheckedSetting.smali
+++ b/com.discord/smali/com/discord/views/CheckedSetting.smali
@@ -397,7 +397,7 @@
goto :goto_a
:cond_11
- const p2, 0x7f080111
+ const p2, 0x7f080112
invoke-virtual {p0, p2}, Landroid/widget/RelativeLayout;->setBackgroundResource(I)V
@@ -721,7 +721,7 @@
invoke-static {v2, v0, p0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
- const v0, 0x7f0a0858
+ const v0, 0x7f0a0856
invoke-virtual {p0, v0}, Landroid/widget/RelativeLayout;->findViewById(I)Landroid/view/View;
@@ -735,7 +735,7 @@
iput-object v0, p0, Lcom/discord/views/CheckedSetting;->g:Landroid/widget/TextView;
- const v0, 0x7f0a0859
+ const v0, 0x7f0a0857
invoke-virtual {p0, v0}, Landroid/widget/RelativeLayout;->findViewById(I)Landroid/view/View;
@@ -749,7 +749,7 @@
iput-object v0, p0, Lcom/discord/views/CheckedSetting;->h:Landroid/widget/TextView;
- const v0, 0x7f0a0855
+ const v0, 0x7f0a0853
invoke-virtual {p0, v0}, Landroid/widget/RelativeLayout;->findViewById(I)Landroid/view/View;
@@ -763,7 +763,7 @@
iput-object v0, p0, Lcom/discord/views/CheckedSetting;->f:Landroid/widget/CompoundButton;
- const v0, 0x7f0a0856
+ const v0, 0x7f0a0854
invoke-virtual {p0, v0}, Landroid/widget/RelativeLayout;->findViewById(I)Landroid/view/View;
diff --git a/com.discord/smali/com/discord/views/CodeVerificationView.smali b/com.discord/smali/com/discord/views/CodeVerificationView.smali
index 4313cb22c2..59d3a293be 100644
--- a/com.discord/smali/com/discord/views/CodeVerificationView.smali
+++ b/com.discord/smali/com/discord/views/CodeVerificationView.smali
@@ -159,7 +159,7 @@
new-array v3, v3, [Landroid/widget/TextView;
- const v4, 0x7f0a0a2c
+ const v4, 0x7f0a0a2a
invoke-virtual {p0, v4}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
@@ -173,7 +173,7 @@
aput-object v4, v3, v2
- const v2, 0x7f0a0a2d
+ const v2, 0x7f0a0a2b
invoke-virtual {p0, v2}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
@@ -187,7 +187,7 @@
aput-object v2, v3, p2
- const p2, 0x7f0a0a2e
+ const p2, 0x7f0a0a2c
invoke-virtual {p0, p2}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
@@ -205,7 +205,7 @@
const/4 p2, 0x3
- const v2, 0x7f0a0a2f
+ const v2, 0x7f0a0a2d
invoke-virtual {p0, v2}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
@@ -219,7 +219,7 @@
aput-object v2, v3, p2
- const p2, 0x7f0a0a30
+ const p2, 0x7f0a0a2e
invoke-virtual {p0, p2}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
@@ -235,7 +235,7 @@
const/4 p2, 0x5
- const v0, 0x7f0a0a31
+ const v0, 0x7f0a0a2f
invoke-virtual {p0, v0}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
@@ -255,7 +255,7 @@
iput-object p2, p0, Lcom/discord/views/CodeVerificationView;->d:Ljava/util/List;
- const p2, 0x7f0801a8
+ const p2, 0x7f0801a9
invoke-static {p1, p2}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
@@ -265,7 +265,7 @@
iput-object p2, p0, Lcom/discord/views/CodeVerificationView;->e:Landroid/graphics/drawable/Drawable;
- const p2, 0x7f0801a9
+ const p2, 0x7f0801aa
invoke-static {p1, p2}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
diff --git a/com.discord/smali/com/discord/views/FailedUploadList.smali b/com.discord/smali/com/discord/views/FailedUploadList.smali
index 2d661cbeeb..d37c6e02a6 100644
--- a/com.discord/smali/com/discord/views/FailedUploadList.smali
+++ b/com.discord/smali/com/discord/views/FailedUploadList.smali
@@ -82,9 +82,9 @@
:array_0
.array-data 4
- 0x7f0a025b
- 0x7f0a025c
0x7f0a025d
+ 0x7f0a025e
+ 0x7f0a025f
.end array-data
.end method
diff --git a/com.discord/smali/com/discord/views/FailedUploadView.smali b/com.discord/smali/com/discord/views/FailedUploadView.smali
index 852607721b..9699f1d8c2 100644
--- a/com.discord/smali/com/discord/views/FailedUploadView.smali
+++ b/com.discord/smali/com/discord/views/FailedUploadView.smali
@@ -93,7 +93,7 @@
invoke-direct {p0, p1, p2}, Landroidx/constraintlayout/widget/ConstraintLayout;->(Landroid/content/Context;Landroid/util/AttributeSet;)V
- const p1, 0x7f0a02f4
+ const p1, 0x7f0a02f6
invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -101,7 +101,7 @@
iput-object p1, p0, Lcom/discord/views/FailedUploadView;->d:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a094c
+ const p1, 0x7f0a094a
invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -109,7 +109,7 @@
iput-object p1, p0, Lcom/discord/views/FailedUploadView;->e:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a039b
+ const p1, 0x7f0a039d
invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
diff --git a/com.discord/smali/com/discord/views/GuildView.smali b/com.discord/smali/com/discord/views/GuildView.smali
index 3072a80081..fda3242c1e 100644
--- a/com.discord/smali/com/discord/views/GuildView.smali
+++ b/com.discord/smali/com/discord/views/GuildView.smali
@@ -77,7 +77,7 @@
invoke-direct {p0, p1, p2, v0}, Landroidx/constraintlayout/widget/ConstraintLayout;->(Landroid/content/Context;Landroid/util/AttributeSet;I)V
- const v1, 0x7f0a0499
+ const v1, 0x7f0a049b
invoke-static {p0, v1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -85,7 +85,7 @@
iput-object v1, p0, Lcom/discord/views/GuildView;->d:Lkotlin/properties/ReadOnlyProperty;
- const v1, 0x7f0a0498
+ const v1, 0x7f0a049a
invoke-static {p0, v1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
diff --git a/com.discord/smali/com/discord/views/JoinVoiceChannelButton.smali b/com.discord/smali/com/discord/views/JoinVoiceChannelButton.smali
index 3c64c7beac..b1c778cf97 100644
--- a/com.discord/smali/com/discord/views/JoinVoiceChannelButton.smali
+++ b/com.discord/smali/com/discord/views/JoinVoiceChannelButton.smali
@@ -11,7 +11,7 @@
invoke-direct {p0, p1, p2}, Lcom/google/android/material/button/MaterialButton;->(Landroid/content/Context;Landroid/util/AttributeSet;)V
- const p1, 0x7f12048c
+ const p1, 0x7f12048d
invoke-virtual {p0, p1}, Landroid/widget/Button;->setText(I)V
diff --git a/com.discord/smali/com/discord/views/LoadingButton.smali b/com.discord/smali/com/discord/views/LoadingButton.smali
index 8e1ae3c572..cf6dda9eb9 100644
--- a/com.discord/smali/com/discord/views/LoadingButton.smali
+++ b/com.discord/smali/com/discord/views/LoadingButton.smali
@@ -81,7 +81,7 @@
invoke-direct {p0, p1, p2, v1}, Landroid/widget/FrameLayout;->(Landroid/content/Context;Landroid/util/AttributeSet;I)V
- const v2, 0x7f0a058d
+ const v2, 0x7f0a058f
invoke-static {p0, v2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -89,7 +89,7 @@
iput-object v2, p0, Lcom/discord/views/LoadingButton;->d:Lkotlin/properties/ReadOnlyProperty;
- const v2, 0x7f0a058c
+ const v2, 0x7f0a058e
invoke-static {p0, v2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
diff --git a/com.discord/smali/com/discord/views/OAuthPermissionViews.smali b/com.discord/smali/com/discord/views/OAuthPermissionViews.smali
index af27e12494..bf3afddddd 100644
--- a/com.discord/smali/com/discord/views/OAuthPermissionViews.smali
+++ b/com.discord/smali/com/discord/views/OAuthPermissionViews.smali
@@ -39,7 +39,7 @@
if-eqz v0, :cond_0
- const p1, 0x7f121397
+ const p1, 0x7f1213a5
goto/16 :goto_0
@@ -52,7 +52,7 @@
if-eqz v0, :cond_0
- const p1, 0x7f121399
+ const p1, 0x7f1213a7
goto/16 :goto_0
@@ -65,7 +65,7 @@
if-eqz v0, :cond_0
- const p1, 0x7f1213a4
+ const p1, 0x7f1213b2
goto/16 :goto_0
@@ -78,7 +78,7 @@
if-eqz v0, :cond_0
- const p1, 0x7f12139d
+ const p1, 0x7f1213ab
goto/16 :goto_0
@@ -91,7 +91,7 @@
if-eqz v0, :cond_0
- const p1, 0x7f1213a8
+ const p1, 0x7f1213b6
goto/16 :goto_0
@@ -104,7 +104,7 @@
if-eqz v0, :cond_0
- const p1, 0x7f1213a6
+ const p1, 0x7f1213b4
goto/16 :goto_0
@@ -117,7 +117,7 @@
if-eqz v0, :cond_0
- const p1, 0x7f1213b3
+ const p1, 0x7f1213c1
goto/16 :goto_0
@@ -130,7 +130,7 @@
if-eqz v0, :cond_0
- const p1, 0x7f12139f
+ const p1, 0x7f1213ad
goto/16 :goto_0
@@ -143,7 +143,7 @@
if-eqz v0, :cond_0
- const p1, 0x7f1213ae
+ const p1, 0x7f1213bc
goto :goto_0
@@ -156,7 +156,7 @@
if-eqz v0, :cond_0
- const p1, 0x7f121393
+ const p1, 0x7f1213a1
goto :goto_0
@@ -169,7 +169,7 @@
if-eqz v0, :cond_0
- const p1, 0x7f1213af
+ const p1, 0x7f1213bd
goto :goto_0
@@ -182,7 +182,7 @@
if-eqz v0, :cond_0
- const p1, 0x7f1213b5
+ const p1, 0x7f1213c3
goto :goto_0
@@ -195,7 +195,7 @@
if-eqz v0, :cond_0
- const p1, 0x7f12139b
+ const p1, 0x7f1213a9
goto :goto_0
@@ -208,7 +208,7 @@
if-eqz v0, :cond_0
- const p1, 0x7f1213aa
+ const p1, 0x7f1213b8
goto :goto_0
@@ -221,7 +221,7 @@
if-eqz v0, :cond_0
- const p1, 0x7f1213ac
+ const p1, 0x7f1213ba
goto :goto_0
@@ -234,7 +234,7 @@
if-eqz v0, :cond_0
- const p1, 0x7f121395
+ const p1, 0x7f1213a3
goto :goto_0
@@ -247,7 +247,7 @@
if-eqz v0, :cond_0
- const p1, 0x7f1213b1
+ const p1, 0x7f1213bf
:goto_0
invoke-virtual {p0, p1}, Landroid/widget/TextView;->setText(I)V
diff --git a/com.discord/smali/com/discord/views/OverlayMenuView.smali b/com.discord/smali/com/discord/views/OverlayMenuView.smali
index 8b39b31e6a..851aaabe1a 100644
--- a/com.discord/smali/com/discord/views/OverlayMenuView.smali
+++ b/com.discord/smali/com/discord/views/OverlayMenuView.smali
@@ -278,7 +278,7 @@
iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->d:Lrx/subjects/Subject;
- const p1, 0x7f0a067a
+ const p1, 0x7f0a0678
invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -286,7 +286,7 @@
iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->e:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a0673
+ const p1, 0x7f0a0671
invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -294,7 +294,7 @@
iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->f:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a0671
+ const p1, 0x7f0a066f
invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -302,7 +302,7 @@
iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->g:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a0675
+ const p1, 0x7f0a0673
invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -310,7 +310,7 @@
iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->h:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a067c
+ const p1, 0x7f0a067a
invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -318,7 +318,7 @@
iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->i:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a067b
+ const p1, 0x7f0a0679
invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -326,7 +326,7 @@
iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->j:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a092e
+ const p1, 0x7f0a092c
invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -334,7 +334,7 @@
iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->k:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a0611
+ const p1, 0x7f0a060f
invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -342,7 +342,7 @@
iput-object p1, p0, Lcom/discord/views/OverlayMenuView;->l:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a02f3
+ const p1, 0x7f0a02f5
invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
diff --git a/com.discord/smali/com/discord/views/ScreenTitleView.smali b/com.discord/smali/com/discord/views/ScreenTitleView.smali
index f19b594c98..04d3a84d93 100644
--- a/com.discord/smali/com/discord/views/ScreenTitleView.smali
+++ b/com.discord/smali/com/discord/views/ScreenTitleView.smali
@@ -75,7 +75,7 @@
invoke-direct {p0, p1, p2, v0}, Landroid/widget/LinearLayout;->(Landroid/content/Context;Landroid/util/AttributeSet;I)V
- const v1, 0x7f0a0793
+ const v1, 0x7f0a0791
invoke-static {p0, v1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -83,7 +83,7 @@
iput-object v1, p0, Lcom/discord/views/ScreenTitleView;->d:Lkotlin/properties/ReadOnlyProperty;
- const v1, 0x7f0a0792
+ const v1, 0x7f0a0790
invoke-static {p0, v1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
diff --git a/com.discord/smali/com/discord/views/ServerFolderView.smali b/com.discord/smali/com/discord/views/ServerFolderView.smali
index de38730995..ac09ac8ab6 100644
--- a/com.discord/smali/com/discord/views/ServerFolderView.smali
+++ b/com.discord/smali/com/discord/views/ServerFolderView.smali
@@ -105,7 +105,7 @@
invoke-direct {p0, p1, p2, v1}, Landroid/widget/LinearLayout;->(Landroid/content/Context;Landroid/util/AttributeSet;I)V
- const p2, 0x7f0a03c5
+ const p2, 0x7f0a03c7
invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -113,7 +113,7 @@
iput-object p2, p0, Lcom/discord/views/ServerFolderView;->d:Lkotlin/properties/ReadOnlyProperty;
- const p2, 0x7f0a049a
+ const p2, 0x7f0a049c
invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -152,10 +152,10 @@
:array_0
.array-data 4
- 0x7f0a0494
- 0x7f0a0495
0x7f0a0496
0x7f0a0497
+ 0x7f0a0498
+ 0x7f0a0499
.end array-data
.end method
diff --git a/com.discord/smali/com/discord/views/StatusView.smali b/com.discord/smali/com/discord/views/StatusView.smali
index 36c53b130b..74093bece0 100644
--- a/com.discord/smali/com/discord/views/StatusView.smali
+++ b/com.discord/smali/com/discord/views/StatusView.smali
@@ -283,7 +283,7 @@
if-ne v0, v1, :cond_0
- const v0, 0x7f08034e
+ const v0, 0x7f08034f
goto :goto_2
@@ -304,7 +304,7 @@
:goto_0
if-eqz v2, :cond_2
- const v0, 0x7f0803eb
+ const v0, 0x7f0803ec
goto :goto_2
@@ -334,22 +334,22 @@
if-eq v0, v2, :cond_5
:goto_1
- const v0, 0x7f0803e9
+ const v0, 0x7f0803ea
goto :goto_2
:cond_5
- const v0, 0x7f0803e7
-
- goto :goto_2
-
- :cond_6
const v0, 0x7f0803e8
goto :goto_2
+ :cond_6
+ const v0, 0x7f0803e9
+
+ goto :goto_2
+
:cond_7
- const v0, 0x7f0803ea
+ const v0, 0x7f0803eb
:goto_2
invoke-virtual {p0, v0}, Landroidx/appcompat/widget/AppCompatImageView;->setImageResource(I)V
diff --git a/com.discord/smali/com/discord/views/StreamPreviewView.smali b/com.discord/smali/com/discord/views/StreamPreviewView.smali
index 899473bc24..1edda3e094 100644
--- a/com.discord/smali/com/discord/views/StreamPreviewView.smali
+++ b/com.discord/smali/com/discord/views/StreamPreviewView.smali
@@ -27,7 +27,7 @@
invoke-static {p1, p2, p0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
- const p1, 0x7f0a0946
+ const p1, 0x7f0a0944
invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
@@ -41,7 +41,7 @@
iput-object p1, p0, Lcom/discord/views/StreamPreviewView;->d:Lcom/facebook/drawee/view/SimpleDraweeView;
- const p1, 0x7f0a0947
+ const p1, 0x7f0a0945
invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
@@ -55,7 +55,7 @@
iput-object p1, p0, Lcom/discord/views/StreamPreviewView;->e:Landroid/widget/TextView;
- const p1, 0x7f0a0948
+ const p1, 0x7f0a0946
invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
@@ -142,7 +142,7 @@
move-result-object p1
- const v0, 0x7f1214f4
+ const v0, 0x7f121501
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -190,7 +190,7 @@
move-result-object p1
- const v0, 0x7f1214ed
+ const v0, 0x7f1214fa
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -212,7 +212,7 @@
if-eqz p3, :cond_3
- const p1, 0x7f1217bd
+ const p1, 0x7f1217cf
invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
@@ -237,7 +237,7 @@
if-ne p1, p2, :cond_4
- const p1, 0x7f1203fb
+ const p1, 0x7f1203fc
invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
@@ -257,7 +257,7 @@
throw p1
:cond_5
- const p1, 0x7f12163b
+ const p1, 0x7f121648
invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
@@ -270,7 +270,7 @@
goto :goto_1
:cond_6
- const p1, 0x7f120d90
+ const p1, 0x7f120d9b
invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/views/TernaryCheckBox.smali b/com.discord/smali/com/discord/views/TernaryCheckBox.smali
index 3ec1a26451..453037eaa3 100644
--- a/com.discord/smali/com/discord/views/TernaryCheckBox.smali
+++ b/com.discord/smali/com/discord/views/TernaryCheckBox.smali
@@ -154,7 +154,7 @@
move-result-object v0
- const v2, 0x7f0a0858
+ const v2, 0x7f0a0856
invoke-virtual {v0, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -192,7 +192,7 @@
invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
- const v2, 0x7f0a0859
+ const v2, 0x7f0a0857
invoke-virtual {v0, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -223,7 +223,7 @@
invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
- const v2, 0x7f0a0857
+ const v2, 0x7f0a0855
invoke-virtual {v0, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -235,7 +235,7 @@
iput-object v2, v1, Lcom/discord/views/TernaryCheckBox;->i:Landroid/view/View;
- const v2, 0x7f0a0669
+ const v2, 0x7f0a0667
invoke-virtual {v0, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -247,7 +247,7 @@
iput-object v2, v1, Lcom/discord/views/TernaryCheckBox;->j:Landroid/view/View;
- const v2, 0x7f0a0975
+ const v2, 0x7f0a0973
invoke-virtual {v0, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -261,7 +261,7 @@
iput-object v2, v1, Lcom/discord/views/TernaryCheckBox;->f:Lcom/discord/views/CheckableImageView;
- const v2, 0x7f0a0974
+ const v2, 0x7f0a0972
invoke-virtual {v0, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -275,7 +275,7 @@
iput-object v2, v1, Lcom/discord/views/TernaryCheckBox;->g:Lcom/discord/views/CheckableImageView;
- const v2, 0x7f0a0973
+ const v2, 0x7f0a0971
invoke-virtual {v0, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
diff --git a/com.discord/smali/com/discord/views/ToolbarTitleLayout.smali b/com.discord/smali/com/discord/views/ToolbarTitleLayout.smali
index 82260ba92a..52f5eac4b8 100644
--- a/com.discord/smali/com/discord/views/ToolbarTitleLayout.smali
+++ b/com.discord/smali/com/discord/views/ToolbarTitleLayout.smali
@@ -93,7 +93,7 @@
invoke-direct {p0, p1}, Landroidx/constraintlayout/widget/ConstraintLayout;->(Landroid/content/Context;)V
- const p1, 0x7f0a0998
+ const p1, 0x7f0a0996
invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -101,7 +101,7 @@
iput-object p1, p0, Lcom/discord/views/ToolbarTitleLayout;->d:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a0999
+ const p1, 0x7f0a0997
invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -109,7 +109,7 @@
iput-object p1, p0, Lcom/discord/views/ToolbarTitleLayout;->e:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a0997
+ const p1, 0x7f0a0995
invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
diff --git a/com.discord/smali/com/discord/views/UploadProgressView.smali b/com.discord/smali/com/discord/views/UploadProgressView.smali
index 1c19e31155..e757084efa 100644
--- a/com.discord/smali/com/discord/views/UploadProgressView.smali
+++ b/com.discord/smali/com/discord/views/UploadProgressView.smali
@@ -31,7 +31,7 @@
invoke-static {p1, p2, p0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
- const p1, 0x7f0a0733
+ const p1, 0x7f0a0731
invoke-virtual {p0, p1}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
@@ -45,7 +45,7 @@
iput-object p1, p0, Lcom/discord/views/UploadProgressView;->e:Landroid/widget/TextView;
- const p1, 0x7f0a0732
+ const p1, 0x7f0a0730
invoke-virtual {p0, p1}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
@@ -59,7 +59,7 @@
iput-object p1, p0, Lcom/discord/views/UploadProgressView;->f:Landroid/widget/TextView;
- const p1, 0x7f0a0729
+ const p1, 0x7f0a0727
invoke-virtual {p0, p1}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
@@ -73,7 +73,7 @@
iput-object p1, p0, Lcom/discord/views/UploadProgressView;->d:Landroid/widget/ProgressBar;
- const p1, 0x7f0a072d
+ const p1, 0x7f0a072b
invoke-virtual {p0, p1}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
@@ -113,7 +113,7 @@
move-result-object p1
- const p2, 0x7f080186
+ const p2, 0x7f080187
invoke-static {p1, p2}, Landroidx/core/content/ContextCompat;->getDrawable(Landroid/content/Context;I)Landroid/graphics/drawable/Drawable;
diff --git a/com.discord/smali/com/discord/views/UserListItemView.smali b/com.discord/smali/com/discord/views/UserListItemView.smali
index 2e94e138fe..31a8d6891c 100644
--- a/com.discord/smali/com/discord/views/UserListItemView.smali
+++ b/com.discord/smali/com/discord/views/UserListItemView.smali
@@ -37,7 +37,7 @@
move-result-object p1
- const p2, 0x7f0a09c9
+ const p2, 0x7f0a09c7
invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -51,7 +51,7 @@
iput-object p2, p0, Lcom/discord/views/UserListItemView;->d:Landroid/widget/ImageView;
- const p2, 0x7f0a09ca
+ const p2, 0x7f0a09c8
invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -65,7 +65,7 @@
iput-object p2, p0, Lcom/discord/views/UserListItemView;->e:Landroid/widget/TextView;
- const p2, 0x7f0a09cb
+ const p2, 0x7f0a09c9
invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -79,7 +79,7 @@
iput-object p2, p0, Lcom/discord/views/UserListItemView;->f:Landroid/widget/TextView;
- const p2, 0x7f0a09cc
+ const p2, 0x7f0a09ca
invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
diff --git a/com.discord/smali/com/discord/views/UsernameView.smali b/com.discord/smali/com/discord/views/UsernameView.smali
index 1a822d4a68..7bb1d82392 100644
--- a/com.discord/smali/com/discord/views/UsernameView.smali
+++ b/com.discord/smali/com/discord/views/UsernameView.smali
@@ -73,7 +73,7 @@
invoke-direct {p0, p1, p2}, Landroidx/constraintlayout/widget/ConstraintLayout;->(Landroid/content/Context;Landroid/util/AttributeSet;)V
- const p1, 0x7f0a0a2b
+ const p1, 0x7f0a0a29
invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -81,7 +81,7 @@
iput-object p1, p0, Lcom/discord/views/UsernameView;->d:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a0a2a
+ const p1, 0x7f0a0a28
invoke-static {p0, p1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -254,7 +254,7 @@
if-eqz p1, :cond_0
- const p1, 0x7f08042e
+ const p1, 0x7f08042f
goto :goto_0
diff --git a/com.discord/smali/com/discord/views/VoiceUserLimitView.smali b/com.discord/smali/com/discord/views/VoiceUserLimitView.smali
index bd8eb57424..b6532a8048 100644
--- a/com.discord/smali/com/discord/views/VoiceUserLimitView.smali
+++ b/com.discord/smali/com/discord/views/VoiceUserLimitView.smali
@@ -81,7 +81,7 @@
invoke-static {p1, v0, p0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
- const p1, 0x7f0a0a6b
+ const p1, 0x7f0a0a6e
invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
@@ -95,7 +95,7 @@
iput-object p1, p0, Lcom/discord/views/VoiceUserLimitView;->d:Landroid/widget/TextView;
- const p1, 0x7f0a0a6c
+ const p1, 0x7f0a0a6f
invoke-virtual {p0, p1}, Landroid/widget/LinearLayout;->findViewById(I)Landroid/view/View;
diff --git a/com.discord/smali/com/discord/views/VoiceUserView.smali b/com.discord/smali/com/discord/views/VoiceUserView.smali
index db756e3faa..7e5fa78eac 100644
--- a/com.discord/smali/com/discord/views/VoiceUserView.smali
+++ b/com.discord/smali/com/discord/views/VoiceUserView.smali
@@ -103,7 +103,7 @@
invoke-direct {p0, p1, p2, v0}, Landroid/widget/FrameLayout;->(Landroid/content/Context;Landroid/util/AttributeSet;I)V
- const v1, 0x7f0a0a6a
+ const v1, 0x7f0a0a6d
invoke-static {p0, v1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -111,7 +111,7 @@
iput-object v1, p0, Lcom/discord/views/VoiceUserView;->d:Lkotlin/properties/ReadOnlyProperty;
- const v1, 0x7f0a0a78
+ const v1, 0x7f0a0a7b
invoke-static {p0, v1}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -338,7 +338,7 @@
goto :goto_0
:cond_1
- const v0, 0x7f0801cd
+ const v0, 0x7f0801ce
:goto_0
invoke-virtual {p0, v0}, Landroid/widget/FrameLayout;->setBackgroundResource(I)V
diff --git a/com.discord/smali/com/discord/views/channelsidebar/GuildChannelSideBarActionsView.smali b/com.discord/smali/com/discord/views/channelsidebar/GuildChannelSideBarActionsView.smali
index d70349dae7..2a61e6d9d1 100644
--- a/com.discord/smali/com/discord/views/channelsidebar/GuildChannelSideBarActionsView.smali
+++ b/com.discord/smali/com/discord/views/channelsidebar/GuildChannelSideBarActionsView.smali
@@ -117,7 +117,7 @@
invoke-direct {p0, p1, p2}, Landroid/widget/LinearLayout;->(Landroid/content/Context;Landroid/util/AttributeSet;)V
- const p2, 0x7f0a01b9
+ const p2, 0x7f0a01bb
invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -125,7 +125,7 @@
iput-object p2, p0, Lcom/discord/views/channelsidebar/GuildChannelSideBarActionsView;->d:Lkotlin/properties/ReadOnlyProperty;
- const p2, 0x7f0a01b8
+ const p2, 0x7f0a01ba
invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -133,7 +133,7 @@
iput-object p2, p0, Lcom/discord/views/channelsidebar/GuildChannelSideBarActionsView;->e:Lkotlin/properties/ReadOnlyProperty;
- const p2, 0x7f0a01b7
+ const p2, 0x7f0a01b9
invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -141,7 +141,7 @@
iput-object p2, p0, Lcom/discord/views/channelsidebar/GuildChannelSideBarActionsView;->f:Lkotlin/properties/ReadOnlyProperty;
- const p2, 0x7f0a01ba
+ const p2, 0x7f0a01bc
invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -407,7 +407,7 @@
move-result-object p2
- const p3, 0x7f120ff5
+ const p3, 0x7f121003
invoke-virtual {p2, p3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -420,7 +420,7 @@
move-result-object p2
- const p3, 0x7f120ff4
+ const p3, 0x7f121002
invoke-virtual {p2, p3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/views/channelsidebar/PrivateChannelSideBarActionsView.smali b/com.discord/smali/com/discord/views/channelsidebar/PrivateChannelSideBarActionsView.smali
index 9e1201e430..b40473a4d5 100644
--- a/com.discord/smali/com/discord/views/channelsidebar/PrivateChannelSideBarActionsView.smali
+++ b/com.discord/smali/com/discord/views/channelsidebar/PrivateChannelSideBarActionsView.smali
@@ -117,7 +117,7 @@
invoke-direct {p0, p1, p2}, Landroid/widget/LinearLayout;->(Landroid/content/Context;Landroid/util/AttributeSet;)V
- const p2, 0x7f0a0725
+ const p2, 0x7f0a0723
invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -125,7 +125,7 @@
iput-object p2, p0, Lcom/discord/views/channelsidebar/PrivateChannelSideBarActionsView;->d:Lkotlin/properties/ReadOnlyProperty;
- const p2, 0x7f0a0728
+ const p2, 0x7f0a0726
invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -133,7 +133,7 @@
iput-object p2, p0, Lcom/discord/views/channelsidebar/PrivateChannelSideBarActionsView;->e:Lkotlin/properties/ReadOnlyProperty;
- const p2, 0x7f0a0726
+ const p2, 0x7f0a0724
invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -141,7 +141,7 @@
iput-object p2, p0, Lcom/discord/views/channelsidebar/PrivateChannelSideBarActionsView;->f:Lkotlin/properties/ReadOnlyProperty;
- const p2, 0x7f0a0727
+ const p2, 0x7f0a0725
invoke-static {p0, p2}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
diff --git a/com.discord/smali/com/discord/views/premium/AccountCreditView.smali b/com.discord/smali/com/discord/views/premium/AccountCreditView.smali
index e22b142219..1bde3e0210 100644
--- a/com.discord/smali/com/discord/views/premium/AccountCreditView.smali
+++ b/com.discord/smali/com/discord/views/premium/AccountCreditView.smali
@@ -27,7 +27,7 @@
invoke-static {p1, p2, p0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
- const p1, 0x7f0a02ac
+ const p1, 0x7f0a02ae
invoke-virtual {p0, p1}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
@@ -37,7 +37,7 @@
iput-object p1, p0, Lcom/discord/views/premium/AccountCreditView;->d:Landroid/widget/ImageView;
- const p1, 0x7f0a02ab
+ const p1, 0x7f0a02ad
invoke-virtual {p0, p1}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
@@ -47,7 +47,7 @@
iput-object p1, p0, Lcom/discord/views/premium/AccountCreditView;->e:Landroid/widget/TextView;
- const p1, 0x7f0a02ad
+ const p1, 0x7f0a02af
invoke-virtual {p0, p1}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
@@ -57,7 +57,7 @@
iput-object p1, p0, Lcom/discord/views/premium/AccountCreditView;->f:Landroid/widget/TextView;
- const p1, 0x7f0a02b2
+ const p1, 0x7f0a02b4
invoke-virtual {p0, p1}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
@@ -125,7 +125,7 @@
move-result-wide v4
- const v6, 0x7f121240
+ const v6, 0x7f12124e
const-string v7, "header"
@@ -137,7 +137,7 @@
move-result-object v4
- const v5, 0x7f121261
+ const v5, 0x7f12126f # 1.94163E38f
invoke-virtual {v4, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -149,7 +149,7 @@
iget-object v5, v0, Lcom/discord/views/premium/AccountCreditView;->d:Landroid/widget/ImageView;
- const v8, 0x7f080162
+ const v8, 0x7f080163
invoke-virtual {v5, v8}, Landroid/widget/ImageView;->setImageResource(I)V
@@ -188,7 +188,7 @@
move-result-object v4
- const v5, 0x7f121262
+ const v5, 0x7f121270
invoke-virtual {v4, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -200,7 +200,7 @@
iget-object v5, v0, Lcom/discord/views/premium/AccountCreditView;->d:Landroid/widget/ImageView;
- const v8, 0x7f080161
+ const v8, 0x7f080162
invoke-virtual {v5, v8}, Landroid/widget/ImageView;->setImageResource(I)V
@@ -276,7 +276,7 @@
move-result-object v6
- const v8, 0x7f121242
+ const v8, 0x7f121250
new-array v9, v2, [Ljava/lang/Object;
@@ -299,7 +299,7 @@
move-result-object v6
- const v8, 0x7f121241
+ const v8, 0x7f12124f
new-array v9, v2, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/views/premiumguild/PremiumGuildConfirmationView.smali b/com.discord/smali/com/discord/views/premiumguild/PremiumGuildConfirmationView.smali
index 734a683faa..989fddb3d6 100644
--- a/com.discord/smali/com/discord/views/premiumguild/PremiumGuildConfirmationView.smali
+++ b/com.discord/smali/com/discord/views/premiumguild/PremiumGuildConfirmationView.smali
@@ -39,7 +39,7 @@
invoke-static {p1, p2, p0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
- const p1, 0x7f0a06c6
+ const p1, 0x7f0a06c4
invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
@@ -53,7 +53,7 @@
iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumGuildConfirmationView;->d:Landroid/widget/ImageView;
- const p1, 0x7f0a06c7
+ const p1, 0x7f0a06c5
invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
@@ -67,7 +67,7 @@
iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumGuildConfirmationView;->e:Landroid/widget/TextView;
- const p1, 0x7f0a06ca
+ const p1, 0x7f0a06c8
invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
@@ -81,7 +81,7 @@
iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumGuildConfirmationView;->f:Landroid/widget/ImageView;
- const p1, 0x7f0a06c8
+ const p1, 0x7f0a06c6
invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
@@ -95,7 +95,7 @@
iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumGuildConfirmationView;->g:Lcom/google/android/material/chip/Chip;
- const p1, 0x7f0a06c9
+ const p1, 0x7f0a06c7
invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
@@ -425,7 +425,7 @@
goto :goto_0
:cond_3
- const v0, 0x7f080304
+ const v0, 0x7f080305
:goto_0
return v0
@@ -457,7 +457,7 @@
move-result-object p1
- const v0, 0x7f121206
+ const v0, 0x7f121214
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -470,7 +470,7 @@
move-result-object p1
- const v0, 0x7f121205
+ const v0, 0x7f121213
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -483,7 +483,7 @@
move-result-object p1
- const v0, 0x7f121204
+ const v0, 0x7f121212
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -496,7 +496,7 @@
move-result-object p1
- const v0, 0x7f121183
+ const v0, 0x7f121191
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/views/premiumguild/PremiumGuildProgressView.smali b/com.discord/smali/com/discord/views/premiumguild/PremiumGuildProgressView.smali
index e074fb39ac..a03f958a8d 100644
--- a/com.discord/smali/com/discord/views/premiumguild/PremiumGuildProgressView.smali
+++ b/com.discord/smali/com/discord/views/premiumguild/PremiumGuildProgressView.smali
@@ -27,7 +27,7 @@
invoke-static {p1, p2, p0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
- const p1, 0x7f0a072e
+ const p1, 0x7f0a072c
invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
@@ -37,7 +37,7 @@
iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumGuildProgressView;->d:Landroid/widget/ImageView;
- const p1, 0x7f0a0730
+ const p1, 0x7f0a072e
invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
@@ -47,7 +47,7 @@
iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumGuildProgressView;->e:Landroid/widget/TextView;
- const p1, 0x7f0a0731
+ const p1, 0x7f0a072f
invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
@@ -95,17 +95,17 @@
goto :goto_0
:cond_0
- const v1, 0x7f080251
+ const v1, 0x7f080252
goto :goto_0
:cond_1
- const v1, 0x7f080250
+ const v1, 0x7f080251
goto :goto_0
:cond_2
- const v1, 0x7f08024f
+ const v1, 0x7f080250
goto :goto_0
@@ -152,7 +152,7 @@
move-result-object v1
- const v2, 0x7f121206
+ const v2, 0x7f121214
invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -165,7 +165,7 @@
move-result-object v1
- const v2, 0x7f121205
+ const v2, 0x7f121213
invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -178,7 +178,7 @@
move-result-object v1
- const v2, 0x7f121204
+ const v2, 0x7f121212
invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -191,7 +191,7 @@
move-result-object v1
- const v2, 0x7f121183
+ const v2, 0x7f121191
invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView.smali b/com.discord/smali/com/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView.smali
index cdc9635130..b259f066cc 100644
--- a/com.discord/smali/com/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView.smali
+++ b/com.discord/smali/com/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView.smali
@@ -25,7 +25,7 @@
invoke-static {p1, p2, p0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
- const p1, 0x7f0a0a47
+ const p1, 0x7f0a0a45
invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
@@ -39,7 +39,7 @@
iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView;->d:Lcom/discord/app/AppTextView;
- const p1, 0x7f0a0a49
+ const p1, 0x7f0a0a47
invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
@@ -53,7 +53,7 @@
iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView;->e:Landroid/widget/TextView;
- const p1, 0x7f0a0a48
+ const p1, 0x7f0a0a46
invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
@@ -166,7 +166,7 @@
move-result-object v5
- const v6, 0x7f120ad5
+ const v6, 0x7f120adf
new-array v8, v2, [Ljava/lang/Object;
@@ -202,7 +202,7 @@
invoke-static {v9, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v10, 0x7f120ade
+ const v10, 0x7f120ae8
const/4 v15, 0x2
@@ -267,7 +267,7 @@
invoke-static {v9, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v7, 0x7f120ae3
+ const v7, 0x7f120aed
new-array v10, v1, [Ljava/lang/Object;
@@ -318,7 +318,7 @@
invoke-static {v9, v7}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v4, 0x7f120ae1
+ const v4, 0x7f120aeb
new-array v2, v2, [Ljava/lang/Object;
@@ -355,7 +355,7 @@
:cond_3
iget-object v1, v0, Lcom/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView;->d:Lcom/discord/app/AppTextView;
- const v5, 0x7f120add
+ const v5, 0x7f120ae7
new-array v2, v2, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/views/premiumguild/PremiumSubscriptionMarketingView.smali b/com.discord/smali/com/discord/views/premiumguild/PremiumSubscriptionMarketingView.smali
index f163a90051..93b91e3a92 100644
--- a/com.discord/smali/com/discord/views/premiumguild/PremiumSubscriptionMarketingView.smali
+++ b/com.discord/smali/com/discord/views/premiumguild/PremiumSubscriptionMarketingView.smali
@@ -37,7 +37,7 @@
invoke-static {p1, p2, p0}, Landroid/view/View;->inflate(Landroid/content/Context;ILandroid/view/ViewGroup;)Landroid/view/View;
- const p1, 0x7f0a0a44
+ const p1, 0x7f0a0a42
invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
@@ -51,7 +51,7 @@
iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->d:Landroid/widget/TextView;
- const p1, 0x7f0a0a43
+ const p1, 0x7f0a0a41
invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
@@ -65,7 +65,7 @@
iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->e:Landroid/widget/TextView;
- const p1, 0x7f0a0a46
+ const p1, 0x7f0a0a44
invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
@@ -79,7 +79,7 @@
iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->f:Landroid/widget/TextView;
- const p1, 0x7f0a0a45
+ const p1, 0x7f0a0a43
invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
@@ -93,7 +93,7 @@
iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->g:Landroid/widget/TextView;
- const p1, 0x7f0a0a3f
+ const p1, 0x7f0a0a3d
invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
@@ -105,7 +105,7 @@
iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->h:Landroid/view/View;
- const p1, 0x7f0a0a40
+ const p1, 0x7f0a0a3e
invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
@@ -117,7 +117,7 @@
iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->i:Landroid/view/View;
- const p1, 0x7f0a0a3e
+ const p1, 0x7f0a0a3c
invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
@@ -129,7 +129,7 @@
iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->j:Landroid/view/View;
- const p1, 0x7f0a0a42
+ const p1, 0x7f0a0a40
invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
@@ -143,7 +143,7 @@
iput-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->k:Landroid/widget/TextView;
- const p1, 0x7f0a0a41
+ const p1, 0x7f0a0a3f
invoke-virtual {p0, p1}, Landroid/widget/FrameLayout;->findViewById(I)Landroid/view/View;
@@ -237,7 +237,7 @@
aput-object v5, v3, v6
- const v5, 0x7f120ad5
+ const v5, 0x7f120adf
invoke-static {p0, v5, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
@@ -247,7 +247,7 @@
iget-object v1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->e:Landroid/widget/TextView;
- const v3, 0x7f120ad7
+ const v3, 0x7f120ae1
new-array v9, v2, [Ljava/lang/Object;
@@ -287,7 +287,7 @@
iget-object v1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->g:Landroid/widget/TextView;
- const v3, 0x7f120ad6
+ const v3, 0x7f120ae0
new-array v5, v2, [Ljava/lang/Object;
@@ -339,7 +339,7 @@
iget-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->k:Landroid/widget/TextView;
- const p2, 0x7f120ada
+ const p2, 0x7f120ae4
invoke-static {p0, p2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
@@ -349,7 +349,7 @@
iget-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->l:Landroid/widget/TextView;
- const p2, 0x7f120adb
+ const p2, 0x7f120ae5
new-array v0, v2, [Ljava/lang/Object;
@@ -378,7 +378,7 @@
iget-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->k:Landroid/widget/TextView;
- const v0, 0x7f120ad9
+ const v0, 0x7f120ae3
invoke-static {p0, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/views/steps/StepsView$b$a.smali b/com.discord/smali/com/discord/views/steps/StepsView$b$a.smali
index c6dc9a5508..757a0cce12 100644
--- a/com.discord/smali/com/discord/views/steps/StepsView$b$a.smali
+++ b/com.discord/smali/com/discord/views/steps/StepsView$b$a.smali
@@ -82,9 +82,9 @@
if-eqz v1, :cond_0
- const v1, 0x7f120f60
+ const v1, 0x7f120f6e
- const v11, 0x7f120f60
+ const v11, 0x7f120f6e
goto :goto_0
@@ -110,9 +110,9 @@
if-eqz v1, :cond_2
- const v1, 0x7f1205c5
+ const v1, 0x7f1205c6
- const v13, 0x7f1205c5
+ const v13, 0x7f1205c6
goto :goto_2
diff --git a/com.discord/smali/com/discord/views/steps/StepsView.smali b/com.discord/smali/com/discord/views/steps/StepsView.smali
index eacf530bc5..8c76136660 100644
--- a/com.discord/smali/com/discord/views/steps/StepsView.smali
+++ b/com.discord/smali/com/discord/views/steps/StepsView.smali
@@ -53,7 +53,7 @@
invoke-virtual {p1, p2, p0, v0}, Landroid/view/LayoutInflater;->inflate(ILandroid/view/ViewGroup;Z)Landroid/view/View;
- const p1, 0x7f0a0941
+ const p1, 0x7f0a093f
invoke-virtual {p0, p1}, Landroid/widget/RelativeLayout;->findViewById(I)Landroid/view/View;
@@ -67,7 +67,7 @@
iput-object p1, p0, Lcom/discord/views/steps/StepsView;->d:Landroid/widget/Button;
- const p1, 0x7f0a0940
+ const p1, 0x7f0a093e
invoke-virtual {p0, p1}, Landroid/widget/RelativeLayout;->findViewById(I)Landroid/view/View;
@@ -79,7 +79,7 @@
iput-object p1, p0, Lcom/discord/views/steps/StepsView;->e:Landroid/view/View;
- const p1, 0x7f0a0942
+ const p1, 0x7f0a0940
invoke-virtual {p0, p1}, Landroid/widget/RelativeLayout;->findViewById(I)Landroid/view/View;
@@ -93,7 +93,7 @@
iput-object p1, p0, Lcom/discord/views/steps/StepsView;->f:Landroid/widget/Button;
- const p1, 0x7f0a093f
+ const p1, 0x7f0a093d
invoke-virtual {p0, p1}, Landroid/widget/RelativeLayout;->findViewById(I)Landroid/view/View;
@@ -107,7 +107,7 @@
iput-object p1, p0, Lcom/discord/views/steps/StepsView;->g:Landroid/widget/TextView;
- const p1, 0x7f0a0943
+ const p1, 0x7f0a0941
invoke-virtual {p0, p1}, Landroid/widget/RelativeLayout;->findViewById(I)Landroid/view/View;
diff --git a/com.discord/smali/com/discord/views/typing/TypingDots.smali b/com.discord/smali/com/discord/views/typing/TypingDots.smali
index 126344b5b2..941a3ac996 100644
--- a/com.discord/smali/com/discord/views/typing/TypingDots.smali
+++ b/com.discord/smali/com/discord/views/typing/TypingDots.smali
@@ -67,7 +67,7 @@
new-array p1, p1, [Lcom/discord/views/typing/TypingDot;
- const p2, 0x7f0a0a4a
+ const p2, 0x7f0a0a48
invoke-virtual {p0, p2}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
@@ -81,7 +81,7 @@
aput-object p2, p1, v0
- const p2, 0x7f0a0a4b
+ const p2, 0x7f0a0a49
invoke-virtual {p0, p2}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
@@ -95,7 +95,7 @@
aput-object p2, p1, v1
- const p2, 0x7f0a0a4c
+ const p2, 0x7f0a0a4a
invoke-virtual {p0, p2}, Landroid/view/ViewGroup;->findViewById(I)Landroid/view/View;
diff --git a/com.discord/smali/com/discord/views/user/UserAvatarPresenceView.smali b/com.discord/smali/com/discord/views/user/UserAvatarPresenceView.smali
index 41d03ddf4c..7643840b4c 100644
--- a/com.discord/smali/com/discord/views/user/UserAvatarPresenceView.smali
+++ b/com.discord/smali/com/discord/views/user/UserAvatarPresenceView.smali
@@ -109,7 +109,7 @@
invoke-direct {p0, p1, p2}, Landroid/widget/RelativeLayout;->(Landroid/content/Context;Landroid/util/AttributeSet;)V
- const v0, 0x7f0a09c2
+ const v0, 0x7f0a09c0
invoke-static {p0, v0}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -117,7 +117,7 @@
iput-object v0, p0, Lcom/discord/views/user/UserAvatarPresenceView;->d:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a09c1
+ const v0, 0x7f0a09bf
invoke-static {p0, v0}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -125,7 +125,7 @@
iput-object v0, p0, Lcom/discord/views/user/UserAvatarPresenceView;->e:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a09c3
+ const v0, 0x7f0a09c1
invoke-static {p0, v0}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
diff --git a/com.discord/smali/com/discord/views/video/VideoCallParticipantView.smali b/com.discord/smali/com/discord/views/video/VideoCallParticipantView.smali
index 54d20a937a..3ea9852174 100644
--- a/com.discord/smali/com/discord/views/video/VideoCallParticipantView.smali
+++ b/com.discord/smali/com/discord/views/video/VideoCallParticipantView.smali
@@ -358,7 +358,7 @@
invoke-direct {p0, p1, p2, p3}, Landroidx/constraintlayout/widget/ConstraintLayout;->(Landroid/content/Context;Landroid/util/AttributeSet;I)V
- const p3, 0x7f0a068f
+ const p3, 0x7f0a068d
invoke-static {p0, p3}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -366,7 +366,7 @@
iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->d:Lkotlin/properties/ReadOnlyProperty;
- const p3, 0x7f0a0683
+ const p3, 0x7f0a0681
invoke-static {p0, p3}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -374,7 +374,7 @@
iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->e:Lkotlin/properties/ReadOnlyProperty;
- const p3, 0x7f0a068c
+ const p3, 0x7f0a068a
invoke-static {p0, p3}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -382,7 +382,7 @@
iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->f:Lkotlin/properties/ReadOnlyProperty;
- const p3, 0x7f0a0684
+ const p3, 0x7f0a0682
invoke-static {p0, p3}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -390,7 +390,7 @@
iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->g:Lkotlin/properties/ReadOnlyProperty;
- const p3, 0x7f0a068d
+ const p3, 0x7f0a068b
invoke-static {p0, p3}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -398,7 +398,7 @@
iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->h:Lkotlin/properties/ReadOnlyProperty;
- const p3, 0x7f0a0689
+ const p3, 0x7f0a0687
invoke-static {p0, p3}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -406,7 +406,7 @@
iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->i:Lkotlin/properties/ReadOnlyProperty;
- const p3, 0x7f0a068a
+ const p3, 0x7f0a0688
invoke-static {p0, p3}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -414,7 +414,7 @@
iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->j:Lkotlin/properties/ReadOnlyProperty;
- const p3, 0x7f0a0687
+ const p3, 0x7f0a0685
invoke-static {p0, p3}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -422,7 +422,7 @@
iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->k:Lkotlin/properties/ReadOnlyProperty;
- const p3, 0x7f0a0685
+ const p3, 0x7f0a0683
invoke-static {p0, p3}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -430,7 +430,7 @@
iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->l:Lkotlin/properties/ReadOnlyProperty;
- const p3, 0x7f0a0686
+ const p3, 0x7f0a0684
invoke-static {p0, p3}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -438,7 +438,7 @@
iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->m:Lkotlin/properties/ReadOnlyProperty;
- const p3, 0x7f0a0688
+ const p3, 0x7f0a0686
invoke-static {p0, p3}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -446,7 +446,7 @@
iput-object p3, p0, Lcom/discord/views/video/VideoCallParticipantView;->n:Lkotlin/properties/ReadOnlyProperty;
- const p3, 0x7f0a068b
+ const p3, 0x7f0a0689
invoke-static {p0, p3}, Lf/n/a/k/a;->h(Landroid/view/View;I)Lkotlin/properties/ReadOnlyProperty;
@@ -1827,7 +1827,7 @@
move-result-object v0
- const v1, 0x7f0803bb
+ const v1, 0x7f0803bc
invoke-virtual {v0, v1, v4, v4, v4}, Landroid/widget/TextView;->setCompoundDrawablesWithIntrinsicBounds(IIII)V
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureChannelSelector$1.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureChannelSelector$1.smali
index 6ef1918054..b980d4e59d 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureChannelSelector$1.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureChannelSelector$1.smali
@@ -75,7 +75,7 @@
const/4 v5, 0x0
- const v6, 0x7f120fa4
+ const v6, 0x7f120fb2
invoke-virtual/range {v0 .. v7}, Lcom/discord/widgets/channels/WidgetChannelSelector$Companion;->launch(Landroidx/fragment/app/Fragment;JIZILcom/discord/widgets/channels/WidgetChannelSelector$FilterFunction;)V
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureGuildSelector$1.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureGuildSelector$1.smali
index cd51f27e76..34655a34e4 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureGuildSelector$1.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet$configureGuildSelector$1.smali
@@ -59,7 +59,7 @@
const/4 v3, 0x0
- const v4, 0x7f120fa4
+ const v4, 0x7f120fb2
invoke-virtual/range {v0 .. v5}, Lcom/discord/widgets/guilds/WidgetGuildSelector$Companion;->launch(Landroidx/fragment/app/Fragment;IZILcom/discord/widgets/guilds/WidgetGuildSelector$FilterFunction;)V
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet.smali
index 02a0fd4de4..1690b38af5 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheet.smali
@@ -255,7 +255,7 @@
invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;->()V
- const v0, 0x7f0a029e
+ const v0, 0x7f0a02a0
invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -263,7 +263,7 @@
iput-object v0, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;->createChannelFollowerButton$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a015f
+ const v0, 0x7f0a0161
invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -271,7 +271,7 @@
iput-object v0, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;->sourceGuildIcon$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a015c
+ const v0, 0x7f0a015e
invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -279,7 +279,7 @@
iput-object v0, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;->sourceChannelName$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0160
+ const v0, 0x7f0a0162
invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -287,7 +287,7 @@
iput-object v0, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;->channelDropdown$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0162
+ const v0, 0x7f0a0164
invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -295,7 +295,7 @@
iput-object v0, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;->selectedChannelName$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0161
+ const v0, 0x7f0a0163
invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -303,7 +303,7 @@
iput-object v0, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;->guildDropdown$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0163
+ const v0, 0x7f0a0165
invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -311,7 +311,7 @@
iput-object v0, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;->selectedGuildName$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a015d
+ const v0, 0x7f0a015f
invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -319,7 +319,7 @@
iput-object v0, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSheet;->errorText$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a03c6
+ const v0, 0x7f0a03c8
invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -454,7 +454,7 @@
move-result-object v0
- const v1, 0x7f12141a
+ const v1, 0x7f121428
invoke-virtual {p0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -520,7 +520,7 @@
goto :goto_0
:cond_0
- const v1, 0x7f12141a
+ const v1, 0x7f121428
invoke-virtual {p0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel.smali
index 572e65789c..089b93fee1 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSheetViewModel.smali
@@ -259,12 +259,12 @@
if-eq p1, v0, :cond_0
- const p1, 0x7f1206b5
+ const p1, 0x7f1206b6
goto :goto_0
:cond_0
- const p1, 0x7f1206b9
+ const p1, 0x7f1206ba
:goto_0
invoke-virtual {p0}, Lf/a/b/o0;->getViewState()Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSuccessDialog.smali b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSuccessDialog.smali
index 9e35225598..7378b165e5 100644
--- a/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSuccessDialog.smali
+++ b/com.discord/smali/com/discord/widgets/announcements/WidgetChannelFollowSuccessDialog.smali
@@ -115,7 +115,7 @@
invoke-direct {p0}, Lcom/discord/app/AppDialog;->()V
- const v0, 0x7f0a0166
+ const v0, 0x7f0a0168
invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -123,7 +123,7 @@
iput-object v0, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSuccessDialog;->successTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0165
+ const v0, 0x7f0a0167
invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -135,7 +135,7 @@
new-array v0, v0, [Ljava/lang/Integer;
- const v1, 0x7f1206be
+ const v1, 0x7f1206bf
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -145,7 +145,7 @@
aput-object v1, v0, v2
- const v1, 0x7f1206bf
+ const v1, 0x7f1206c0
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -155,7 +155,7 @@
aput-object v1, v0, v3
- const v1, 0x7f1206c0
+ const v1, 0x7f1206c1
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -165,7 +165,7 @@
aput-object v1, v0, v4
- const v1, 0x7f1206c1
+ const v1, 0x7f1206c2
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -175,7 +175,7 @@
aput-object v1, v0, v5
- const v1, 0x7f1206c2
+ const v1, 0x7f1206c3
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -185,7 +185,7 @@
aput-object v1, v0, v6
- const v1, 0x7f1206c3
+ const v1, 0x7f1206c4
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -195,7 +195,7 @@
aput-object v1, v0, v6
- const v1, 0x7f1206c4
+ const v1, 0x7f1206c5
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -205,7 +205,7 @@
aput-object v1, v0, v6
- const v1, 0x7f1206c5
+ const v1, 0x7f1206c6
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -215,7 +215,7 @@
aput-object v1, v0, v6
- const v1, 0x7f1206c6
+ const v1, 0x7f1206c7
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -225,7 +225,7 @@
aput-object v1, v0, v6
- const v1, 0x7f1206c7
+ const v1, 0x7f1206c8
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -265,7 +265,7 @@
iput-object v0, p0, Lcom/discord/widgets/announcements/WidgetChannelFollowSuccessDialog;->successImageOptions:[Ljava/lang/Integer;
- const v0, 0x7f0a0164
+ const v0, 0x7f0a0166
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/widgets/auth/AuthInviteInfoView.smali b/com.discord/smali/com/discord/widgets/auth/AuthInviteInfoView.smali
index 60ac864499..6a55168c96 100644
--- a/com.discord/smali/com/discord/widgets/auth/AuthInviteInfoView.smali
+++ b/com.discord/smali/com/discord/widgets/auth/AuthInviteInfoView.smali
@@ -404,7 +404,7 @@
move-result-object p1
- const v0, 0x7f120c96
+ const v0, 0x7f120ca0
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -447,7 +447,7 @@
move-result-object p1
- const v0, 0x7f120c94
+ const v0, 0x7f120c9e
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -533,7 +533,7 @@
move-result-object v1
- const v2, 0x7f120b54
+ const v2, 0x7f120b5e
invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2$1.smali
index 708cb6f1aa..810fe5c10a 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday$validationManager$2$1.smali
@@ -100,7 +100,7 @@
move-result-object p1
- const v0, 0x7f121597
+ const v0, 0x7f1215a4
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday.smali
index 301e61e69d..aec9061d8a 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthBirthday.smali
@@ -346,7 +346,7 @@
new-array v0, v0, [Ljava/lang/Object;
- const v1, 0x7f121594
+ const v1, 0x7f1215a1
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -356,7 +356,7 @@
aput-object v1, v0, v2
- const v1, 0x7f121293
+ const v1, 0x7f1212a1
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -898,12 +898,12 @@
if-eqz v2, :cond_4
- const v2, 0x7f121596
+ const v2, 0x7f1215a3
goto :goto_3
:cond_4
- const v2, 0x7f121595
+ const v2, 0x7f1215a2
:goto_3
invoke-direct {p0, v1, v2}, Lcom/discord/widgets/auth/WidgetAuthBirthday;->getFormattedTermsText(Landroid/content/Context;I)Ljava/lang/CharSequence;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5$1.smali
index 65595d036e..2da98c4da1 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5$1.smali
@@ -97,7 +97,7 @@
move-result-object p1
- const v1, 0x7f1210c7
+ const v1, 0x7f1210d5
const/4 v2, 0x0
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5.smali
index e3c9379473..b7e1f1d665 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5.smali
@@ -51,13 +51,13 @@
invoke-direct {p1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V
- const v0, 0x7f1210c4
+ const v0, 0x7f1210d2
invoke-virtual {p1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
move-result-object p1
- const v0, 0x7f1210c5
+ const v0, 0x7f1210d3
invoke-virtual {p1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
@@ -65,13 +65,13 @@
sget-object v0, Lcom/discord/widgets/auth/WidgetAuthLogin$onViewBound$5$1;->INSTANCE:Lcom/discord/widgets/auth/WidgetAuthLogin$onViewBound$5$1;
- const v1, 0x7f1210c6
+ const v1, 0x7f1210d4
invoke-virtual {p1, v1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setPositiveButton(ILkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
move-result-object p1
- const v0, 0x7f1203b6
+ const v0, 0x7f1203b7
const/4 v1, 0x0
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$validationManager$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$validationManager$2.smali
index 6c46799aa6..2d3a5794c9 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$validationManager$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$validationManager$2.smali
@@ -66,7 +66,7 @@
sget-object v5, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
- const v6, 0x7f1205ed
+ const v6, 0x7f1205ee
invoke-virtual {v5, v6}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
@@ -78,7 +78,7 @@
sget-object v5, Lcom/discord/utilities/auth/AuthUtils;->INSTANCE:Lcom/discord/utilities/auth/AuthUtils;
- const v7, 0x7f1205ec
+ const v7, 0x7f1205ed
invoke-virtual {v5, v7}, Lcom/discord/utilities/auth/AuthUtils;->createEmailInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
@@ -106,7 +106,7 @@
sget-object v5, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
- const v8, 0x7f1210c9
+ const v8, 0x7f1210d7
invoke-virtual {v5, v8}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali
index 72aff631d4..4015044fed 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali
@@ -223,7 +223,7 @@
iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthLogin;->login$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a02ea
+ const v0, 0x7f0a02ec
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -329,7 +329,7 @@
move-result-object v0
- const v1, 0x7f1205ed
+ const v1, 0x7f1205ee
const/4 v3, 0x0
@@ -882,7 +882,7 @@
aput-object p1, v0, v1
- const p1, 0x7f1205ee
+ const p1, 0x7f1205ef
invoke-virtual {p0, p1, v0}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$onActivityCreated$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$onActivityCreated$1.smali
index 8e2f529c7a..b04417bde5 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$onActivityCreated$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa$onActivityCreated$1.smali
@@ -82,7 +82,7 @@
nop
:pswitch_data_0
- .packed-switch 0x7f0a05ab
+ .packed-switch 0x7f0a05ad
:pswitch_1
:pswitch_0
.end packed-switch
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali
index b1041eb8e1..f7044d97b7 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali
@@ -105,7 +105,7 @@
iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthMfa;->codeVerificationView$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a02ea
+ const v0, 0x7f0a02ec
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -181,7 +181,7 @@
if-ge v0, v1, :cond_0
- const p1, 0x7f121606
+ const p1, 0x7f121613
const/4 p2, 0x0
@@ -208,7 +208,7 @@
if-eqz v0, :cond_0
- const p1, 0x7f121630
+ const p1, 0x7f12163d
const/4 v0, 0x0
@@ -346,7 +346,7 @@
move-result-object v1
- const v2, 0x7f0a0a80
+ const v2, 0x7f0a0a83
invoke-virtual {v1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -354,13 +354,13 @@
check-cast v2, Lcom/google/android/material/textfield/TextInputLayout;
- const v3, 0x7f0a0a81
+ const v3, 0x7f0a0a84
invoke-virtual {v1, v3}, Landroid/view/View;->findViewById(I)Landroid/view/View;
move-result-object v3
- const v4, 0x7f0a0a7f
+ const v4, 0x7f0a0a82
invoke-virtual {v1, v4}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -417,7 +417,7 @@
move-result-object v1
- const v2, 0x7f0a0a83
+ const v2, 0x7f0a0a86
invoke-virtual {v1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -427,7 +427,7 @@
check-cast v7, Landroid/widget/TextView;
- const v2, 0x7f0a0a82
+ const v2, 0x7f0a0a85
invoke-virtual {v1, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -445,7 +445,7 @@
move-result-object v9
- const v1, 0x7f121613
+ const v1, 0x7f121620
const/4 v2, 0x2
@@ -744,7 +744,7 @@
move-result v0
- const v1, 0x7f0a05be
+ const v1, 0x7f0a05bc
if-eq v0, v1, :cond_0
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2$1.smali
index 03786b600d..4e5ad8bf9b 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2$1.smali
@@ -100,7 +100,7 @@
move-result-object p1
- const v0, 0x7f121597
+ const v0, 0x7f1215a4
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2.smali
index 91c05de23d..9be507e985 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2.smali
@@ -68,7 +68,7 @@
sget-object v6, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
- const v7, 0x7f121750
+ const v7, 0x7f12175d
invoke-virtual {v6, v7}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
@@ -98,7 +98,7 @@
sget-object v8, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
- const v9, 0x7f1205ed
+ const v9, 0x7f1205ee
invoke-virtual {v8, v9}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
@@ -108,7 +108,7 @@
sget-object v8, Lcom/discord/utilities/auth/AuthUtils;->INSTANCE:Lcom/discord/utilities/auth/AuthUtils;
- const v9, 0x7f1205ec
+ const v9, 0x7f1205ed
invoke-virtual {v8, v9}, Lcom/discord/utilities/auth/AuthUtils;->createEmailInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
@@ -134,7 +134,7 @@
sget-object v8, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
- const v9, 0x7f1210c9
+ const v9, 0x7f1210d7
invoke-virtual {v8, v9}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
@@ -144,7 +144,7 @@
sget-object v7, Lcom/discord/utilities/auth/AuthUtils;->INSTANCE:Lcom/discord/utilities/auth/AuthUtils;
- const v8, 0x7f1210c3
+ const v8, 0x7f1210d1
invoke-virtual {v7, v8}, Lcom/discord/utilities/auth/AuthUtils;->createPasswordInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali
index fdb417f3ce..93f5e6a459 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali
@@ -257,7 +257,7 @@
iput-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegister;->policyLinks$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a02ea
+ const v0, 0x7f0a02ec
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -409,7 +409,7 @@
move-result-object v0
- const v1, 0x7f120f60
+ const v1, 0x7f120f6e
invoke-virtual {p0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -478,7 +478,7 @@
new-array v0, v0, [Ljava/lang/Object;
- const v1, 0x7f121594
+ const v1, 0x7f1215a1
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -488,7 +488,7 @@
aput-object v1, v0, v2
- const v1, 0x7f121293
+ const v1, 0x7f1212a1
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1120,12 +1120,12 @@
if-eqz v0, :cond_4
- const v0, 0x7f121596
+ const v0, 0x7f1215a3
goto :goto_2
:cond_4
- const v0, 0x7f121595
+ const v0, 0x7f1215a2
:goto_2
invoke-direct {p0, v1, v0}, Lcom/discord/widgets/auth/WidgetAuthRegister;->getFormattedTermsText(Landroid/content/Context;I)Ljava/lang/CharSequence;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$Companion.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$Companion.smali
index 65d8705be8..935816b169 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$Companion.smali
@@ -196,7 +196,7 @@
aput-object v2, v1, v3
- const v2, 0x7f121068
+ const v2, 0x7f121076
invoke-virtual {p1, v2, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$OAuthPermissionViewHolder.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$OAuthPermissionViewHolder.smali
index 554925c692..f1a64dbaa9 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$OAuthPermissionViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$OAuthPermissionViewHolder.smali
@@ -90,7 +90,7 @@
invoke-direct {p0, p1}, Lcom/discord/utilities/views/SimpleRecyclerAdapter$ViewHolder;->(Landroid/view/View;)V
- const p1, 0x7f0a0666
+ const p1, 0x7f0a0664
invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
@@ -98,7 +98,7 @@
iput-object p1, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize$OAuthPermissionViewHolder;->iconIv$delegate:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a0667
+ const p1, 0x7f0a0665
invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
@@ -175,7 +175,7 @@
move-result-object v0
- const v1, 0x7f080278
+ const v1, 0x7f080279
invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageResource(I)V
@@ -202,7 +202,7 @@
move-result-object v0
- const v1, 0x7f080288
+ const v1, 0x7f080289
invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageResource(I)V
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$validationManager$2$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$validationManager$2$2.smali
index 9a5eb395a4..c274914c4d 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$validationManager$2$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$validationManager$2$2.smali
@@ -148,7 +148,7 @@
iget-object v2, v2, Lcom/discord/widgets/auth/WidgetOauth2Authorize$validationManager$2;->this$0:Lcom/discord/widgets/auth/WidgetOauth2Authorize;
- const v4, 0x7f121067
+ const v4, 0x7f121075
new-array v5, v3, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize.smali
index 838a125954..f12ea2da74 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize.smali
@@ -372,7 +372,7 @@
invoke-direct {p0}, Lcom/discord/app/AppFragment;->()V
- const v0, 0x7f0a0665
+ const v0, 0x7f0a0663
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -380,7 +380,7 @@
iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->userIconIv$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0654
+ const v0, 0x7f0a0652
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -388,7 +388,7 @@
iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->appIconIv$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0655
+ const v0, 0x7f0a0653
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -396,7 +396,7 @@
iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->appNameTv$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a065f
+ const v0, 0x7f0a065d
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -404,7 +404,7 @@
iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->permissionsLabelTv$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0652
+ const v0, 0x7f0a0650
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -412,7 +412,7 @@
iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->ageNoticeTv$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0661
+ const v0, 0x7f0a065f
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -420,7 +420,7 @@
iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->securityNoticeTv$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0660
+ const v0, 0x7f0a065e
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -428,7 +428,7 @@
iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->permissionsList$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a065a
+ const v0, 0x7f0a0658
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -436,7 +436,7 @@
iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->grantBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0663
+ const v0, 0x7f0a0661
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -456,7 +456,7 @@
iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->denyBtns$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a065b
+ const v0, 0x7f0a0659
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -464,7 +464,7 @@
iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->loadingScreen$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0658
+ const v0, 0x7f0a0656
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -472,7 +472,7 @@
iput-object v0, p0, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->contentScreen$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a065e
+ const v0, 0x7f0a065c
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -506,9 +506,9 @@
:array_0
.array-data 4
- 0x7f0a0659
- 0x7f0a065c
- 0x7f0a0664
+ 0x7f0a0657
+ 0x7f0a065a
+ 0x7f0a0662
.end array-data
.end method
@@ -624,7 +624,7 @@
move-result-object v1
- const v2, 0x7f121059
+ const v2, 0x7f121067
invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -726,12 +726,12 @@
if-eqz p1, :cond_0
- const p1, 0x7f121055
+ const p1, 0x7f121063
goto :goto_0
:cond_0
- const p1, 0x7f121056
+ const p1, 0x7f121064
:goto_0
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -1010,42 +1010,42 @@
packed-switch v0, :pswitch_data_0
- const v0, 0x7f121064
+ const v0, 0x7f121072
goto :goto_0
:pswitch_0
- const v0, 0x7f121063
+ const v0, 0x7f121071
goto :goto_0
:pswitch_1
- const v0, 0x7f121062
+ const v0, 0x7f121070
goto :goto_0
:pswitch_2
- const v0, 0x7f121061
+ const v0, 0x7f12106f
goto :goto_0
:pswitch_3
- const v0, 0x7f121060
+ const v0, 0x7f12106e
goto :goto_0
:pswitch_4
- const v0, 0x7f12105f
+ const v0, 0x7f12106d
goto :goto_0
:pswitch_5
- const v0, 0x7f12105e
+ const v0, 0x7f12106c
goto :goto_0
:pswitch_6
- const v0, 0x7f12105d
+ const v0, 0x7f12106b
:goto_0
return v0
@@ -1171,7 +1171,7 @@
aput-object p1, v2, v3
- const p1, 0x7f121067
+ const p1, 0x7f121075
invoke-virtual {p0, p1, v2}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -1318,7 +1318,7 @@
move-result-object v4
- const v5, 0x7f12106a
+ const v5, 0x7f121078
const/4 v6, 0x1
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung.smali
index f5a9e6596b..3ce2e1782f 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung.smali
@@ -73,7 +73,7 @@
invoke-direct {p0}, Lcom/discord/widgets/auth/WidgetOauth2Authorize;->()V
- const v0, 0x7f0a065a
+ const v0, 0x7f0a0658
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -705,7 +705,7 @@
invoke-static {p3, p1, v4, v3, v4}, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;->logW$default(Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$Companion;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
- const p1, 0x7f12069a
+ const p1, 0x7f12069b
const/4 p2, 0x4
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetRemoteAuth.smali b/com.discord/smali/com/discord/widgets/auth/WidgetRemoteAuth.smali
index c4ba41de46..84c78c3d8e 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetRemoteAuth.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetRemoteAuth.smali
@@ -189,7 +189,7 @@
invoke-direct {p0}, Lcom/discord/app/AppFragment;->()V
- const v0, 0x7f0a074a
+ const v0, 0x7f0a0748
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -197,7 +197,7 @@
iput-object v0, p0, Lcom/discord/widgets/auth/WidgetRemoteAuth;->viewFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0745
+ const v0, 0x7f0a0743
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -205,7 +205,7 @@
iput-object v0, p0, Lcom/discord/widgets/auth/WidgetRemoteAuth;->cancelButton$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0748
+ const v0, 0x7f0a0746
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -213,7 +213,7 @@
iput-object v0, p0, Lcom/discord/widgets/auth/WidgetRemoteAuth;->notFoundCancelButton$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0747
+ const v0, 0x7f0a0745
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -221,7 +221,7 @@
iput-object v0, p0, Lcom/discord/widgets/auth/WidgetRemoteAuth;->loginButton$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0749
+ const v0, 0x7f0a0747
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -229,7 +229,7 @@
iput-object v0, p0, Lcom/discord/widgets/auth/WidgetRemoteAuth;->temporarySwitch$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0746
+ const v0, 0x7f0a0744
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
diff --git a/com.discord/smali/com/discord/widgets/channels/SimpleMembersAdapter$MemberAdapterItem.smali b/com.discord/smali/com/discord/widgets/channels/SimpleMembersAdapter$MemberAdapterItem.smali
index af889fb7a3..1d4382329b 100644
--- a/com.discord/smali/com/discord/widgets/channels/SimpleMembersAdapter$MemberAdapterItem.smali
+++ b/com.discord/smali/com/discord/widgets/channels/SimpleMembersAdapter$MemberAdapterItem.smali
@@ -49,7 +49,7 @@
iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
- const v0, 0x7f0a05a5
+ const v0, 0x7f0a05a7
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -61,7 +61,7 @@
iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
- const v0, 0x7f0a05a2
+ const v0, 0x7f0a05a4
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
diff --git a/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter$RoleAdapterItem.smali b/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter$RoleAdapterItem.smali
index ea5754a635..0528baae74 100644
--- a/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter$RoleAdapterItem.smali
+++ b/com.discord/smali/com/discord/widgets/channels/SimpleRolesAdapter$RoleAdapterItem.smali
@@ -47,7 +47,7 @@
iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
- const v0, 0x7f0a0833
+ const v0, 0x7f0a0831
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali
index 83017f0be1..fe2802e81d 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali
@@ -67,8 +67,8 @@
:array_0
.array-data 4
- 0x7f0a019c
- 0x7f0a08bb
+ 0x7f0a019e
+ 0x7f0a08b9
.end array-data
.end method
@@ -217,7 +217,7 @@
move-result-object v1
- const v2, 0x7f12040a
+ const v2, 0x7f12040b
invoke-virtual {p0, v2}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -294,25 +294,25 @@
move-result-object v4
- const p1, 0x7f120f29
+ const p1, 0x7f120f37
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
move-result-object v5
- const p1, 0x7f121653
+ const p1, 0x7f121660
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
move-result-object v6
- const p1, 0x7f12073d
+ const p1, 0x7f12073e
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
move-result-object v7
- const v8, 0x7f12073e
+ const v8, 0x7f12073f
const/4 v9, 0x0
@@ -365,7 +365,7 @@
aput-object p3, v1, v2
- const v3, 0x7f120dfd
+ const v3, 0x7f120e08
invoke-virtual {p0, v3, v1}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -379,7 +379,7 @@
aput-object p3, p1, v2
- const p3, 0x7f120dfa
+ const p3, 0x7f120e05
invoke-virtual {p0, p3, p1}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -399,7 +399,7 @@
invoke-direct {p3, p2}, Lf/a/o/a/p;->(Lrx/functions/Action1;)V
- const p2, 0x7f120df9
+ const p2, 0x7f120e04
invoke-virtual {p1, p2, p3}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setPositiveButton(ILkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
@@ -407,7 +407,7 @@
sget-object p2, Lf/a/o/a/l;->d:Lf/a/o/a/l;
- const p3, 0x7f1203b6
+ const p3, 0x7f1203b7
invoke-virtual {p1, p3, p2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setNegativeButton(ILkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
@@ -453,7 +453,7 @@
.method private handleUpdate()V
.locals 2
- const v0, 0x7f121392
+ const v0, 0x7f1213a0
invoke-static {p0, v0}, Lf/a/b/n;->g(Landroidx/fragment/app/Fragment;I)V
@@ -611,7 +611,7 @@
move-result p3
- const v0, 0x7f0a05c8
+ const v0, 0x7f0a05c6
if-ne p3, v0, :cond_0
@@ -814,7 +814,7 @@
invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->setRetainInstance(Z)V
- const v1, 0x7f0a019c
+ const v1, 0x7f0a019e
invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -824,7 +824,7 @@
iput-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->channelSettingsName:Lcom/google/android/material/textfield/TextInputLayout;
- const v1, 0x7f0a01b0
+ const v1, 0x7f0a01b2
invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -832,7 +832,7 @@
iput-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->saveButton:Landroid/view/View;
- const v1, 0x7f0a0414
+ const v1, 0x7f0a0416
invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -842,7 +842,7 @@
iput-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->scrollView:Landroidx/core/widget/NestedScrollView;
- const v1, 0x7f0a0413
+ const v1, 0x7f0a0415
invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -852,7 +852,7 @@
iput-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->notificationMuteSettingsView:Lcom/discord/widgets/servers/NotificationMuteSettingsView;
- const v1, 0x7f0a08bc
+ const v1, 0x7f0a08ba
invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -862,7 +862,7 @@
iput-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->iconLabel:Lcom/discord/app/AppTextView;
- const v1, 0x7f0a08bd
+ const v1, 0x7f0a08bb
invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -870,7 +870,7 @@
iput-object v1, p0, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->iconRemove:Landroid/view/View;
- const v1, 0x7f0a08bb
+ const v1, 0x7f0a08b9
invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -992,9 +992,9 @@
.method public synthetic r()V
.locals 2
- const v0, 0x7f120429
+ const v0, 0x7f12042a
- const v1, 0x7f12163e
+ const v1, 0x7f12164b
invoke-static {p0, v0, v1}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1.smali
index d204095ea6..7e75baa381 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1.smali
@@ -97,7 +97,7 @@
iget-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings$configureNotificationRadios$1;->this$0:Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;
- const v1, 0x7f120def
+ const v1, 0x7f120dfa
invoke-virtual {v0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali
index 110ec58088..5736df9368 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali
@@ -138,7 +138,7 @@
invoke-direct {p0}, Lcom/discord/app/AppFragment;->()V
- const v0, 0x7f0a0174
+ const v0, 0x7f0a0176
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -146,7 +146,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;->notificationMuteSettingsView$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01a2
+ const v0, 0x7f0a01a4
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -166,7 +166,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;->notificationSettingsRadios$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0173
+ const v0, 0x7f0a0175
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -180,9 +180,9 @@
:array_0
.array-data 4
- 0x7f0a019f
- 0x7f0a01a0
0x7f0a01a1
+ 0x7f0a01a2
+ 0x7f0a01a3
.end array-data
.end method
@@ -348,11 +348,11 @@
const/4 v3, 0x1
- const v8, 0x7f120f26
+ const v8, 0x7f120f34
if-eqz v2, :cond_0
- const v2, 0x7f120f27
+ const v2, 0x7f120f35
new-array v9, v3, [Ljava/lang/Object;
@@ -400,7 +400,7 @@
if-eqz v9, :cond_1
- const v8, 0x7f121651
+ const v8, 0x7f12165e
new-array v3, v3, [Ljava/lang/Object;
@@ -446,7 +446,7 @@
move-result-object v11
- const v3, 0x7f120738
+ const v3, 0x7f120739
invoke-virtual {v0, v3}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -456,9 +456,9 @@
invoke-static {v14, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v15, 0x7f120739
+ const v15, 0x7f12073a
- const v3, 0x7f12073c
+ const v3, 0x7f12073d
invoke-virtual {v0, v3}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -602,7 +602,7 @@
invoke-static {p0, v1, p1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const p1, 0x7f120ff1
+ const p1, 0x7f120fff
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelOnboardingSheet.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelOnboardingSheet.smali
index e2c46d015b..b77074cee5 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelOnboardingSheet.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelOnboardingSheet.smali
@@ -67,7 +67,7 @@
invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;->()V
- const v0, 0x7f0a015a
+ const v0, 0x7f0a015c
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/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel.smali
index 7374001e87..b2f9cd0feb 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel.smali
@@ -79,7 +79,7 @@
iput p3, p0, Lcom/discord/widgets/channels/WidgetChannelSelector$Adapter$ItemChannel;->noChannelStringId:I
- const p1, 0x7f0a0193
+ const p1, 0x7f0a0195
invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Companion.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Companion.smali
index 94d2e9ca06..74c40891b1 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Companion.smali
@@ -101,9 +101,9 @@
if-eqz p5, :cond_1
- const p6, 0x7f120fa4
+ const p6, 0x7f120fb2
- const v6, 0x7f120fa4
+ const v6, 0x7f120fb2
goto :goto_1
@@ -145,9 +145,9 @@
if-eqz p5, :cond_1
- const p6, 0x7f120fa4
+ const p6, 0x7f120fb2
- const v6, 0x7f120fa4
+ const v6, 0x7f120fb2
goto :goto_1
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector.smali
index 57e41f5116..7d094cda61 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector.smali
@@ -90,7 +90,7 @@
invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;->()V
- const v0, 0x7f0a0194
+ const v0, 0x7f0a0196
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/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForRole.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForRole.smali
index 735504de11..65bdca0fc2 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForRole.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForRole.smali
@@ -816,7 +816,7 @@
const/4 v0, 0x0
:goto_0
- const v3, 0x7f1203bb
+ const v3, 0x7f1203bc
if-eqz v0, :cond_4
@@ -844,7 +844,7 @@
goto :goto_1
:cond_3
- const p2, 0x7f1203b9
+ const p2, 0x7f1203ba
invoke-virtual {p1, p2}, Lcom/discord/views/TernaryCheckBox;->setOffDisabled(I)V
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForUser.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForUser.smali
index fa663d70ff..655d218faf 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForUser.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForUser.smali
@@ -375,7 +375,7 @@
move-result p2
- const p3, 0x7f1203ba
+ const p3, 0x7f1203bb
if-eqz p2, :cond_0
@@ -402,7 +402,7 @@
goto :goto_0
:cond_2
- const p2, 0x7f1203b9
+ const p2, 0x7f1203ba
invoke-virtual {p1, p2}, Lcom/discord/views/TernaryCheckBox;->setDisabled(I)V
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions.smali
index 13b38d902f..58478f5a5a 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions.smali
@@ -114,12 +114,12 @@
if-eqz v0, :cond_0
- const v0, 0x7f1203cd
+ const v0, 0x7f1203ce
goto :goto_0
:cond_0
- const v0, 0x7f12040a
+ const v0, 0x7f12040b
:goto_0
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -584,7 +584,7 @@
nop
:pswitch_data_0
- .packed-switch 0x7f0a0178
+ .packed-switch 0x7f0a017a
:pswitch_13
:pswitch_12
:pswitch_11
@@ -850,7 +850,7 @@
move-result p4
- const p5, 0x7f0a05c3
+ const p5, 0x7f0a05c1
if-eq p4, p5, :cond_0
@@ -1021,7 +1021,7 @@
invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
- const v0, 0x7f0a018c
+ const v0, 0x7f0a018e
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -1031,7 +1031,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;->userAvatar:Landroid/widget/ImageView;
- const v0, 0x7f0a018f
+ const v0, 0x7f0a0191
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -1041,7 +1041,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;->targetName:Landroid/widget/TextView;
- const v0, 0x7f0a018d
+ const v0, 0x7f0a018f
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -1051,7 +1051,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;->channelName:Landroid/widget/TextView;
- const v0, 0x7f0a0190
+ const v0, 0x7f0a0192
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -1059,7 +1059,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;->textPermissionsContainer:Landroid/view/View;
- const v0, 0x7f0a0191
+ const v0, 0x7f0a0193
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -1067,7 +1067,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;->voicePermissionsContainer:Landroid/view/View;
- const v0, 0x7f0a018e
+ const v0, 0x7f0a0190
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -1081,7 +1081,7 @@
new-array v0, v0, [Lcom/discord/views/TernaryCheckBox;
- const v1, 0x7f0a0178
+ const v1, 0x7f0a017a
invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -1093,7 +1093,7 @@
aput-object v1, v0, v2
- const v1, 0x7f0a0179
+ const v1, 0x7f0a017b
invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -1105,7 +1105,7 @@
aput-object v1, v0, v2
- const v1, 0x7f0a017a
+ const v1, 0x7f0a017c
invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -1117,7 +1117,7 @@
aput-object v1, v0, v2
- const v1, 0x7f0a017b
+ const v1, 0x7f0a017d
invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -1129,7 +1129,7 @@
aput-object v1, v0, v2
- const v1, 0x7f0a017d
+ const v1, 0x7f0a017f
invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -1141,7 +1141,7 @@
aput-object v1, v0, v2
- const v1, 0x7f0a017e
+ const v1, 0x7f0a0180
invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -1153,7 +1153,7 @@
aput-object v1, v0, v2
- const v1, 0x7f0a017f
+ const v1, 0x7f0a0181
invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -1165,7 +1165,7 @@
aput-object v1, v0, v2
- const v1, 0x7f0a0180
+ const v1, 0x7f0a0182
invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -1177,7 +1177,7 @@
aput-object v1, v0, v2
- const v1, 0x7f0a0181
+ const v1, 0x7f0a0183
invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -1189,7 +1189,7 @@
aput-object v1, v0, v2
- const v1, 0x7f0a0182
+ const v1, 0x7f0a0184
invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -1201,7 +1201,7 @@
aput-object v1, v0, v2
- const v1, 0x7f0a0183
+ const v1, 0x7f0a0185
invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -1213,7 +1213,7 @@
aput-object v1, v0, v2
- const v1, 0x7f0a0184
+ const v1, 0x7f0a0186
invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -1225,7 +1225,7 @@
aput-object v1, v0, v2
- const v1, 0x7f0a0185
+ const v1, 0x7f0a0187
invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -1237,7 +1237,7 @@
aput-object v1, v0, v2
- const v1, 0x7f0a017c
+ const v1, 0x7f0a017e
invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -1249,7 +1249,7 @@
aput-object v1, v0, v2
- const v1, 0x7f0a0186
+ const v1, 0x7f0a0188
invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -1261,7 +1261,7 @@
aput-object v1, v0, v2
- const v1, 0x7f0a0187
+ const v1, 0x7f0a0189
invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -1273,7 +1273,7 @@
aput-object v1, v0, v2
- const v1, 0x7f0a0188
+ const v1, 0x7f0a018a
invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -1285,7 +1285,7 @@
aput-object v1, v0, v2
- const v1, 0x7f0a0189
+ const v1, 0x7f0a018b
invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -1297,7 +1297,7 @@
aput-object v1, v0, v2
- const v1, 0x7f0a018a
+ const v1, 0x7f0a018c
invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -1309,7 +1309,7 @@
aput-object v1, v0, v2
- const v1, 0x7f0a018b
+ const v1, 0x7f0a018d
invoke-virtual {p1, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember.smali
index 9e659726de..282c80091d 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember.smali
@@ -275,7 +275,7 @@
invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
- const v0, 0x7f0a01a6
+ const v0, 0x7f0a01a8
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -285,7 +285,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember;->membersRecycler:Landroidx/recyclerview/widget/RecyclerView;
- const v0, 0x7f0a01a5
+ const v0, 0x7f0a01a7
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -295,7 +295,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsAddMember;->searchBox:Lcom/google/android/material/textfield/TextInputLayout;
- const v0, 0x7f0a01a7
+ const v0, 0x7f0a01a9
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole.smali
index 32832d7dd1..1039b1e010 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsAddRole.smali
@@ -195,7 +195,7 @@
invoke-virtual {p0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar;
- const v0, 0x7f0a01a8
+ const v0, 0x7f0a01aa
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali
index bbe9b5f633..89f01df98f 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali
@@ -139,12 +139,12 @@
if-eqz v0, :cond_0
- const v0, 0x7f1203cd
+ const v0, 0x7f1203ce
goto :goto_0
:cond_0
- const v0, 0x7f12040a
+ const v0, 0x7f12040b
:goto_0
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -354,7 +354,7 @@
goto :goto_0
:cond_0
- const p1, 0x7f1210b9
+ const p1, 0x7f1210c7
invoke-static {p0, p1}, Lf/a/b/n;->g(Landroidx/fragment/app/Fragment;I)V
@@ -399,7 +399,7 @@
invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
- const v0, 0x7f0a01aa
+ const v0, 0x7f0a01ac
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -407,7 +407,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview;->addRole:Landroid/view/View;
- const v0, 0x7f0a01a9
+ const v0, 0x7f0a01ab
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -415,7 +415,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview;->addMember:Landroid/view/View;
- const v0, 0x7f0a01ac
+ const v0, 0x7f0a01ae
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -423,7 +423,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview;->rolesContainer:Landroid/view/View;
- const v0, 0x7f0a01ab
+ const v0, 0x7f0a01ad
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -431,7 +431,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview;->membersContainer:Landroid/view/View;
- const v0, 0x7f0a0a88
+ const v0, 0x7f0a0a8b
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -441,7 +441,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview;->rolesRecycler:Landroidx/recyclerview/widget/RecyclerView;
- const v0, 0x7f0a0a87
+ const v0, 0x7f0a0a8a
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions.smali
index cc1e8babbf..fcc9f257d2 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSidebarActions.smali
@@ -73,7 +73,7 @@
invoke-direct {p0}, Lcom/discord/app/AppFragment;->()V
- const v0, 0x7f0a0a89
+ const v0, 0x7f0a0a8c
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -81,7 +81,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelSidebarActions;->guildActionView$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0a8a
+ const v0, 0x7f0a0a8d
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4.smali
index 2e9a744014..7f4bc730f5 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4.smali
@@ -67,7 +67,7 @@
aput-object v5, v4, v6
- const v5, 0x7f120dfd
+ const v5, 0x7f120e08
invoke-virtual {v3, v5, v4}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -81,7 +81,7 @@
aput-object v7, v5, v6
- const v6, 0x7f120dfa
+ const v6, 0x7f120e05
invoke-virtual {v4, v6, v5}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -93,7 +93,7 @@
iget-object v5, v0, Lcom/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4;->this$0:Lcom/discord/widgets/channels/WidgetChannelTopic;
- const v6, 0x7f120df9
+ const v6, 0x7f120e04
invoke-virtual {v5, v6}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -101,13 +101,13 @@
iget-object v6, v0, Lcom/discord/widgets/channels/WidgetChannelTopic$showContextMenu$4;->this$0:Lcom/discord/widgets/channels/WidgetChannelTopic;
- const v7, 0x7f1203b6
+ const v7, 0x7f1203b7
invoke-virtual {v6, v7}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
move-result-object v6
- const v7, 0x7f0a0630
+ const v7, 0x7f0a062e
invoke-static {v7}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic.smali
index e63ca8f3d7..90b898411d 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic.smali
@@ -147,7 +147,7 @@
invoke-direct {p0}, Lcom/discord/app/AppFragment;->()V
- const v0, 0x7f0a01c0
+ const v0, 0x7f0a01c2
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -155,7 +155,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelTopic;->moreButton$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01c2
+ const v0, 0x7f0a01c4
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -163,7 +163,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelTopic;->channelTopicTitle$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01bf
+ const v0, 0x7f0a01c1
invoke-static {p0, v0}, Lf/n/a/k/a;->g(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -171,7 +171,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelTopic;->channelTopicEllipsis$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01c1
+ const v0, 0x7f0a01c3
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -179,7 +179,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetChannelTopic;->channelName$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01be
+ const v0, 0x7f0a01c0
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -471,7 +471,7 @@
invoke-virtual {v0, v3}, Landroid/view/View;->setVisibility(I)V
- const v0, 0x7f0802a3
+ const v0, 0x7f0802a4
invoke-direct {p0, v0}, Lcom/discord/widgets/channels/WidgetChannelTopic;->setChannelIcon(I)V
@@ -1339,7 +1339,7 @@
move-result-object v1
- const v2, 0x7f0a05d1
+ const v2, 0x7f0a05cf
invoke-interface {v1, v2}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
@@ -1355,7 +1355,7 @@
move-result-object v1
- const v2, 0x7f0a05cf
+ const v2, 0x7f0a05cd
invoke-interface {v1, v2}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
@@ -1377,7 +1377,7 @@
move-result-object p5
- const v1, 0x7f0a05d0
+ const v1, 0x7f0a05ce
invoke-interface {p5, v1}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
@@ -1399,7 +1399,7 @@
move-result-object p2
- const p3, 0x7f0a05ce
+ const p3, 0x7f0a05cc
invoke-interface {p2, p3}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
@@ -1409,7 +1409,7 @@
if-ne p1, p3, :cond_0
- const p1, 0x7f120df9
+ const p1, 0x7f120e04
invoke-interface {p2, p1}, Landroid/view/MenuItem;->setTitle(I)Landroid/view/MenuItem;
@@ -1422,7 +1422,7 @@
goto :goto_0
:cond_0
- const p1, 0x7f12043b
+ const p1, 0x7f12043c
invoke-interface {p2, p1}, Landroid/view/MenuItem;->setTitle(I)Landroid/view/MenuItem;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel$RolesAdapter$RoleListItem.smali b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel$RolesAdapter$RoleListItem.smali
index f9ef92330e..5aaf630fc9 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel$RolesAdapter$RoleListItem.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel$RolesAdapter$RoleListItem.smali
@@ -38,7 +38,7 @@
iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
- const v0, 0x7f0a0762
+ const v0, 0x7f0a0760
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali
index e99f81785c..b149355145 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali
@@ -88,12 +88,12 @@
if-ne v0, v1, :cond_1
- const v0, 0x7f1204f2
+ const v0, 0x7f1204f3
goto :goto_0
:cond_1
- const v0, 0x7f1204f3
+ const v0, 0x7f1204f4
:goto_0
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -499,7 +499,7 @@
move-result p1
- const p2, 0x7f0a05db
+ const p2, 0x7f0a05d9
if-ne p1, p2, :cond_0
@@ -603,7 +603,7 @@
invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
- const v0, 0x7f0a029f
+ const v0, 0x7f0a02a1
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -613,7 +613,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->channelNameLayout:Lcom/google/android/material/textfield/TextInputLayout;
- const v0, 0x7f0a02a4
+ const v0, 0x7f0a02a6
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -623,7 +623,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->rolesRecycler:Landroidx/recyclerview/widget/RecyclerView;
- const v0, 0x7f0a02a7
+ const v0, 0x7f0a02a9
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -633,7 +633,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->textRadio:Landroid/widget/RadioButton;
- const v0, 0x7f0a02aa
+ const v0, 0x7f0a02ac
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -643,7 +643,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->voiceRadio:Landroid/widget/RadioButton;
- const v0, 0x7f0a02a2
+ const v0, 0x7f0a02a4
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -653,7 +653,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->privateSwitch:Landroid/widget/Switch;
- const v0, 0x7f0a02a3
+ const v0, 0x7f0a02a5
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -663,7 +663,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->privateTitle:Landroid/widget/TextView;
- const v0, 0x7f0a02a1
+ const v0, 0x7f0a02a3
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -673,7 +673,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->privateInfo:Landroid/widget/TextView;
- const v0, 0x7f0a02a6
+ const v0, 0x7f0a02a8
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -681,7 +681,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->textChannelContainer:Landroid/view/View;
- const v0, 0x7f0a02a9
+ const v0, 0x7f0a02ab
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -689,7 +689,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->voiceChannelContainer:Landroid/view/View;
- const v0, 0x7f0a02a0
+ const v0, 0x7f0a02a2
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -697,7 +697,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->privateChannelContainer:Landroid/view/View;
- const v0, 0x7f0a02a5
+ const v0, 0x7f0a02a7
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -707,7 +707,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetCreateChannel;->roleHeader:Landroid/widget/TextView;
- const v0, 0x7f0a02a8
+ const v0, 0x7f0a02aa
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -936,12 +936,12 @@
if-ne v1, v2, :cond_4
- const v1, 0x7f121295
+ const v1, 0x7f1212a3
goto :goto_1
:cond_4
- const v1, 0x7f121297
+ const v1, 0x7f1212a5
:goto_1
invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -952,12 +952,12 @@
if-ne v1, v2, :cond_5
- const v1, 0x7f121296
+ const v1, 0x7f1212a4
goto :goto_2
:cond_5
- const v1, 0x7f12129e
+ const v1, 0x7f1212ac
:goto_2
invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -968,12 +968,12 @@
if-ne v1, v2, :cond_6
- const v1, 0x7f12070f
+ const v1, 0x7f120710
goto :goto_3
:cond_6
- const v1, 0x7f120712
+ const v1, 0x7f120713
:goto_3
invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -984,12 +984,12 @@
if-ne v1, v2, :cond_7
- const v1, 0x7f1203cc
+ const v1, 0x7f1203cd
goto :goto_4
:cond_7
- const v1, 0x7f120710
+ const v1, 0x7f120711
:goto_4
invoke-virtual {p0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1.smali
index 1accb55e17..57fe8b75a6 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1.smali
@@ -84,7 +84,7 @@
iget-object p1, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1;->this$0:Lcom/discord/widgets/channels/WidgetGroupInviteFriends;
- const p2, 0x7f1208f6
+ const p2, 0x7f1208f7
const/4 v0, 0x0
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$1.smali
index 4235f8cf57..d09c2ae57b 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$1.smali
@@ -43,7 +43,7 @@
move-result-object p1
- const v0, 0x7f1208f6
+ const v0, 0x7f1208f7
const/4 v1, 0x0
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali
index 789c3fb48c..a1db3097c0 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali
@@ -205,7 +205,7 @@
invoke-direct {p0}, Lcom/discord/app/AppFragment;->()V
- const v0, 0x7f0a0417
+ const v0, 0x7f0a0419
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -213,7 +213,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->recycler$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a041a
+ const v0, 0x7f0a041c
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -221,7 +221,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->viewFlipper$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0418
+ const v0, 0x7f0a041a
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -229,7 +229,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->sendFab$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0415
+ const v0, 0x7f0a0417
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -237,7 +237,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->chipsView$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0416
+ const v0, 0x7f0a0418
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -849,7 +849,7 @@
if-eqz v0, :cond_0
- const v0, 0x7f120902
+ const v0, 0x7f120903
new-array v4, v2, [Ljava/lang/Object;
@@ -882,7 +882,7 @@
goto :goto_0
:cond_0
- const v0, 0x7f120d2b
+ const v0, 0x7f120d36
invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -917,7 +917,7 @@
if-lt v0, v4, :cond_1
- const p1, 0x7f1208f5
+ const p1, 0x7f1208f6
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -983,7 +983,7 @@
:cond_2
if-nez v0, :cond_3
- const p1, 0x7f120901
+ const p1, 0x7f120902
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter$WidgetGroupInviteFriendsListItem.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter$WidgetGroupInviteFriendsListItem.smali
index 216b82d62d..45e972db61 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter$WidgetGroupInviteFriendsListItem.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriendsAdapter$WidgetGroupInviteFriendsListItem.smali
@@ -53,7 +53,7 @@
iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
- const p2, 0x7f0a03db
+ const p2, 0x7f0a03dd
invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -65,7 +65,7 @@
iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
- const p2, 0x7f0a03dc
+ const p2, 0x7f0a03de
invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -77,7 +77,7 @@
iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
- const p2, 0x7f0a03d9
+ const p2, 0x7f0a03db
invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -89,7 +89,7 @@
iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
- const p2, 0x7f0a03d2
+ const p2, 0x7f0a03d4
invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -101,7 +101,7 @@
iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
- const p2, 0x7f0a03ca
+ const p2, 0x7f0a03cc
invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -111,7 +111,7 @@
iget-object p1, p0, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
- const p2, 0x7f0a09f8
+ const p2, 0x7f0a09f6
invoke-virtual {p1, p2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$1.smali
index b716becefc..9cc4c5d014 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$1.smali
@@ -139,7 +139,7 @@
nop
:pswitch_data_0
- .packed-switch 0x7f0a05b5
+ .packed-switch 0x7f0a05b3
:pswitch_1
:pswitch_0
.end packed-switch
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$2.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$2.smali
index 1bf6be3aa8..a9f14701d9 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$2.smali
@@ -49,7 +49,7 @@
.method public final call(Landroid/view/Menu;)V
.locals 1
- const v0, 0x7f0a05b5
+ const v0, 0x7f0a05b3
invoke-interface {p1, v0}, Landroid/view/Menu;->findItem(I)Landroid/view/MenuItem;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$6.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$6.smali
index 200fc99d58..9a18dfaf80 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$6.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$6.smali
@@ -55,7 +55,7 @@
move-result-object p1
- const v0, 0x7f12112f
+ const v0, 0x7f12113d
const/4 v1, 0x0
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$onViewBound$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$onViewBound$1.smali
index ddff79aafe..9ff9df0284 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$onViewBound$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$onViewBound$1.smali
@@ -67,7 +67,7 @@
move-result-object p2
- const p3, 0x7f0a01b5
+ const p3, 0x7f0a01b7
invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$saveChannel$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$saveChannel$1.smali
index 4f05faedcb..684e032a78 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$saveChannel$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$saveChannel$1.smali
@@ -77,12 +77,12 @@
if-eqz p1, :cond_0
- const p1, 0x7f1203ce
+ const p1, 0x7f1203cf
goto :goto_0
:cond_0
- const p1, 0x7f12040b
+ const p1, 0x7f12040c
:goto_0
const/4 v1, 0x0
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali
index 28a6c7868c..c24b47de19 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali
@@ -490,7 +490,7 @@
invoke-direct {p0}, Lcom/discord/app/AppFragment;->()V
- const v0, 0x7f0a01ae
+ const v0, 0x7f0a01b0
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -498,7 +498,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsPinnedMessagesContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01ad
+ const v0, 0x7f0a01af
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -506,7 +506,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsPinnedMessages$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01af
+ const v0, 0x7f0a01b1
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -514,7 +514,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsPinnedMessagesDisabledOverlay$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01b3
+ const v0, 0x7f0a01b5
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -522,7 +522,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->userManagementContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01a4
+ const v0, 0x7f0a01a6
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -530,7 +530,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsPermissions$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01b1
+ const v0, 0x7f0a01b3
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -538,7 +538,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsPrivacySafetyContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a019e
+ const v0, 0x7f0a01a0
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -546,7 +546,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a019c
+ const v0, 0x7f0a019e
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -554,7 +554,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsName$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a019d
+ const v0, 0x7f0a019f
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -562,7 +562,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsTopic$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01b0
+ const v0, 0x7f0a01b2
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -570,7 +570,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsSave$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01a3
+ const v0, 0x7f0a01a5
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -578,7 +578,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsNsfw$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01b2
+ const v0, 0x7f0a01b4
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -586,7 +586,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsSlowModeContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01b4
+ const v0, 0x7f0a01b6
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -594,7 +594,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->channelSettingsSlowModeLabel$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01b5
+ const v0, 0x7f0a01b7
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -620,9 +620,9 @@
:array_0
.array-data 4
- 0x7f0a019c
- 0x7f0a019d
- 0x7f0a01b5
+ 0x7f0a019e
+ 0x7f0a019f
+ 0x7f0a01b7
.end array-data
.end method
@@ -763,7 +763,7 @@
invoke-static {v1, v2}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v2, 0x7f0a0195
+ const v2, 0x7f0a0197
invoke-virtual {v0, v2}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -771,7 +771,7 @@
check-cast v2, Landroid/widget/TextView;
- const v3, 0x7f0a0196
+ const v3, 0x7f0a0198
invoke-virtual {v0, v3}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -781,12 +781,12 @@
if-eqz p1, :cond_0
- const p1, 0x7f120577
+ const p1, 0x7f120578
goto :goto_0
:cond_0
- const p1, 0x7f12057d
+ const p1, 0x7f12057e
:goto_0
invoke-virtual {v2, p1}, Landroid/widget/TextView;->setText(I)V
@@ -837,12 +837,12 @@
if-eqz v3, :cond_2
- const v3, 0x7f12040a
+ const v3, 0x7f12040b
goto :goto_0
:cond_2
- const v3, 0x7f1203cd
+ const v3, 0x7f1203ce
:goto_0
invoke-virtual {p0, v3}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -939,12 +939,12 @@
if-eqz v3, :cond_4
- const v3, 0x7f120710
+ const v3, 0x7f120711
goto :goto_2
:cond_4
- const v3, 0x7f1203cc
+ const v3, 0x7f1203cd
:goto_2
invoke-static {v2, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setHint(Lcom/google/android/material/textfield/TextInputLayout;I)V
@@ -1316,7 +1316,7 @@
iget-object v2, p0, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->state:Lcom/discord/utilities/stateful/StatefulViews;
- const v3, 0x7f0a01b5
+ const v3, 0x7f0a01b7
invoke-virtual {p1}, Lcom/discord/widgets/channels/WidgetTextChannelSettings$Model;->getChannel()Lcom/discord/models/domain/ModelChannel;
@@ -1446,7 +1446,7 @@
invoke-static {v1, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v3, 0x7f0a019b
+ const v3, 0x7f0a019d
invoke-virtual {v0, v3}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -1454,7 +1454,7 @@
check-cast v3, Landroid/widget/TextView;
- const v4, 0x7f0a0198
+ const v4, 0x7f0a019a
invoke-virtual {v0, v4}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -1462,7 +1462,7 @@
check-cast v4, Landroid/widget/TextView;
- const v5, 0x7f0a0199
+ const v5, 0x7f0a019b
invoke-virtual {v0, v5}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -1470,7 +1470,7 @@
check-cast v5, Landroid/widget/TextView;
- const v6, 0x7f0a019a
+ const v6, 0x7f0a019c
invoke-virtual {v0, v6}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -1484,12 +1484,12 @@
if-eqz v6, :cond_0
- const v6, 0x7f12056a
+ const v6, 0x7f12056b
goto :goto_0
:cond_0
- const v6, 0x7f120569
+ const v6, 0x7f12056a
:goto_0
invoke-virtual {v3, v6}, Landroid/widget/TextView;->setText(I)V
@@ -1510,7 +1510,7 @@
invoke-static {v4, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v0, 0x7f12056b
+ const v0, 0x7f12056c
const/4 v3, 0x1
@@ -1974,7 +1974,7 @@
move-result-object p1
- const v0, 0x7f120780
+ const v0, 0x7f120781
invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$unreadsText$2.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$unreadsText$2.smali
index 76c70a8802..de1e16b985 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$unreadsText$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$unreadsText$2.smali
@@ -54,7 +54,7 @@
move-result-object v0
- const v1, 0x7f0a01f7
+ const v1, 0x7f0a01f9
invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$unreadsTextBackground$2.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$unreadsTextBackground$2.smali
index 838a1d46cc..fe44af11c3 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$unreadsTextBackground$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$unreadsTextBackground$2.smali
@@ -54,7 +54,7 @@
move-result-object v0
- const v1, 0x7f0a01f8
+ const v1, 0x7f0a01fa
invoke-virtual {v0, v1}, Landroid/view/View;->findViewById(I)Landroid/view/View;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads.smali
index 7e240d1df8..c7f16c85eb 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads.smali
@@ -207,9 +207,9 @@
if-eqz v0, :cond_1
- const v0, 0x7f120f4e
+ const v0, 0x7f120f5c
- const v6, 0x7f120f4e
+ const v6, 0x7f120f5c
goto :goto_1
@@ -221,9 +221,9 @@
if-eqz v0, :cond_2
- const v0, 0x7f120f5a
+ const v0, 0x7f120f68
- const v7, 0x7f120f5a
+ const v7, 0x7f120f68
goto :goto_2
@@ -301,12 +301,12 @@
if-eqz p1, :cond_0
- const p1, 0x7f080123
+ const p1, 0x7f080124
goto :goto_0
:cond_0
- const p1, 0x7f080126
+ const p1, 0x7f080127
:goto_0
return p1
@@ -644,16 +644,16 @@
if-eqz p3, :cond_0
- const p1, 0x7f080227
+ const p1, 0x7f080228
- const v4, 0x7f080227
+ const v4, 0x7f080228
goto :goto_0
:cond_0
- const p1, 0x7f080222
+ const p1, 0x7f080223
- const v4, 0x7f080222
+ const v4, 0x7f080223
:goto_0
const/4 v5, 0x0
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4.smali
index f22121e906..a4b1db7b56 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$4.smali
@@ -114,12 +114,12 @@
if-eqz p2, :cond_0
- const v7, 0x7f120682
+ const v7, 0x7f120683
goto :goto_0
:cond_0
- const v7, 0x7f12044f
+ const v7, 0x7f120450
:goto_0
invoke-virtual {v6, v7}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5$1.smali
index 3e94002948..c903f83147 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5$1.smali
@@ -93,7 +93,7 @@
invoke-static {p1, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v1, 0x7f120d2f
+ const v1, 0x7f120d3a
invoke-static {v0, p1, v1}, Lf/a/b/n;->a(Landroid/content/Context;Ljava/lang/CharSequence;I)V
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali
index c4a9ede904..9473cbbcc2 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali
@@ -375,7 +375,7 @@
invoke-direct {p0}, Lcom/discord/app/AppFragment;->()V
- const v0, 0x7f0a0a8d
+ const v0, 0x7f0a0a90
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -383,7 +383,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->roundedContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0275
+ const v0, 0x7f0a0277
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -399,7 +399,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->appBarLayout$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01db
+ const v0, 0x7f0a01dd
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -407,7 +407,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->channelsHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01d3
+ const v0, 0x7f0a01d5
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -415,7 +415,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->channelsList$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01d8
+ const v0, 0x7f0a01da
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -423,7 +423,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->channelsBanner$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01d9
+ const v0, 0x7f0a01db
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -431,7 +431,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->channeslBannerForeground$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01f3
+ const v0, 0x7f0a01f5
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -439,7 +439,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->channelsSearch$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01f2
+ const v0, 0x7f0a01f4
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -447,7 +447,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->privateChannelsHeaderContainer$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01f4
+ const v0, 0x7f0a01f6
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -455,7 +455,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->privateChannelsStartGroupButton$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01f9
+ const v0, 0x7f0a01fb
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -463,7 +463,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->channelListUnreadsStub$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01ee
+ const v0, 0x7f0a01f0
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -471,7 +471,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->premiumGuildHint$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01ef
+ const v0, 0x7f0a01f1
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -479,7 +479,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList;->premiumGuildHintButton$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0a8e
+ const v0, 0x7f0a0a91
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -832,12 +832,12 @@
if-eqz v3, :cond_2
- const v3, 0x7f08042f
+ const v3, 0x7f080430
goto/16 :goto_0
:cond_2
- const v3, 0x7f080430
+ const v3, 0x7f080431
goto/16 :goto_0
@@ -858,12 +858,12 @@
if-eqz v3, :cond_4
- const v3, 0x7f08037e
+ const v3, 0x7f08037f
goto/16 :goto_0
:cond_4
- const v3, 0x7f08037f
+ const v3, 0x7f080380
goto/16 :goto_0
@@ -906,12 +906,12 @@
if-eqz v3, :cond_6
- const v3, 0x7f080303
+ const v3, 0x7f080304
goto :goto_0
:cond_6
- const v3, 0x7f080304
+ const v3, 0x7f080305
goto :goto_0
@@ -939,12 +939,12 @@
if-eqz v3, :cond_9
- const v3, 0x7f0802f9
+ const v3, 0x7f0802fa
goto :goto_0
:cond_9
- const v3, 0x7f0802fa
+ const v3, 0x7f0802fb
goto :goto_0
@@ -965,12 +965,12 @@
if-eqz v3, :cond_b
- const v3, 0x7f0802fb
+ const v3, 0x7f0802fc
goto :goto_0
:cond_b
- const v3, 0x7f0802fc
+ const v3, 0x7f0802fd
goto :goto_0
@@ -993,12 +993,12 @@
if-eqz v3, :cond_d
- const v3, 0x7f0802fd
+ const v3, 0x7f0802fe
goto :goto_0
:cond_d
- const v3, 0x7f0802fe
+ const v3, 0x7f0802ff
:goto_0
invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getChannelsHeader()Landroid/widget/TextView;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$Companion.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$Companion.smali
index f7d238ce4a..8ede182a05 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory$Companion.smali
@@ -118,7 +118,7 @@
if-eqz v0, :cond_0
- const p1, 0x7f080281
+ const p1, 0x7f080282
goto :goto_0
@@ -129,7 +129,7 @@
if-nez p1, :cond_1
- const p1, 0x7f08027d
+ const p1, 0x7f08027e
goto :goto_0
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory.smali
index 35a5bd38d0..fff2df81bd 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory.smali
@@ -140,7 +140,7 @@
invoke-direct {p0, p1, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;->(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
- const p1, 0x7f0a01c5
+ const p1, 0x7f0a01c7
invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
@@ -148,7 +148,7 @@
iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory;->nameTextView$delegate:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a01c4
+ const p1, 0x7f0a01c6
invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
@@ -156,7 +156,7 @@
iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelCategory;->arrow$delegate:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a01c3
+ const p1, 0x7f0a01c5
invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
@@ -281,7 +281,7 @@
move-result-object v0
- const v2, 0x7f1203ca
+ const v2, 0x7f1203cb
const/4 v3, 0x2
@@ -315,12 +315,12 @@
if-eqz v7, :cond_0
- const v7, 0x7f12044f
+ const v7, 0x7f120450
goto :goto_0
:cond_0
- const v7, 0x7f120682
+ const v7, 0x7f120683
:goto_0
invoke-virtual {v6, v7}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate.smali
index 988e179337..d0cb263c2a 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate.smali
@@ -162,7 +162,7 @@
invoke-direct {p0, p1, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;->(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
- const p1, 0x7f0a01de
+ const p1, 0x7f0a01e0
invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
@@ -170,7 +170,7 @@
iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->itemAvatar$delegate:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a0167
+ const p1, 0x7f0a0169
invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
@@ -178,7 +178,7 @@
iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->itemStatus$delegate:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a01e1
+ const p1, 0x7f0a01e3
invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
@@ -186,7 +186,7 @@
iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->itemName$delegate:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a01e2
+ const p1, 0x7f0a01e4
invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
@@ -194,7 +194,7 @@
iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->itemTag$delegate:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a01df
+ const p1, 0x7f0a01e1
invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
@@ -202,7 +202,7 @@
iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate;->itemDesc$delegate:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a01e0
+ const p1, 0x7f0a01e2
invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
@@ -259,7 +259,7 @@
move-result-object p1
- const v0, 0x7f120906
+ const v0, 0x7f120907
invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -296,7 +296,7 @@
move-result-object p1
- const v0, 0x7f120905
+ const v0, 0x7f120906
invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -331,7 +331,7 @@
move-result-object p1
- const v0, 0x7f120593
+ const v0, 0x7f120594
invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -358,7 +358,7 @@
move-result-object p1
- const v0, 0x7f120592
+ const v0, 0x7f120593
invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -518,7 +518,7 @@
add-int/lit8 p1, p1, 0x1
- const v0, 0x7f120eaf
+ const v0, 0x7f120eba
invoke-virtual {p2, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -856,7 +856,7 @@
move-result-object v2
- const v3, 0x7f12154b
+ const v3, 0x7f121558
invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText.smali
index c1dd86f073..0733db5ab2 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText.smali
@@ -122,7 +122,7 @@
invoke-direct {p0, p1, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;->(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
- const p1, 0x7f0a01c6
+ const p1, 0x7f0a01c8
invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
@@ -130,7 +130,7 @@
iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->itemHash$delegate:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a01c8
+ const p1, 0x7f0a01ca
invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
@@ -138,7 +138,7 @@
iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->itemName$delegate:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a01c7
+ const p1, 0x7f0a01c9
invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
@@ -146,7 +146,7 @@
iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelText;->itemMentions$delegate:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a01c9
+ const p1, 0x7f0a01cb
invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
@@ -181,7 +181,7 @@
if-eqz v0, :cond_0
- const p1, 0x7f080261
+ const p1, 0x7f080262
goto :goto_0
@@ -192,12 +192,12 @@
if-eqz p1, :cond_1
- const p1, 0x7f080260
+ const p1, 0x7f080261
goto :goto_0
:cond_1
- const p1, 0x7f08025f
+ const p1, 0x7f080260
:goto_0
return p1
@@ -234,7 +234,7 @@
move-result-object p2
- const v6, 0x7f120b13
+ const v6, 0x7f120b1d
invoke-virtual {p2, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -311,7 +311,7 @@
move-result-object p2
- const v0, 0x7f120b14
+ const v0, 0x7f120b1e
invoke-virtual {p2, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -348,7 +348,7 @@
move-result-object p2
- const v0, 0x7f120b12
+ const v0, 0x7f120b1c
invoke-virtual {p2, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -391,7 +391,7 @@
move-result-object p2
- const v6, 0x7f120b16
+ const v6, 0x7f120b20
invoke-virtual {p2, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -464,7 +464,7 @@
move-result-object p2
- const v0, 0x7f120b17
+ const v0, 0x7f120b21
invoke-virtual {p2, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -499,7 +499,7 @@
move-result-object p2
- const v0, 0x7f120b15
+ const v0, 0x7f120b1f
invoke-virtual {p2, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -603,7 +603,7 @@
if-eqz v0, :cond_0
- const p1, 0x7f080269
+ const p1, 0x7f08026a
goto :goto_0
@@ -614,12 +614,12 @@
if-eqz p1, :cond_1
- const p1, 0x7f080268
+ const p1, 0x7f080269
goto :goto_0
:cond_1
- const p1, 0x7f080264
+ const p1, 0x7f080265
:goto_0
return p1
@@ -922,7 +922,7 @@
move-result-object p1
- const v0, 0x7f08026b
+ const v0, 0x7f08026c
invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setImageResource(I)V
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice.smali
index 5a1399f111..225283d54e 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice.smali
@@ -118,7 +118,7 @@
invoke-direct {p0, p1, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;->(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
- const p1, 0x7f0a01ca
+ const p1, 0x7f0a01cc
invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
@@ -126,7 +126,7 @@
iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;->itemName$delegate:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a01cc
+ const p1, 0x7f0a01ce
invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
@@ -134,7 +134,7 @@
iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;->userCount$delegate:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a01cb
+ const p1, 0x7f0a01cd
invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
@@ -187,7 +187,7 @@
move-result-object v4
- const v5, 0x7f120b1a
+ const v5, 0x7f120b24
invoke-virtual {v4, v5}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -248,7 +248,7 @@
move-result-object p2
- const v5, 0x7f120b1b
+ const v5, 0x7f120b25
invoke-virtual {p2, v5}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -317,7 +317,7 @@
move-result-object p2
- const v0, 0x7f120b19
+ const v0, 0x7f120b23
invoke-virtual {p2, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -503,19 +503,19 @@
if-nez v7, :cond_0
- const v1, 0x7f080262
+ const v1, 0x7f080263
goto :goto_0
:cond_0
if-eqz v4, :cond_1
- const v1, 0x7f080271
+ const v1, 0x7f080272
goto :goto_0
:cond_1
- const v1, 0x7f08026e
+ const v1, 0x7f08026f
:goto_0
invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice;->getSpeakerIcon()Landroid/widget/ImageView;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader.smali
index 544d2a0614..410d7579ad 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader.smali
@@ -82,7 +82,7 @@
invoke-direct {p0, p1, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;->(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
- const p1, 0x7f0a01dc
+ const p1, 0x7f0a01de
invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
@@ -90,7 +90,7 @@
iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader;->itemHeader$delegate:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a01ed
+ const p1, 0x7f0a01ef
invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
@@ -179,17 +179,17 @@
if-eqz v1, :cond_3
- const v1, 0x7f121081
+ const v1, 0x7f12108f
if-eq p1, v1, :cond_2
- const p2, 0x7f12159f
+ const p2, 0x7f1215ac
const/4 v0, 0x0
if-eq p1, p2, :cond_1
- const p2, 0x7f1217ad
+ const p2, 0x7f1217bf
if-eq p1, p2, :cond_0
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA.smali
index 30178306a4..4405c880e7 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA.smali
@@ -75,7 +75,7 @@
invoke-direct {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
- const p1, 0x7f0a01dd
+ const p1, 0x7f0a01df
invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
@@ -118,7 +118,7 @@
.method private final getLearnMoreFormattedString(Landroid/content/Context;Ljava/lang/String;)Ljava/lang/CharSequence;
.locals 11
- const v0, 0x7f121620
+ const v0, 0x7f12162d
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser.smali
index b7ed311b79..966b8392d9 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser.smali
@@ -162,7 +162,7 @@
invoke-direct {p0, p1, p2}, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$Item;->(ILcom/discord/widgets/channels/list/WidgetChannelsListAdapter;)V
- const p1, 0x7f0a01cd
+ const p1, 0x7f0a01cf
invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
@@ -170,7 +170,7 @@
iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser;->voiceUserAvatar$delegate:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a01d2
+ const p1, 0x7f0a01d4
invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
@@ -178,7 +178,7 @@
iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser;->voiceUserName$delegate:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a01ce
+ const p1, 0x7f0a01d0
invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
@@ -186,7 +186,7 @@
iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser;->voiceCamera$delegate:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a01cf
+ const p1, 0x7f0a01d1
invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
@@ -194,7 +194,7 @@
iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser;->deafenIndicator$delegate:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a01d1
+ const p1, 0x7f0a01d3
invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
@@ -202,7 +202,7 @@
iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemVoiceUser;->muteIndicator$delegate:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a01d0
+ const p1, 0x7f0a01d2
invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model.smali
index 397ad71c6e..5b146e86b6 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model.smali
@@ -331,7 +331,7 @@
if-eqz v0, :cond_0
- const v0, 0x7f12164f
+ const v0, 0x7f12165c
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -340,7 +340,7 @@
goto :goto_0
:cond_0
- const v0, 0x7f120f27
+ const v0, 0x7f120f35
const/4 v1, 0x1
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali
index 652bf70319..369f07aff8 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali
@@ -268,7 +268,7 @@
invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;->()V
- const v0, 0x7f0a01e7
+ const v0, 0x7f0a01e9
invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -276,7 +276,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->icon$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01ec
+ const v0, 0x7f0a01ee
invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -284,7 +284,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->title$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01eb
+ const v0, 0x7f0a01ed
invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -292,7 +292,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->profile$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01ea
+ const v0, 0x7f0a01ec
invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -300,7 +300,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->muteChannel$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01e4
+ const v0, 0x7f0a01e6
invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -308,7 +308,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->channelSettings$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01e3
+ const v0, 0x7f0a01e5
invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -316,7 +316,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->channelNotifSettings$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01e8
+ const v0, 0x7f0a01ea
invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -324,7 +324,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->instantInvite$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01e9
+ const v0, 0x7f0a01eb
invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -332,7 +332,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->markAsRead$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01e6
+ const v0, 0x7f0a01e8
invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -340,7 +340,7 @@
iput-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->developerDivider$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01e5
+ const v0, 0x7f0a01e7
invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -906,7 +906,7 @@
if-eqz p2, :cond_0
- const p1, 0x7f1205dc
+ const p1, 0x7f1205dd
goto :goto_0
@@ -919,7 +919,7 @@
if-nez p2, :cond_1
- const p1, 0x7f12040a
+ const p1, 0x7f12040b
goto :goto_0
@@ -930,12 +930,12 @@
if-eqz p1, :cond_2
- const p1, 0x7f1205db
+ const p1, 0x7f1205dc
goto :goto_0
:cond_2
- const p1, 0x7f121373
+ const p1, 0x7f121381
:goto_0
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$WidgetCollapsedUserListItem.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$WidgetCollapsedUserListItem.smali
index 18e9ce889b..2fdb54d3ee 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$WidgetCollapsedUserListItem.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$WidgetCollapsedUserListItem.smali
@@ -95,7 +95,7 @@
invoke-direct {p0, p1, p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;)V
- const p1, 0x7f0a0a95
+ const p1, 0x7f0a0a98
invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
@@ -103,7 +103,7 @@
iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$WidgetCollapsedUserListItem;->icon$delegate:Lkotlin/properties/ReadOnlyProperty;
- const p1, 0x7f0a0a94
+ const p1, 0x7f0a0a97
invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
@@ -208,7 +208,7 @@
move-result-object p1
- const p2, 0x7f080157
+ const p2, 0x7f080158
const/4 v0, 0x4
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt.smali
index 225a9effc2..fdd6765b13 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/GuildMemberListItemGeneratorKt.smali
@@ -190,7 +190,7 @@
move-result-object v4
- const v5, 0x7f120d34
+ const v5, 0x7f120d3f
invoke-direct {p1, v4, v5}, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$AddMember;->(Ljava/lang/String;I)V
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt.smali
index 3288d0cffd..efc562a178 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMemberListItemGeneratorKt.smali
@@ -53,7 +53,7 @@
if-eqz v0, :cond_1
- const v0, 0x7f12154f
+ const v0, 0x7f12155c
goto :goto_1
@@ -290,12 +290,12 @@
if-eqz v2, :cond_4
- const v2, 0x7f1208ef
+ const v2, 0x7f1208f0
goto :goto_2
:cond_4
- const v2, 0x7f1204f7
+ const v2, 0x7f1204f8
:goto_2
new-instance v4, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListAdapter$Item$AddMember;
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderAdd.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderAdd.smali
index 280c3e8daf..46c62ae269 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderAdd.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderAdd.smali
@@ -55,7 +55,7 @@
iput-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderAdd;->view:Landroid/view/View;
- const p1, 0x7f0a0169
+ const p1, 0x7f0a016b
invoke-static {p0, p1}, Lf/n/a/k/a;->k(Landroidx/recyclerview/widget/RecyclerView$ViewHolder;I)Lkotlin/properties/ReadOnlyProperty;
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader.smali
index b1893b3585..3233a11931 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader.smali
@@ -19,7 +19,7 @@
iput-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader;->view:Landroid/view/View;
- const v0, 0x7f0a016f
+ const v0, 0x7f0a0171
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -66,7 +66,7 @@
if-ne v0, v1, :cond_0
- const v0, 0x7f120eaf
+ const v0, 0x7f120eba
goto :goto_0
@@ -78,12 +78,12 @@
throw p1
:cond_1
- const v0, 0x7f1214cc
+ const v0, 0x7f1214da
goto :goto_0
:cond_2
- const v0, 0x7f1214cd
+ const v0, 0x7f1214db
:goto_0
iget-object v1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderHeader;->textView:Landroid/widget/TextView;
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderLoading.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderLoading.smali
index 6a6ff0dabe..ccc816431d 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderLoading.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderLoading.smali
@@ -230,7 +230,7 @@
invoke-direct {p0, p1}, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->(Landroid/view/View;)V
- const v0, 0x7f0a0a29
+ const v0, 0x7f0a0a27
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember$bind$3.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember$bind$3.smali
index fbb5eec3e4..7226572274 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember$bind$3.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember$bind$3.smali
@@ -71,7 +71,7 @@
move-result-object p1
- const v2, 0x7f1211fb
+ const v2, 0x7f121209
const/4 v3, 0x1
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember.smali
index 68d25c2323..db0aa31152 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember.smali
@@ -31,7 +31,7 @@
iput-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember;->view:Landroid/view/View;
- const v0, 0x7f0a016a
+ const v0, 0x7f0a016c
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -43,7 +43,7 @@
iget-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember;->view:Landroid/view/View;
- const v0, 0x7f0a0170
+ const v0, 0x7f0a0172
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -55,7 +55,7 @@
iget-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember;->view:Landroid/view/View;
- const v0, 0x7f0a016c
+ const v0, 0x7f0a016e
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -67,7 +67,7 @@
iget-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember;->view:Landroid/view/View;
- const v0, 0x7f0a0171
+ const v0, 0x7f0a0173
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -83,7 +83,7 @@
iget-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember;->view:Landroid/view/View;
- const v0, 0x7f0a0172
+ const v0, 0x7f0a0174
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -95,7 +95,7 @@
iget-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember;->view:Landroid/view/View;
- const v0, 0x7f0a016d
+ const v0, 0x7f0a016f
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -105,7 +105,7 @@
iget-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember;->view:Landroid/view/View;
- const v0, 0x7f0a016b
+ const v0, 0x7f0a016d
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderRoleHeader.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderRoleHeader.smali
index 76d3b89876..3d378bed0f 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderRoleHeader.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderRoleHeader.smali
@@ -19,7 +19,7 @@
iput-object p1, p0, Lcom/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderRoleHeader;->view:Landroid/view/View;
- const v0, 0x7f0a016f
+ const v0, 0x7f0a0171
invoke-virtual {p1, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
diff --git a/com.discord/smali/com/discord/widgets/chat/MessageManager$defaultMessageResultHandler$1.smali b/com.discord/smali/com/discord/widgets/chat/MessageManager$defaultMessageResultHandler$1.smali
index d5b3a199d0..8506d92267 100644
--- a/com.discord/smali/com/discord/widgets/chat/MessageManager$defaultMessageResultHandler$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/MessageManager$defaultMessageResultHandler$1.smali
@@ -108,7 +108,7 @@
move-result-object p1
- const v1, 0x7f120411
+ const v1, 0x7f120412
const/4 v2, 0x0
diff --git a/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$3.smali b/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$3.smali
index 68e5155f4f..57d459f798 100644
--- a/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$3.smali
@@ -55,7 +55,7 @@
iget-object v1, p0, Lcom/discord/widgets/chat/WidgetUrlActions$onViewCreated$3;->this$0:Lcom/discord/widgets/chat/WidgetUrlActions;
- const v2, 0x7f120774
+ const v2, 0x7f120775
invoke-virtual {v1, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions.smali b/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions.smali
index 5d19764e54..82ce0f3a18 100644
--- a/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions.smali
+++ b/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions.smali
@@ -137,7 +137,7 @@
invoke-direct {p0}, Lcom/discord/app/AppBottomSheet;->()V
- const v0, 0x7f0a02e8
+ const v0, 0x7f0a02ea
invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -145,7 +145,7 @@
iput-object v0, p0, Lcom/discord/widgets/chat/WidgetUrlActions;->urlTv$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a02e5
+ const v0, 0x7f0a02e7
invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -153,7 +153,7 @@
iput-object v0, p0, Lcom/discord/widgets/chat/WidgetUrlActions;->copyBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a02e6
+ const v0, 0x7f0a02e8
invoke-static {p0, v0}, Lf/n/a/k/a;->i(Landroidx/fragment/app/DialogFragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -161,7 +161,7 @@
iput-object v0, p0, Lcom/discord/widgets/chat/WidgetUrlActions;->openBtn$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a02e7
+ const v0, 0x7f0a02e9
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/widgets/chat/input/AppFlexInputViewModel.smali b/com.discord/smali/com/discord/widgets/chat/input/AppFlexInputViewModel.smali
index 03949c2e8e..496185a92d 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/AppFlexInputViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/AppFlexInputViewModel.smali
@@ -543,7 +543,7 @@
new-instance v1, Lf/b/a/f/a$d;
- const v2, 0x7f1203b7
+ const v2, 0x7f1203b8
invoke-direct {v1, v2}, Lf/b/a/f/a$d;->(I)V
@@ -825,7 +825,7 @@
new-instance v1, Lf/b/a/f/a$d;
- const v2, 0x7f1203b7
+ const v2, 0x7f1203b8
invoke-direct {v1, v2}, Lf/b/a/f/a$d;->(I)V
diff --git a/com.discord/smali/com/discord/widgets/chat/input/GifPickerNfxManager$observeCanShowGifPickerNfx$1.smali b/com.discord/smali/com/discord/widgets/chat/input/GifPickerNfxManager$observeCanShowGifPickerNfx$1.smali
new file mode 100644
index 0000000000..d7c3e736b6
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/chat/input/GifPickerNfxManager$observeCanShowGifPickerNfx$1.smali
@@ -0,0 +1,100 @@
+.class public final Lcom/discord/widgets/chat/input/GifPickerNfxManager$observeCanShowGifPickerNfx$1;
+.super Ljava/lang/Object;
+.source "GifPickerNfxManager.kt"
+
+# interfaces
+.implements Lrx/functions/Func2;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/widgets/chat/input/GifPickerNfxManager;->observeCanShowGifPickerNfx()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/Func2<",
+ "TT1;TT2;TR;>;"
+ }
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/widgets/chat/input/GifPickerNfxManager;
+
+
+# direct methods
+.method public constructor (Lcom/discord/widgets/chat/input/GifPickerNfxManager;)V
+ .locals 0
+
+ iput-object p1, p0, Lcom/discord/widgets/chat/input/GifPickerNfxManager$observeCanShowGifPickerNfx$1;->this$0:Lcom/discord/widgets/chat/input/GifPickerNfxManager;
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ .locals 0
+
+ check-cast p1, Ljava/lang/Boolean;
+
+ check-cast p2, Lcom/discord/models/domain/ModelUser$Me;
+
+ invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/chat/input/GifPickerNfxManager$observeCanShowGifPickerNfx$1;->call(Ljava/lang/Boolean;Lcom/discord/models/domain/ModelUser$Me;)Z
+
+ move-result p1
+
+ invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+ move-result-object p1
+
+ return-object p1
+.end method
+
+.method public final call(Ljava/lang/Boolean;Lcom/discord/models/domain/ModelUser$Me;)Z
+ .locals 1
+
+ const-string v0, "isHomeInitialized"
+
+ invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
+
+ move-result p1
+
+ if-eqz p1, :cond_0
+
+ iget-object p1, p0, Lcom/discord/widgets/chat/input/GifPickerNfxManager$observeCanShowGifPickerNfx$1;->this$0:Lcom/discord/widgets/chat/input/GifPickerNfxManager;
+
+ invoke-static {p1, p2}, Lcom/discord/widgets/chat/input/GifPickerNfxManager;->access$canShowGifPickerNfx(Lcom/discord/widgets/chat/input/GifPickerNfxManager;Lcom/discord/models/domain/ModelUser;)Z
+
+ move-result p1
+
+ if-eqz p1, :cond_0
+
+ const/4 p1, 0x1
+
+ goto :goto_0
+
+ :cond_0
+ const/4 p1, 0x0
+
+ :goto_0
+ return p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/GifPickerNfxManager.smali b/com.discord/smali/com/discord/widgets/chat/input/GifPickerNfxManager.smali
new file mode 100644
index 0000000000..3ef6ce5d94
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/chat/input/GifPickerNfxManager.smali
@@ -0,0 +1,374 @@
+.class public final Lcom/discord/widgets/chat/input/GifPickerNfxManager;
+.super Ljava/lang/Object;
+.source "GifPickerNfxManager.kt"
+
+
+# instance fields
+.field public final clock:Lcom/discord/utilities/time/Clock;
+
+.field public final tooltipManager:Lcom/discord/tooltips/TooltipManager;
+
+.field public final userStore:Lcom/discord/stores/StoreUser;
+
+
+# direct methods
+.method public constructor ()V
+ .locals 6
+
+ const/4 v1, 0x0
+
+ const/4 v2, 0x0
+
+ const/4 v3, 0x0
+
+ const/4 v4, 0x7
+
+ const/4 v5, 0x0
+
+ move-object v0, p0
+
+ invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/chat/input/GifPickerNfxManager;->(Lcom/discord/stores/StoreUser;Lcom/discord/utilities/time/Clock;Lcom/discord/tooltips/TooltipManager;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+ return-void
+.end method
+
+.method public constructor (Lcom/discord/stores/StoreUser;)V
+ .locals 6
+
+ const/4 v2, 0x0
+
+ const/4 v3, 0x0
+
+ const/4 v4, 0x6
+
+ const/4 v5, 0x0
+
+ move-object v0, p0
+
+ move-object v1, p1
+
+ invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/chat/input/GifPickerNfxManager;->(Lcom/discord/stores/StoreUser;Lcom/discord/utilities/time/Clock;Lcom/discord/tooltips/TooltipManager;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+ return-void
+.end method
+
+.method public constructor (Lcom/discord/stores/StoreUser;Lcom/discord/utilities/time/Clock;)V
+ .locals 6
+
+ const/4 v3, 0x0
+
+ const/4 v4, 0x4
+
+ const/4 v5, 0x0
+
+ move-object v0, p0
+
+ move-object v1, p1
+
+ move-object v2, p2
+
+ invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/chat/input/GifPickerNfxManager;->(Lcom/discord/stores/StoreUser;Lcom/discord/utilities/time/Clock;Lcom/discord/tooltips/TooltipManager;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+ return-void
+.end method
+
+.method public constructor (Lcom/discord/stores/StoreUser;Lcom/discord/utilities/time/Clock;Lcom/discord/tooltips/TooltipManager;)V
+ .locals 1
+
+ const/4 v0, 0x0
+
+ if-eqz p1, :cond_2
+
+ if-eqz p2, :cond_1
+
+ if-eqz p3, :cond_0
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ iput-object p1, p0, Lcom/discord/widgets/chat/input/GifPickerNfxManager;->userStore:Lcom/discord/stores/StoreUser;
+
+ iput-object p2, p0, Lcom/discord/widgets/chat/input/GifPickerNfxManager;->clock:Lcom/discord/utilities/time/Clock;
+
+ iput-object p3, p0, Lcom/discord/widgets/chat/input/GifPickerNfxManager;->tooltipManager:Lcom/discord/tooltips/TooltipManager;
+
+ return-void
+
+ :cond_0
+ const-string p1, "tooltipManager"
+
+ invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+
+ throw v0
+
+ :cond_1
+ const-string p1, "clock"
+
+ invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+
+ throw v0
+
+ :cond_2
+ const-string p1, "userStore"
+
+ invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+
+ throw v0
+.end method
+
+.method public constructor (Lcom/discord/stores/StoreUser;Lcom/discord/utilities/time/Clock;Lcom/discord/tooltips/TooltipManager;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ .locals 6
+
+ and-int/lit8 p5, p4, 0x1
+
+ if-eqz p5, :cond_0
+
+ sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+
+ invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getUsers()Lcom/discord/stores/StoreUser;
+
+ move-result-object p1
+
+ :cond_0
+ and-int/lit8 p5, p4, 0x2
+
+ if-eqz p5, :cond_1
+
+ invoke-static {}, Lcom/discord/utilities/time/ClockFactory;->get()Lcom/discord/utilities/time/Clock;
+
+ move-result-object p2
+
+ :cond_1
+ and-int/lit8 p4, p4, 0x4
+
+ if-eqz p4, :cond_6
+
+ sget-object p3, Lcom/discord/app/AppLog;->d:Lcom/discord/app/AppLog;
+
+ const/4 p4, 0x0
+
+ if-eqz p3, :cond_5
+
+ sget-object p5, Lf/a/c/a$b;->a:Ljava/lang/ref/WeakReference;
+
+ if-eqz p5, :cond_2
+
+ invoke-virtual {p5}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
+
+ move-result-object p5
+
+ check-cast p5, Lf/a/c/a;
+
+ goto :goto_0
+
+ :cond_2
+ move-object p5, p4
+
+ :goto_0
+ if-nez p5, :cond_3
+
+ new-instance p5, Lf/a/c/a;
+
+ invoke-direct {p5, p3}, Lf/a/c/a;->(Lcom/discord/utilities/logging/Logger;)V
+
+ new-instance p3, Ljava/lang/ref/WeakReference;
+
+ invoke-direct {p3, p5}, Ljava/lang/ref/WeakReference;->(Ljava/lang/Object;)V
+
+ sput-object p3, Lf/a/c/a$b;->a:Ljava/lang/ref/WeakReference;
+
+ :cond_3
+ move-object v4, p5
+
+ sget-object p3, Lcom/discord/tooltips/TooltipManager$a;->d:Lcom/discord/tooltips/TooltipManager$a;
+
+ sget-object p3, Lcom/discord/tooltips/TooltipManager$a;->a:Ljava/lang/ref/WeakReference;
+
+ if-eqz p3, :cond_4
+
+ invoke-virtual {p3}, Ljava/lang/ref/WeakReference;->get()Ljava/lang/Object;
+
+ move-result-object p3
+
+ check-cast p3, Lcom/discord/tooltips/TooltipManager;
+
+ goto :goto_1
+
+ :cond_4
+ move-object p3, p4
+
+ :goto_1
+ if-nez p3, :cond_6
+
+ new-instance p3, Lcom/discord/tooltips/TooltipManager;
+
+ sget-object p4, Lcom/discord/tooltips/TooltipManager$a;->b:Lkotlin/Lazy;
+
+ invoke-interface {p4}, Lkotlin/Lazy;->getValue()Ljava/lang/Object;
+
+ move-result-object p4
+
+ move-object v1, p4
+
+ check-cast v1, Lf/a/l/a;
+
+ sget-object p4, Lcom/discord/tooltips/TooltipManager$a;->c:Lkotlin/Lazy;
+
+ invoke-interface {p4}, Lkotlin/Lazy;->getValue()Ljava/lang/Object;
+
+ move-result-object p4
+
+ move-object v2, p4
+
+ check-cast v2, Ljava/util/Set;
+
+ const/4 v3, 0x0
+
+ const/4 v5, 0x4
+
+ move-object v0, p3
+
+ invoke-direct/range {v0 .. v5}, Lcom/discord/tooltips/TooltipManager;->(Lf/a/l/a;Ljava/util/Set;ILf/a/c/a;I)V
+
+ new-instance p4, Ljava/lang/ref/WeakReference;
+
+ invoke-direct {p4, p3}, Ljava/lang/ref/WeakReference;->(Ljava/lang/Object;)V
+
+ sput-object p4, Lcom/discord/tooltips/TooltipManager$a;->a:Ljava/lang/ref/WeakReference;
+
+ goto :goto_2
+
+ :cond_5
+ const-string p1, "logger"
+
+ invoke-static {p1}, Lj0/n/c/h;->c(Ljava/lang/String;)V
+
+ throw p4
+
+ :cond_6
+ :goto_2
+ invoke-direct {p0, p1, p2, p3}, Lcom/discord/widgets/chat/input/GifPickerNfxManager;->(Lcom/discord/stores/StoreUser;Lcom/discord/utilities/time/Clock;Lcom/discord/tooltips/TooltipManager;)V
+
+ return-void
+.end method
+
+.method public static final synthetic access$canShowGifPickerNfx(Lcom/discord/widgets/chat/input/GifPickerNfxManager;Lcom/discord/models/domain/ModelUser;)Z
+ .locals 0
+
+ invoke-direct {p0, p1}, Lcom/discord/widgets/chat/input/GifPickerNfxManager;->canShowGifPickerNfx(Lcom/discord/models/domain/ModelUser;)Z
+
+ move-result p0
+
+ return p0
+.end method
+
+.method private final canShowGifPickerNfx(Lcom/discord/models/domain/ModelUser;)Z
+ .locals 7
+
+ const/4 v0, 0x0
+
+ if-nez p1, :cond_0
+
+ return v0
+
+ :cond_0
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getRegistrationTimeMs()J
+
+ move-result-wide v1
+
+ const-wide v3, 0x173b31eb180L
+
+ const/4 p1, 0x1
+
+ cmp-long v5, v1, v3
+
+ if-gez v5, :cond_1
+
+ const/4 v1, 0x1
+
+ goto :goto_0
+
+ :cond_1
+ const/4 v1, 0x0
+
+ :goto_0
+ iget-object v2, p0, Lcom/discord/widgets/chat/input/GifPickerNfxManager;->clock:Lcom/discord/utilities/time/Clock;
+
+ invoke-interface {v2}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J
+
+ move-result-wide v2
+
+ const-wide v4, 0x175829b0980L
+
+ cmp-long v6, v2, v4
+
+ if-ltz v6, :cond_2
+
+ const/4 v2, 0x1
+
+ goto :goto_1
+
+ :cond_2
+ const/4 v2, 0x0
+
+ :goto_1
+ if-nez v2, :cond_3
+
+ if-eqz v1, :cond_3
+
+ iget-object v1, p0, Lcom/discord/widgets/chat/input/GifPickerNfxManager;->tooltipManager:Lcom/discord/tooltips/TooltipManager;
+
+ sget-object v2, Lcom/discord/widgets/chat/input/expression/GifPickerTooltip;->INSTANCE:Lcom/discord/widgets/chat/input/expression/GifPickerTooltip;
+
+ invoke-virtual {v1, v2, p1}, Lcom/discord/tooltips/TooltipManager;->b(Lcom/discord/tooltips/TooltipManager$Tooltip;Z)Z
+
+ move-result v1
+
+ if-eqz v1, :cond_3
+
+ const/4 v0, 0x1
+
+ :cond_3
+ return v0
+.end method
+
+
+# virtual methods
+.method public final observeCanShowGifPickerNfx()Lrx/Observable;
+ .locals 3
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "()",
+ "Lrx/Observable<",
+ "Ljava/lang/Boolean;",
+ ">;"
+ }
+ .end annotation
+
+ sget-object v0, Lcom/discord/widgets/home/WidgetHomeModel;->Companion:Lcom/discord/widgets/home/WidgetHomeModel$Companion;
+
+ invoke-virtual {v0}, Lcom/discord/widgets/home/WidgetHomeModel$Companion;->getInitialized()Lrx/Observable;
+
+ move-result-object v0
+
+ iget-object v1, p0, Lcom/discord/widgets/chat/input/GifPickerNfxManager;->userStore:Lcom/discord/stores/StoreUser;
+
+ const/4 v2, 0x1
+
+ invoke-virtual {v1, v2}, Lcom/discord/stores/StoreUser;->observeMe(Z)Lrx/Observable;
+
+ move-result-object v1
+
+ new-instance v2, Lcom/discord/widgets/chat/input/GifPickerNfxManager$observeCanShowGifPickerNfx$1;
+
+ invoke-direct {v2, p0}, Lcom/discord/widgets/chat/input/GifPickerNfxManager$observeCanShowGifPickerNfx$1;->(Lcom/discord/widgets/chat/input/GifPickerNfxManager;)V
+
+ invoke-static {v0, v1, v2}, Lrx/Observable;->j(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
+
+ move-result-object v0
+
+ const-string v1, "Observable.combineLatest\u2026canShowGifPickerNfx(me) }"
+
+ invoke-static {v0, v1}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/widgets/chat/input/expression/ExpressionTrayViewModelKt.smali b/com.discord/smali/com/discord/widgets/chat/input/GifPickerNfxManagerKt.smali
similarity index 61%
rename from com.discord/smali/com/discord/widgets/chat/input/expression/ExpressionTrayViewModelKt.smali
rename to com.discord/smali/com/discord/widgets/chat/input/GifPickerNfxManagerKt.smali
index b6dcce579f..b12a0b85b5 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/expression/ExpressionTrayViewModelKt.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/GifPickerNfxManagerKt.smali
@@ -1,6 +1,6 @@
-.class public final Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModelKt;
+.class public final Lcom/discord/widgets/chat/input/GifPickerNfxManagerKt;
.super Ljava/lang/Object;
-.source "ExpressionTrayViewModel.kt"
+.source "GifPickerNfxManager.kt"
# static fields
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput.smali
index fc1719aead..bb948250cd 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput.smali
@@ -37,8 +37,6 @@
.field public final container$delegate:Lkotlin/properties/ReadOnlyProperty;
-.field public expressionTrayViewModel:Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel;
-
.field public flexInputViewModel:Lcom/discord/widgets/chat/input/AppFlexInputViewModel;
.field public final inlineVoiceVisibilityObserver:Lcom/discord/utilities/views/ViewVisibilityObserver;
@@ -286,7 +284,7 @@
invoke-direct {p0}, Lcom/discord/app/AppFragment;->()V
- const v0, 0x7f0a01fd
+ const v0, 0x7f0a01ff
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -294,7 +292,7 @@
iput-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->container$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0212
+ const v0, 0x7f0a0214
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -302,7 +300,7 @@
iput-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->chatInputWrap$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0211
+ const v0, 0x7f0a0213
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -310,7 +308,7 @@
iput-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->chatInputWidget$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a020e
+ const v0, 0x7f0a0210
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -318,7 +316,7 @@
iput-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->chatInputMentionsRecycler$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a01fe
+ const v0, 0x7f0a0200
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -326,7 +324,7 @@
iput-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->chatInputEdit$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0200
+ const v0, 0x7f0a0202
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -334,7 +332,7 @@
iput-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->chatInputEditCancel$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0203
+ const v0, 0x7f0a0205
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -342,7 +340,7 @@
iput-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->chatGuard$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0207
+ const v0, 0x7f0a0209
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -350,7 +348,7 @@
iput-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->chatGuardText$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0206
+ const v0, 0x7f0a0208
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -358,7 +356,7 @@
iput-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->chatGuardSubtext$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0204
+ const v0, 0x7f0a0206
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -366,7 +364,7 @@
iput-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->chatGuardAction$delegate:Lkotlin/properties/ReadOnlyProperty;
- const v0, 0x7f0a0205
+ const v0, 0x7f0a0207
invoke-static {p0, v0}, Lf/n/a/k/a;->j(Landroidx/fragment/app/Fragment;I)Lkotlin/properties/ReadOnlyProperty;
@@ -549,36 +547,6 @@
return-void
.end method
-.method private final configureExpressionButtonSparkle()V
- .locals 1
-
- iget-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->expressionTrayViewModel:Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel;
-
- if-eqz v0, :cond_1
-
- invoke-virtual {v0}, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel;->canShowGifPickerTooltip()Z
-
- move-result v0
-
- if-eqz v0, :cond_0
-
- sget-object v0, Lcom/discord/widgets/chat/input/ExpressionPickerSparkleGifTooltip;->INSTANCE:Lcom/discord/widgets/chat/input/ExpressionPickerSparkleGifTooltip;
-
- invoke-direct {p0, v0}, Lcom/discord/widgets/chat/input/WidgetChatInput;->showExpressionButtonSparkle(Lcom/discord/tooltips/TooltipManager$Tooltip;)V
-
- :cond_0
- return-void
-
- :cond_1
- const-string v0, "expressionTrayViewModel"
-
- invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
- const/4 v0, 0x0
-
- throw v0
-.end method
-
.method private final configureUI(Lcom/discord/widgets/chat/input/WidgetChatInputModel;)V
.locals 11
@@ -721,7 +689,7 @@
move-result-object v1
- const v4, 0x7f12154c
+ const v4, 0x7f121559
invoke-virtual {v1, v4}, Landroid/widget/TextView;->setText(I)V
@@ -729,7 +697,7 @@
move-result-object v1
- const v4, 0x7f12154d
+ const v4, 0x7f12155a
invoke-virtual {p0, v4}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -754,9 +722,9 @@
:cond_c
iget-boolean v1, p1, Lcom/discord/widgets/chat/input/WidgetChatInputModel;->isLurking:Z
- const v4, 0x7f12083f
+ const v4, 0x7f120840
- const v5, 0x7f1206bb
+ const v5, 0x7f1206bc
if-eqz v1, :cond_e
@@ -766,7 +734,7 @@
iget-boolean v6, p1, Lcom/discord/widgets/chat/input/WidgetChatInputModel;->shouldShowFollow:Z
- const v7, 0x7f120e59
+ const v7, 0x7f120e64
if-eqz v6, :cond_d
@@ -823,7 +791,7 @@
move-result-object v4
- const v5, 0x7f120e5a
+ const v5, 0x7f120e65
invoke-virtual {v4, v5}, Landroid/widget/TextView;->setText(I)V
@@ -942,11 +910,11 @@
:goto_5
iget-object v4, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->chatInput:Lcom/discord/widgets/chat/input/WidgetChatInputEditText;
- if-eqz v4, :cond_12
+ if-eqz v4, :cond_13
iget-object v5, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->chatAttachments:Lcom/discord/widgets/chat/input/WidgetChatInputAttachments;
- if-eqz v5, :cond_11
+ if-eqz v5, :cond_12
invoke-direct {p0}, Lcom/discord/widgets/chat/input/WidgetChatInput;->getChatInputEdit()Landroid/view/View;
@@ -958,7 +926,7 @@
iget-object v10, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->flexInputViewModel:Lcom/discord/widgets/chat/input/AppFlexInputViewModel;
- if-eqz v10, :cond_10
+ if-eqz v10, :cond_11
move-object v8, p1
@@ -966,21 +934,30 @@
invoke-static/range {v4 .. v10}, Lcom/discord/widgets/chat/input/WidgetChatInputSend;->configureSendListeners(Lcom/discord/widgets/chat/input/WidgetChatInputEditText;Lcom/discord/widgets/chat/input/WidgetChatInputAttachments;Landroid/view/View;Landroid/view/View;Lcom/discord/widgets/chat/input/WidgetChatInputModel;Lcom/discord/widgets/chat/input/WidgetChatInputSend$Listener;Lcom/lytefast/flexinput/viewmodel/FlexInputViewModel;)V
- return-void
+ iget-boolean p1, p1, Lcom/discord/widgets/chat/input/WidgetChatInputModel;->canShowGifPickerNfx:Z
+
+ if-eqz p1, :cond_10
+
+ sget-object p1, Lcom/discord/widgets/chat/input/ExpressionPickerSparkleGifTooltip;->INSTANCE:Lcom/discord/widgets/chat/input/ExpressionPickerSparkleGifTooltip;
+
+ invoke-direct {p0, p1}, Lcom/discord/widgets/chat/input/WidgetChatInput;->showExpressionButtonSparkle(Lcom/discord/tooltips/TooltipManager$Tooltip;)V
:cond_10
+ return-void
+
+ :cond_11
invoke-static {v0}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
throw v2
- :cond_11
+ :cond_12
const-string p1, "chatAttachments"
invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
throw v2
- :cond_12
+ :cond_13
const-string p1, "chatInput"
invoke-static {p1}, Lj0/n/c/h;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
@@ -1405,7 +1382,7 @@
move-result-object v0
- const v1, 0x7f0a0211
+ const v1, 0x7f0a0213
invoke-virtual {v0, v1}, Landroidx/fragment/app/FragmentManager;->findFragmentById(I)Landroidx/fragment/app/Fragment;
@@ -1496,32 +1473,6 @@
iput-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->flexInputViewModel:Lcom/discord/widgets/chat/input/AppFlexInputViewModel;
- new-instance p1, Landroidx/lifecycle/ViewModelProvider;
-
- invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->requireActivity()Landroidx/fragment/app/FragmentActivity;
-
- move-result-object v0
-
- new-instance v1, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$Factory;
-
- invoke-direct {v1}, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel$Factory;->()V
-
- invoke-direct {p1, v0, v1}, Landroidx/lifecycle/ViewModelProvider;->(Landroidx/lifecycle/ViewModelStoreOwner;Landroidx/lifecycle/ViewModelProvider$Factory;)V
-
- const-class v0, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel;
-
- invoke-virtual {p1, v0}, Landroidx/lifecycle/ViewModelProvider;->get(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel;
-
- move-result-object p1
-
- const-string v0, "ViewModelProvider(\n \u2026rayViewModel::class.java)"
-
- invoke-static {p1, v0}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- check-cast p1, Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel;
-
- iput-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInput;->expressionTrayViewModel:Lcom/discord/widgets/chat/input/expression/ExpressionTrayViewModel;
-
return-void
.end method
@@ -1613,7 +1564,7 @@
invoke-static {v2, v3}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v3, 0x7f120ed4
+ const v3, 0x7f120edf
invoke-virtual {v0, v3}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -1639,7 +1590,7 @@
aput-object v5, v4, v6
- const v5, 0x7f120ed3
+ const v5, 0x7f120ede
invoke-virtual {v0, v5, v4}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -1649,7 +1600,7 @@
invoke-static {v4, v5}, Lj0/n/c/h;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v5, 0x7f12106e
+ const v5, 0x7f12107c
invoke-virtual {v0, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -1888,8 +1839,6 @@
invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
- invoke-direct {p0}, Lcom/discord/widgets/chat/input/WidgetChatInput;->configureExpressionButtonSparkle()V
-
return-void
:cond_0
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$PermissionsEmptyListAdapter.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$PermissionsEmptyListAdapter.smali
index 8b15144a3d..e089078309 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$PermissionsEmptyListAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$PermissionsEmptyListAdapter.smali
@@ -65,7 +65,7 @@
iget-object p2, p1, Landroidx/recyclerview/widget/RecyclerView$ViewHolder;->itemView:Landroid/view/View;
- const v0, 0x7f0a06b7
+ const v0, 0x7f0a06b5
invoke-virtual {p2, v0}, Landroid/view/View;->findViewById(I)Landroid/view/View;
@@ -73,7 +73,7 @@
check-cast p2, Lcom/discord/app/AppTextView;
- const v0, 0x7f121586
+ const v0, 0x7f121593
const/4 v1, 0x0
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2.smali
index 6c9c7350a8..1227dec2c0 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2.smali
@@ -78,7 +78,7 @@
new-instance v2, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$1$1;
- const v3, 0x7f080324
+ const v3, 0x7f080325
const v4, 0x7f12024e
@@ -90,7 +90,7 @@
new-instance v2, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$1$2;
- const v4, 0x7f0802d0
+ const v4, 0x7f0802d1
const v5, 0x7f12024d
@@ -102,9 +102,9 @@
new-instance v2, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$1$3;
- const v5, 0x7f080210
+ const v5, 0x7f080211
- const v6, 0x7f12038f
+ const v6, 0x7f120390
invoke-direct {v2, v5, v6}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$1$3;->