diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml
index fb2828d8c5..6321c00d83 100644
--- a/com.discord/apktool.yml
+++ b/com.discord/apktool.yml
@@ -1,5 +1,5 @@
!!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-1025.apk
+apkFileName: com.discord-1026.apk
compressionType: false
doNotCompress:
- arsc
@@ -184,5 +184,5 @@ usesFramework:
tag: null
version: 2.4.1-197d46-SNAPSHOT
versionInfo:
- versionCode: '1025'
- versionName: 10.2.5
+ versionCode: '1026'
+ versionName: 10.2.6
diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties
index 70a7503b6f..b9da18c982 100644
--- a/com.discord/assets/crashlytics-build.properties
+++ b/com.discord/assets/crashlytics-build.properties
@@ -3,9 +3,9 @@
#
#Do NOT modify, delete, or commit to source control!
#
-#Tue Jan 21 23:19:12 UTC 2020
-version_name=10.2.5
+#Wed Jan 22 23:55:51 UTC 2020
+version_name=10.2.6
package_name=com.discord
-build_id=d9a46dd8-dd94-41c5-9b62-507115950609
-version_code=1025
+build_id=387645b4-59b4-4509-a31b-198408f89495
+version_code=1026
app_name=com.discord
diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml
index ccbbd5411c..d44b8475cd 100644
Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ
diff --git a/com.discord/res/drawable-hdpi/bg_cloud_pattern_light.png b/com.discord/res/drawable-hdpi/bg_cloud_pattern_light.png
index fb81a483b5..41471fb5d8 100644
Binary files a/com.discord/res/drawable-hdpi/bg_cloud_pattern_light.png and b/com.discord/res/drawable-hdpi/bg_cloud_pattern_light.png differ
diff --git a/com.discord/res/drawable-xhdpi/img_boost_activated.png b/com.discord/res/drawable-xhdpi/img_boost_activated.png
index 257278776d..e784484d2d 100644
Binary files a/com.discord/res/drawable-xhdpi/img_boost_activated.png and b/com.discord/res/drawable-xhdpi/img_boost_activated.png differ
diff --git a/com.discord/res/layout/premium_guild_subscription_activated_dialog.xml b/com.discord/res/layout/premium_guild_subscription_activated_dialog.xml
index f185e84c4b..3b329c8151 100644
--- a/com.discord/res/layout/premium_guild_subscription_activated_dialog.xml
+++ b/com.discord/res/layout/premium_guild_subscription_activated_dialog.xml
@@ -1,7 +1,7 @@
-
+
diff --git a/com.discord/res/layout/view_settings_boosted_guild_listitem.xml b/com.discord/res/layout/view_settings_boosted_guild_listitem.xml
index 9bd93b3510..a82db04324 100644
--- a/com.discord/res/layout/view_settings_boosted_guild_listitem.xml
+++ b/com.discord/res/layout/view_settings_boosted_guild_listitem.xml
@@ -1,5 +1,5 @@
-
diff --git a/com.discord/res/layout/view_settings_premium_guild_no_guilds.xml b/com.discord/res/layout/view_settings_premium_guild_no_guilds.xml
index 9f11ee65ab..171272b276 100644
--- a/com.discord/res/layout/view_settings_premium_guild_no_guilds.xml
+++ b/com.discord/res/layout/view_settings_premium_guild_no_guilds.xml
@@ -3,5 +3,5 @@
xmlns:android="http://schemas.android.com/apk/res/android">
-
+
\ No newline at end of file
diff --git a/com.discord/res/layout/widget_settings_boost.xml b/com.discord/res/layout/widget_settings_boost.xml
index ffcfbf2ae0..ca3c212c93 100644
--- a/com.discord/res/layout/widget_settings_boost.xml
+++ b/com.discord/res/layout/widget_settings_boost.xml
@@ -24,8 +24,9 @@
-
+
+
diff --git a/com.discord/res/values-bg/strings.xml b/com.discord/res/values-bg/strings.xml
index 3eef24ad4e..21ba735475 100644
--- a/com.discord/res/values-bg/strings.xml
+++ b/com.discord/res/values-bg/strings.xml
@@ -2749,10 +2749,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
Вместо това можеш да качиш съобщението като файл.
О, не! Съобщението ти е с над 2000 знака.
преди повече от %1$s
- Искаш ли да се свържеш отново с последния си гласов канал? Шляенето в гласов канал е чудесен начин да сигнализираш на другите, че искаш да си бъбриш с тях.
- Не, благодаря!
- Добре дошли отново!
- Свържи се отново с **%1$s**
последна синхронизация: %1$s
Стартирай %1$s
Научи повече
@@ -3502,7 +3498,6 @@ NSFW каналите нямат филтър за нецензурно съдъ
Изглежда, че си на изчакване. Моля, изчакай **%1$s и %2$s**, преди да опиташ пак
Изглежда, че си на изчакване. Моля, изчакай **%1$s и %2$s**, преди да опиташ пак
Изглежда, че си на изчакване. Моля, изчакай **%1$s**, преди да опиташ пак
- Честито! Удвоихме броя на усилванията, които получаваш с абонамента си за Nitro.
Подкрепи своите топ сървъри с усилване и получи специален бадж!
Усили този сървър
Разбрах
diff --git a/com.discord/res/values-cs/strings.xml b/com.discord/res/values-cs/strings.xml
index a4f09e5de7..ba068f075a 100644
--- a/com.discord/res/values-cs/strings.xml
+++ b/com.discord/res/values-cs/strings.xml
@@ -2721,10 +2721,6 @@ zatímco budeš mluvit."
Můžeš místo toho nahrát zprávu jako soubor.
Ale ne! Tvá zpráva má přes 2000 znaků.
před více než %1$s
- Chceš se znovu připojit ke svému poslednímu hlasovému kanálu? Když se budeš potloukat po hlasovém kanálu, dáš tak ostatním jasně najevo, že si chceš povyrazit.
- Ne, díky!
- Vítej zpět!
- Znovu se připojit k **%1$s**
poslední synchronizace: %1$s
Spustit %1$s
Zjistit víc
@@ -3470,7 +3466,6 @@ Změny tvého předplatného jsou popsány níže:"
Zdá se, že tvůj vylepšovač ještě chladne. Počkej **%1$s a %2$s** a pak to zkus znovu
Zdá se, že tvůj vylepšovač ještě chladne. Počkej **%1$s a %2$s** a pak to zkus znovu
Zdá se, že tvůj vylepšovač ještě chladne. Počkej **%1$s** a pak to zkus znovu
- Gratulujeme! Zdvojnásobili jsme počet vylepšení, která dostaneš se svým předplatným Nitro.
Podpoř svůj oblíbený server vylepšením a získej speciální odznak!
Vylepšit tento server
Rozumím
diff --git a/com.discord/res/values-da/strings.xml b/com.discord/res/values-da/strings.xml
index 61d093a9d3..5dd9ba3050 100644
--- a/com.discord/res/values-da/strings.xml
+++ b/com.discord/res/values-da/strings.xml
@@ -2709,10 +2709,6 @@ mens du taler."
Du kan uploade din besked som en fil i stedet.
Åh nej! Din besked indeholder mere end 2000 karakterer.
mere end %1$s siden
- Vil du gerne genskabe forbindelsen til din sidste talekanal? At hænge ud i en talekanal er en god måde at signalere til at andre på at du gerne vil have selskab.
- Nej tak!
- Velkommen tilbage.
- Tilslut igen til **%1$s**
sidste synkronisering: %1$s
Lancering %1$s
Få mere at vide
@@ -3453,7 +3449,6 @@ Den vil blive fjernet fra alle tilknyttede servere og annulleret på dit abonnem
Det ser ud som om du er i en cooldown periode. Vent venligst **%1$s and %2$s** før du prøver igen
Det ser ud som om du er i en cooldown periode. Vent venligst **%1$s og %2$s** før du prøver igen
Det ser ud som om du er i en cooldown periode. Vent venligst **%1$s** før du forsøger igen
- Tillykke! Vi fordoblede det antal boosts, som du får med dit Nitro-abonnement.
Støt din topserver med et boost og få et specielt mærke!
Boost denne server
Forstået
diff --git a/com.discord/res/values-de/strings.xml b/com.discord/res/values-de/strings.xml
index 04c1b0b865..611ac281ab 100644
--- a/com.discord/res/values-de/strings.xml
+++ b/com.discord/res/values-de/strings.xml
@@ -2722,10 +2722,6 @@ wenn du sprichst."
Du kannst deine Nachricht stattdessen als Datei hochladen.
Oh nein! Deine Nachricht ist länger als 2.000 Zeichen.
vor mehr als %1$s
- Möchtest du dich wieder mit deinem letzten Sprachkanal verbinden? Zeit in einem Sprachkanal zu verbringen, ist der perfekte Weg, um anderen zu zeigen, dass du mit ihnen abhängen willst.
- Nein danke!
- Willkommen zurück!
- Wieder mit **%1$s** verbinden
Letzte Synchronisation: %1$s
%1$s starten
Mehr erfahren
@@ -3465,7 +3461,6 @@ Die Änderungen an deinem Abonnement werden unten angezeigt:"
Sieht aus, als wäre der Cooldown noch nicht vorbei. Bitte warte **%1$s und %2$s**, bevor du es erneut versuchst.
Sieht aus, als wäre der Cooldown noch nicht vorbei. Bitte warte **%1$s und %2$s**, bevor du es erneut versuchst.
Sieht aus, als wäre der Cooldown noch nicht vorbei. Bitte warte **%1$s**, bevor du es erneut versuchst.
- Glückwunsch! Wir haben die Anzahl an Boosts, die du mit deinem Nitro-Abonnement erhältst, verdoppelt!
Unterstütze deinen Top-Server mit einem Boost und erhalte ein besonderes Abzeichen!
Diesen Server boosten
Alles klar!
diff --git a/com.discord/res/values-el/strings.xml b/com.discord/res/values-el/strings.xml
index 6aa4885c84..e1112254d0 100644
--- a/com.discord/res/values-el/strings.xml
+++ b/com.discord/res/values-el/strings.xml
@@ -2742,10 +2742,6 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
Μπορείς να ανεβάσεις το μήνυμά σου ως αρχείο.
Ωχ, όχι! Το μήνυμά σου είναι πάνω από 2000 χαρακτήρες.
περισσότερο από %1$s πριν
- Θα θέλατε να συνδεθείτε ξανά στο τελευταίο σας κανάλι ομιλίας; Το να αράζετε σε ένα κανάλι ομιλίας είναι ένας εξαιρετικός τρόπος να δείξετε στους άλλους ότι θέλετε να κάνετε παρέα μαζί τους.
- Όχι, ευχαριστώ!
- Καλωσόρισες και πάλι!
- Επανασύνδεση στο **%1$s**
τελευταίος συγχρονισμός: %1$s
Έναρξη %1$s
Μάθετε Περισσότερα
@@ -3494,7 +3490,6 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ
Φαίνεται πως δεν έχει τελειώσει ακόμα η αντίστροφη μέτρηση. Παρακαλώ περιμένετε **%1$s και %2$s** πριν προσπαθήσετε ξανά
Φαίνεται πως δεν έχει τελειώσει ακόμα η αντίστροφη μέτρηση. Παρακαλώ περιμένετε **%1$s και %2$s** πριν προσπαθήσετε ξανά
Φαίνεται πως δεν έχει τελειώσει ακόμα η αντίστροφη μέτρηση. Παρακαλώ περιμένετε **%1$s** πριν προσπαθήσετε ξανά
- Συγχαρητήρια! Διπλασιάσαμε τον αριθμό των ενισχύσεων που λαμβάνεις με τη συνδρομή Nitro.
Στήριξε τους αγαπημένους σου διακομιστές με μια Ενίσχυση και κέρδισε ένα ειδικό έμβλημα!
Ενίσχυσε αυτόν τον διακομιστή
Το ’πιασα
diff --git a/com.discord/res/values-es-rES/strings.xml b/com.discord/res/values-es-rES/strings.xml
index 558edf3d8f..191db2c47f 100644
--- a/com.discord/res/values-es-rES/strings.xml
+++ b/com.discord/res/values-es-rES/strings.xml
@@ -2709,10 +2709,6 @@ temporalmente mientras hables."
En su lugar, puedes subir tu mensaje como archivo.
¡Oh, no! Tu mensaje contiene más de 2000 caracteres.
hace más de %1$s
- ¿Te gustaría volver a conectarte a tu último canal de voz? Estar en un canal de voz es una buena forma de hacerles saber a los demás que te gustaría hablar un rato.
- No, ¡gracias!
- ¡Hola de nuevo!
- Reconectar a **%1$s**
última sincronización: %1$s
Ejecutar %1$s
Más información
@@ -3457,7 +3453,6 @@ A continuación, verás reflejados los cambios en tu suscripción:"
Parece que no se ha acabado tu tiempo de recuperación. Espera **%1$s y %2$s** antes de intentarlo de nuevo.
Parece que no se ha acabado tu tiempo de recuperación. Espera **%1$s y %2$s** antes de intentarlo de nuevo.
Parece que no se ha acabado tu tiempo de recuperación. Espera **%1$s** antes de intentarlo de nuevo.
- ¡Enhorabuena! Hemos duplicado el número de mejoras que recibes con tu suscripción Nitro.
¡Apoya a tu servidor favorito con una mejora y consigue una insignia especial!
Mejorar este servidor
Entendido
diff --git a/com.discord/res/values-fi/strings.xml b/com.discord/res/values-fi/strings.xml
index 308e2b3476..41ec76c514 100644
--- a/com.discord/res/values-fi/strings.xml
+++ b/com.discord/res/values-fi/strings.xml
@@ -2754,10 +2754,6 @@ ensisijaisen puhujan roolia."
Voit ladata viestisi palvelimelle vaihtoehtoisesti tiedostona.
Voi ei! Viestisi on yli 2 000 merkin pituinen.
enemmän kuin %1$s sitten
- Haluatko muodostaa uuden yhteyden edelliseen puhekanavaasi? Puhekanavalla roikkuminen on hyvä keino kertoa muille, että olet juttutuulella.
- Ei kiitos
- Tervetuloa takaisin!
- Yhdistä uudelleen kanavalle **%1$s**
edellinen synkronointi: %1$s
Käynnistä %1$s
Lue lisää
@@ -3506,7 +3502,6 @@ Tilauksesi muutokset näkyvät alla:"
Sinulla on odotusaika käynnissä. Odota **%1$s ja %2$s** ja kokeile sitten uudelleen
Sinulla on odotusaika käynnissä. Odota **%1$s ja %2$s** ja kokeile sitten uudelleen
Sinulla on odotusaika käynnissä. Odota **%1$s** ja kokeile sitten uudelleen
- Hienoa! Tuplasimme Nitro-tilauksella saamiesi nostatusten määrän.
Tue suosikkipalvelintasi nostatuksella, niin saat erikoismerkin!
Nostata tätä palvelinta
Asia ymmärretty
diff --git a/com.discord/res/values-fr/strings.xml b/com.discord/res/values-fr/strings.xml
index 07bf1a69aa..7e0369608b 100644
--- a/com.discord/res/values-fr/strings.xml
+++ b/com.discord/res/values-fr/strings.xml
@@ -2752,10 +2752,6 @@ lorsque tu parles."
Tu peux envoyer ce message en tant que fichier.
Oh non ! Ton message fait plus de 2 000 caractères.
il y a plus de %1$s
- Veux-tu te reconnecter au dernier salon vocal visité ? Traîner dans un salon vocal est le moyen parfait pour faire comprendre aux autres que tu as envie de papoter.
- Non merci !
- Ha, te revoilà !
- Se reconnecter à **%1$s**
dernière synchronisation : %1$s
Lancer %1$s
En savoir plus
@@ -3495,7 +3491,6 @@ Les changements apportés à ton abonnement apparaissent ci-dessous :"
"On dirait bien que tu as un temps de récupération. Merci d'attendre encore **%1$s et %2$s** avant d'essayer à nouveau"
"On dirait bien que tu as un temps de récupération. Merci d'attendre encore **%1$s et %2$s** avant d'essayer à nouveau"
"On dirait bien que tu as un temps de récupération. Merci d'attendre encore **%1$s** avant d'essayer à nouveau"
- Félicitations ! On a doublé le nombre de boosts que tu obtiens avec ton abonnement Nitro.
Soutiens ton serveur favori avec un boost et obtiens un badge spécial !
Booster ce serveur
Compris
diff --git a/com.discord/res/values-hr/strings.xml b/com.discord/res/values-hr/strings.xml
index ca07d3c8a4..b768020fa3 100644
--- a/com.discord/res/values-hr/strings.xml
+++ b/com.discord/res/values-hr/strings.xml
@@ -2679,10 +2679,6 @@ dok ti govoriš."
Umjesto toga, možeš si poruku prenijeti kao datoteku.
Ne ide to tako! Poruka ti je preko 2000 znakova.
prije više od %1$s dana
- Želiš li se ponovno povezati sa svojim posljednjim glasovnim kanalom? Kampiranje u glasovnom kanalu odličan je način da drugima daš do znanja da se želiš družiti.
- Ne, hvala!
- Dobrodošao/la natrag!
- Ponovno poveži **%1$s**
posljednja sinkronizacija: %1$s
Pokreni %1$s
Saznaj više
@@ -3426,7 +3422,6 @@ Promjene tvoje pretplate su iskazane u nastavku:"
Izgleda da si u periodu rashlađivanja. Pliz pričekaj **%1$s i %2$s** prije novog pokušaja
Izgleda da si u periodu rashlađivanja. Pliz pričekaj **%1$s i %2$s** prije novog pokušaja
Izgleda da si u periodu rashlađivanja. Pliz pričekaj **%1$s** prije novog pokušaja
- Čestitamo! Broj boostova koje dobiješ uz Nitro pretplate smo udvostručili.
Podrži svoj najdraži server tako da mu daš boost i dobit ćeš specijalni badge!
Boostaj ovaj server
Kužim
diff --git a/com.discord/res/values-hu/strings.xml b/com.discord/res/values-hu/strings.xml
index 765bfbee7b..b4966cd75e 100644
--- a/com.discord/res/values-hu/strings.xml
+++ b/com.discord/res/values-hu/strings.xml
@@ -2737,10 +2737,6 @@ miközben te beszélsz."
Az üzenetet ehelyett töltsd fel fájlként.
Jaj, ne! Az üzeneted hosszabb 2000 karakternél.
több mint %1$s
- Szeretnél újracsatlakozni az utolsó hangcsatornádhoz? A hangcsatornán való tétlenség nagyszerű módja annak, hogy másoknak jelezd, hogy csevegni szeretnél.
- Kösz, nem!
- Üdv újra!
- Újracsatlakozás a következőhöz: **%1$s**
utolsó szinkronizálás: %1$s
%1$s indítása
További infó
@@ -3490,7 +3486,6 @@ Az előfizetést érintő változások az alábbiak:"
Úgy tűnik, hogy lehűtésben vagy. Újbóli próbálkozás előtt várj **%1$s és %2$s**
Úgy tűnik, hogy lehűtésben vagy. Újbóli próbálkozás előtt várj **%1$s és %2$s**
Úgy tűnik, hogy lehűtésben vagy. Újbóli próbálkozás előtt várj **%1$s**
- Gratulálunk! Megdupláztuk a gyorsítások számát, amit a Nitro-előfizetéseddel kapsz!
Támogasd meg legnépszerűbb szerveredet egy gyorsítással, és szerezz speciális jelvényt!
Gyorsítsd fel ezt a szervert
Megértettem
diff --git a/com.discord/res/values-it/strings.xml b/com.discord/res/values-it/strings.xml
index 027e7aa778..2059b4d1d0 100644
--- a/com.discord/res/values-it/strings.xml
+++ b/com.discord/res/values-it/strings.xml
@@ -2733,10 +2733,6 @@ mentre parli tu."
Puoi caricare il messaggio come file.
Oh, no! Il tuo messaggio supera i 2000 caratteri.
più di %1$s fa
- "Vuoi riconnetterti all'ultimo canale vocale che hai visitato? Stare senza fare niente in un canale vocale è un ottimo modo per far capire alle altre persone che vorresti compagnia."
- No, grazie!
- Eccoti qui!
- Riconnettiti a **%1$s**
ultima sincronizzazione: %1$s
Avvia %1$s
Scopri di più
@@ -3484,7 +3480,6 @@ I cambiamenti al tuo abbonamento sono spiegati qui sotto:"
Ti trovi ancora nel periodo di ricarica, vero? Devi Aspettare ancora **%1$s e %2$s** prima di riprovare
Ti trovi ancora nel periodo di ricarica, vero? Devi Aspettare ancora **%1$s e %2$s** prima di riprovare
Ti trovi ancora nel periodo di ricarica. Devi aspettare **%1$s** prima di riprovare
- Complimenti! Abbiamo raddoppiato il numero di potenziamenti che ottieni con il tuo abbonamento Nitro.
Sostieni i tuoi server preferiti con un potenziamento e riceverai un badge speciale!
Potenzia questo server
Capito
diff --git a/com.discord/res/values-ja/strings.xml b/com.discord/res/values-ja/strings.xml
index 0d48dc4149..005fe2a107 100644
--- a/com.discord/res/values-ja/strings.xml
+++ b/com.discord/res/values-ja/strings.xml
@@ -2776,10 +2776,6 @@ Discordについて詳しい情報が必要ですか?"
代わりにメッセージをファイルとしてアップロードすることもできます。
メッセージが2000文字を超過しています。
%1$sより前
- 最新のボイスチャンネルに再接続しますか?ボイスチャンネルでのアイドリングは、あなたがハングアウトしたいことを他の人に知らせるいい方法です。
- やめておく
- おかえりなさい!
- **%1$s**に再接続
最終同期日時: %1$s
%1$sを起動
詳しくはこちら
@@ -3529,7 +3525,6 @@ Discordについて詳しい情報が必要ですか?"
クールダウン中のようです。**%1$s と %2$s** 待ってからやり直してください
クールダウン中のようです。**%1$s と %2$s** 待ってからやり直してください
クールダウン中のようです。**%1$s** 待ってからやり直してください
- おめでとうございます!Nitro購読で手に入るブーストを倍にしました。
ブーストでお気に入りのサーバーをサポートして、スペシャルバッジをゲットしましょう!
このサーバーをブーストする
了解
diff --git a/com.discord/res/values-ko/strings.xml b/com.discord/res/values-ko/strings.xml
index 8176672df4..d5ccf932b3 100644
--- a/com.discord/res/values-ko/strings.xml
+++ b/com.discord/res/values-ko/strings.xml
@@ -2770,10 +2770,6 @@ Discord에 대해 더 알고 싶으신가요?"
메시지는 파일 형식으로도 업로드할 수 있어요.
이런! 메시지의 길이가 2000글자를 넘어갔어요.
%1$s 이상
- 마지막으로 참가했던 음성 채널에 다시 연결하시겠어요? 음성 채널에서 기다리고 있으면 다른 사람들에게 함께 놀고 싶다는 신호를 줄 수 있어요.
- 사양할게요!
- 돌아오신 것을 환영해요!
- **%1$s**에 다시 연결하기
최근 동기화: %1$s
%1$s 실행하기
자세히 알아보기
@@ -3524,7 +3520,6 @@ Discord에 대해 더 알고 싶으신가요?"
쿨다운 상태신 것 같아요. **%1$s %2$s** 후 다시 시도해 주세요.
쿨다운 상태신 것 같아요. **%1$s %2$s** 후 다시 시도해 주세요.
쿨다운 상태신 것 같아요. **%1$s**후 다시 시도해 주세요.
- 축하해요! Nitro 구독을 통해 획득하는 부스트 수가 2배로 증가했어요.
부스트로 좋아하는 서버를 응원하고 특별한 배지도 획득하세요!
이 서버 부스트하기
알겠어요
diff --git a/com.discord/res/values-lt/strings.xml b/com.discord/res/values-lt/strings.xml
index d0b9dfcba8..80c4dad65f 100644
--- a/com.discord/res/values-lt/strings.xml
+++ b/com.discord/res/values-lt/strings.xml
@@ -2738,10 +2738,6 @@ Nori daugiau sužinoti apie Discord?"
Tačiau gali įkelti žinutę kaip failą.
O ne! Tavo žinutė viršija 2 000 simbolių.
daugiau negu prieš %1$s
- Ar nori iš naujo prisijungti prie paskutinio balso kanalo? Laukimas balso kanale yra puikus būdas kitiems pranešti, kad nori pasikalbėti.
- Ačiū, ne!
- Sveikas sugrįžęs!
- Prisijungti iš naujo prie **%1$s**
paskutinis sinchronizavimas: %1$s
Paleisti %1$s
Sužinok daugiau
@@ -3491,7 +3487,6 @@ Toliau nurodyti tavo prenumeratos pasikeitimai."
Atrodo, kad dabar įjungtas atvėsimas. Prieš bandydamas dar kartą palauk **%1$s ir %2$s**
Atrodo, kad dabar įjungtas atvėsimas. Prieš bandydamas dar kartą palauk **%1$s ir %2$s**
Atrodo, kad dabar įjungtas atvėsimas. Prieš bandydamas dar kartą palauk **%1$s**
- Sveikiname! Padvigubinome stiprinimų, kuriuos gausi su Nitro prenumerata, skaičių.
Paremk mėgstamiausią serverį jį sustiprindamas ir gauk specialų ženklelį!
Stiprinti šį serverį
Supratau
diff --git a/com.discord/res/values-nl/strings.xml b/com.discord/res/values-nl/strings.xml
index 5892e9985d..4bcd12427e 100644
--- a/com.discord/res/values-nl/strings.xml
+++ b/com.discord/res/values-nl/strings.xml
@@ -2707,10 +2707,6 @@ terwijl je spreekt."
Je kunt je bericht ook als bestand uploaden.
O nee! Je bericht bevat meer dan 2000 tekens.
meer dan %1$s geleden
- Wil je opnieuw verbinding maken met je laatste spraakkanaal? Niet actief zijn in een spraakkanaal is een goede manier om anderen te laten weten dat je zin hebt om te kletsen.
- Nee, bedankt!
- Welkom terug!
- Opnieuw verbinden met **%1$s**
laatste synchronisatie: %1$s
Start %1$s
Meer informatie
@@ -3447,7 +3443,6 @@ De wijzigingen aan je abonnement zie je hieronder:"
Zo te zien zit je in een cooldown. Wacht nog **%1$s en %2$s** voordat je het opnieuw probeert
Zo te zien zit je in een cooldown. Wacht nog **%1$s en %2$s** voordat je het opnieuw probeert
Zo te zien zit je in een cooldown. Wacht nog **%1$s** voordat je het opnieuw probeert
- Gefeliciteerd! We hebben het aantal boosts dat je bij je Nitro-abonnement krijgt verdubbeld.
Steun je beste server met een boost en ontvang een speciale badge!
Boost deze server
Begrepen
diff --git a/com.discord/res/values-no/strings.xml b/com.discord/res/values-no/strings.xml
index a0ff676b7e..112ba469a0 100644
--- a/com.discord/res/values-no/strings.xml
+++ b/com.discord/res/values-no/strings.xml
@@ -2656,10 +2656,6 @@ mens du snakker."
Du kan laste opp meldingen din som en fil i stedet.
Å nei! Meldingen din er på over 2000 tegn.
mer enn %1$s siden
- Vil du koble til den siste talekanalen din på nytt? Å drive dank i en talekanal er en flott måte å signalisere til andre at du vil henge.
- Nei takk!
- Velkommen tilbake!
- Koble til **%1$s** igjen
forrige synkronisering: %1$s
Start %1$s
Finn ut mer
@@ -3402,7 +3398,6 @@ Endringene i abonnementet ditt er vist under:"
Det ser ut til at du er under nedkjøling. Vent **%1$s og %2$s** før du prøver på nytt
Det ser ut til at du er under nedkjøling. Vent **%1$s og %2$s** før du prøver på nytt
Det ser ut til at du er under nedkjøling. Vent **%1$s** før du prøver på nytt
- Gratulerer! Vi har doblet antall booster du får med Nitro-abonnementet ditt.
Støtt toppserveren din med en boost, og få et spesielt merke!
Boost denne serveren
Forstått
diff --git a/com.discord/res/values-pl/strings.xml b/com.discord/res/values-pl/strings.xml
index 48589e15a9..641b4e54cf 100644
--- a/com.discord/res/values-pl/strings.xml
+++ b/com.discord/res/values-pl/strings.xml
@@ -2763,10 +2763,6 @@ na czas, kiedy Ty mówisz."
Możesz przesłać swoją wiadomość jako plik.
O nie! Twoja wiadomość ma ponad 2000 znaków.
więcej niż %1$s temu
- Czy chcesz ponownie połączyć się z ostatnim kanałem głosowym? Siedząc nieaktywnie na kanale głosowym, jednoznacznie sygnalizujesz innym, że chcesz pospędzać z nimi czas.
- Nie, dzięki!
- Witamy ponownie!
- Połącz ponownie z **%1$s**
ostatnia synchronizacja: %1$s
Uruchom %1$s
Więcej informacji
@@ -3516,7 +3512,6 @@ Zmiany Twojej subskrypcji przedstawiono poniżej:"
Wygląda na to, że trwa czas odnowienia. Zaczekaj **%1$s i %2$s** i spróbuj ponownie
Wygląda na to, że trwa czas odnowienia. Zaczekaj **%1$s i %2$s** i spróbuj ponownie
Wygląda na to, że trwa czas odnowienia. Zaczekaj **%1$s** i spróbuj ponownie
- Gratulacje! Podwoiliśmy liczbę ulepszeń, które otrzymujesz wraz z subskrypcją Nitro.
Wesprzyj swój ulubiony serwer ulepszeniem, a otrzymasz specjalną odznakę!
Ulepsz ten serwer
Zrozumiano
diff --git a/com.discord/res/values-pt-rBR/strings.xml b/com.discord/res/values-pt-rBR/strings.xml
index 5af75958b1..9e8fc7b63e 100644
--- a/com.discord/res/values-pt-rBR/strings.xml
+++ b/com.discord/res/values-pt-rBR/strings.xml
@@ -2748,10 +2748,6 @@ enquanto você está falando."
Em vez disso, você pode enviar sua mensagem como arquivo.
Oh não! Sua mensagem passou dos 2000 caracteres.
há mais de %1$s
- Gostaria de se reconectar ao seu último canal de voz? Se conectar a um canal de voz é uma ótima maneira de mostrar para os outros que você quer conversar.
- Não, valeu!
- Boas-vindas de volta!
- Reconectar a **%1$s**
última sincronização: %1$s
Executar %1$s
Saiba mais
@@ -3499,7 +3495,6 @@ As mudanças na sua assinatura estão listadas abaixo:"
Parece que você está no intervalo. Aguarde **%1$s e %2$s** antes de tentar novamente
Parece que você está no intervalo. Aguarde **%1$s e %2$s** antes de tentar novamente
Parece que você está no intervalo. Aguarde **%1$s** antes de tentar novamente
- Parabéns! Nós dobramos o número de impulsos que você recebe com sua assinatura Nitro.
Apoie seu servidores favoritos com impulsos e receba um emblema especial!
Impulsionar este servidor
Entendi
diff --git a/com.discord/res/values-ro/strings.xml b/com.discord/res/values-ro/strings.xml
index e460032894..ab0e12adbb 100644
--- a/com.discord/res/values-ro/strings.xml
+++ b/com.discord/res/values-ro/strings.xml
@@ -2710,10 +2710,6 @@ atunci când vorbești tu."
Dacă vrei, poți încărca mesajul ca fișier.
O, nu! Mesajul tău are peste 2000 de caractere.
cu mai mult de %1$s în urmă
- Dorești să te reconectezi la ultimul tău canal de voce? Să-ți petreci timpul liber într-un canal de voce este o modalitate excelentă de a da de știre celorlalți că vrei să comunici cu ei.
- Nu, mulțumesc!
- Bine ai revenit!
- Reconectează-te la **%1$s**
ultima sincronizare: %1$s
Lansează %1$s
Află mai multe
@@ -3463,7 +3459,6 @@ Modificările aduse abonamentului tău sunt descrise mai jos:"
Se pare că ești într-o perioadă de așteptare. Te rugăm să aștepți **%1$s și %2$s** înainte de a încerca din nou
Se pare că ești într-o perioadă de așteptare. Te rugăm să aștepți **%1$s și %2$s** înainte de a încerca din nou
Se pare că ești într-o perioadă de așteptare. Te rugăm să aștepți **%1$s** înainte de a încerca din nou
- Felicitări! Am dublat numărul de boost-uri pe care le primești prin abonamentul Nitro.
Susține-ți server-ul preferat cu un boost și primește o insignă specială!
Stimulează acest server
Am înțeles
diff --git a/com.discord/res/values-ru/strings.xml b/com.discord/res/values-ru/strings.xml
index 948314acd6..ba03ba9986 100644
--- a/com.discord/res/values-ru/strings.xml
+++ b/com.discord/res/values-ru/strings.xml
@@ -2786,10 +2786,6 @@
Вместо этого загрузите своё сообщение в качестве файла.
О нет! Ваше сообщение содержит более 2000 знаков.
больше, чем %1$s назад
- Хотите переподключиться к последнему голосовому каналу? Посидите в голосовом канале, чтобы показать другим пользователям, что вы хотите общаться.
- Нет, спасибо.
- С возвращением!
- Переподключиться к **%1$s**
Последняя синхронизация: %1$s
Запустить %1$s
Узнать больше
@@ -3541,7 +3537,6 @@
Ваша способность усиления серверов пока не восстановилась. Подождите **%1$s и %2$s** и попробуйте ещё раз.
Ваша способность усиления серверов пока не восстановилась. Подождите **%1$s и %2$s** и попробуйте ещё раз.
Ваша способность усиления серверов пока не восстановилась. Подождите **%1$s** и попробуйте ещё раз.
- Поздравляем! Теперь ваша подписка Nitro даёт вдвое больше бустов.
Поддержите любимый сервер с помощью буста и получите особый значок!
Дайте буст этому серверу
Ясно
diff --git a/com.discord/res/values-sv-rSE/strings.xml b/com.discord/res/values-sv-rSE/strings.xml
index 5e884afd08..35c239e63c 100644
--- a/com.discord/res/values-sv-rSE/strings.xml
+++ b/com.discord/res/values-sv-rSE/strings.xml
@@ -2662,10 +2662,6 @@ under tiden du pratar."
Du kan ladda upp ditt meddelande som en fil i stället.
Åh nej! Ditt meddelande är över 2 000 tecken långt.
mer än %1$s sedan
- Vill du återansluta till din senaste röstkanal? Att vara inaktiv i en röstkanal är ett utmärkt sätt att tala om för andra att du vill umgås.
- Nej tack!
- Välkommen tillbaka!
- Återanslut till **%1$s**
senaste synkning: %1$s
Starta %1$s
Läs mer
@@ -3407,7 +3403,6 @@ Den kommer att tas bort från tillhörande servrar och annulleras från din pren
Det ser ut som du är på nedkylning. Vänta i **%1$s och %2$s** innan du prövar igen
Det ser ut som du är på nedkylning. Vänta i **%1$s och %2$s** innan du prövar igen
Det ser ut som du är på nedkylning. Vänta i **%1$s** innan du prövar igen
- Grattis! Vi har dubblerat antalet boostar du får med din Nitro-prenumeration.
Stöd din toppserver med en boost och få ett specialmärke!
Boosta den här servern
Jag förstår
diff --git a/com.discord/res/values-th/strings.xml b/com.discord/res/values-th/strings.xml
index bba4399af4..b2b37684a7 100644
--- a/com.discord/res/values-th/strings.xml
+++ b/com.discord/res/values-th/strings.xml
@@ -2745,10 +2745,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
คุูณสามารถอัพโหลดข้อความของคุณเป็นไฟล์แทน
โอ้ไม่นะ! ข้ิอความของคุณมีความยาวมากกว่า 2000 ตัวอักษร
มากกว่า %1$s ที่แล้ว
- คุณต้องการจะเชื่อมต่อกับช่องสำหรับพูดที่คุณเชื่อมต่อล่าสุดหรือไม่? ปิดช่องสำหรับพูดเป็นทางที่ดีที่สุดในการส่งสัญญาณว่าคุณต้องการพัก
- ไม่ดีกว่า!
- ยินดีต้อนรับกลับ
- เชื่อมต่อกับ **%1$s**
การซิงค์ล่าสุด: %1$s
เปิด %1$s
เรียนรู้เพิ่มเติม
@@ -3498,7 +3494,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ
ดูเหมือนคุณกำลังคูลดาวน์ โปรดรอ **%1$s และ %2$s** ก่อนลองอีกครั้ง
ดูเหมือนคุณกำลังคูลดาวน์ โปรดรอ **%1$s และ %2$s** ก่อนลองอีกครั้ง
ดูเหมือนคุณกำลังคูลดาวน์ โปรดรอ **%1$s** ก่อนลองอีกครั้ง
- ยินดีด้วย! เราคูณสองจำนวนบูสต์ที่คุณได้จากการสมัครสมาชิก Nitro ของคุณ
สนับสนุนเซิร์ฟเวอร์หลักของคุณด้วยบูสต์และได้รับป้ายพิเศษ!
บูสต์เซิร์ฟเวอร์นี้
ได้แล้ว
diff --git a/com.discord/res/values-tr/strings.xml b/com.discord/res/values-tr/strings.xml
index e04b90ad50..a60717152b 100644
--- a/com.discord/res/values-tr/strings.xml
+++ b/com.discord/res/values-tr/strings.xml
@@ -2733,10 +2733,6 @@ geçici olarak kısılacak."
Mesajını kısaltmak istemiyorsan bir dosya olarak yükleyebilirsin.
Olamaz! Mesajın 2000 karakterden uzun.
%1$s önce
- Son ses kanalına tekrar bağlanmak ister misin? Bir ses kanalında boş boş takılmak, birlikte bir şey yapmak istediğini diğer insanlara belli etmenin harika bir yöntemidir.
- Yok, kalsın!
- Tekrar hoş geldin!
- Tekrar **%1$s** ile bağlantı kur
son senkronize: %1$s
%1$s uygulamasını başlat
Daha Fazla Bilgi Edin
@@ -3486,7 +3482,6 @@ Aboneliğinin nasıl değişeceği aşağıda belirtilmiştir:"
Görünüşe göre bekleme süresindesin. Tekrar denemeden önce lütfen **%1$s ve %2$s** bekle
Görünüşe göre bekleme süresindesin. Tekrar denemeden önce lütfen **%1$s ve %2$s** bekle
Görünüşe göre bekleme süresindesin. Tekrar denemeden önce lütfen **%1$s** bekle
- Tebrikler! Nitro aboneliğin ile kazanacağın Takviye sayısını iki katına çıkardık.
En sevdiğin sunucuya bir takviye ile destek ol ve özel bir rozet kazan!
Bu Sunucuya Takviye Yap
Anladım
diff --git a/com.discord/res/values-uk/strings.xml b/com.discord/res/values-uk/strings.xml
index 0d73a3a432..c3f7a591e2 100644
--- a/com.discord/res/values-uk/strings.xml
+++ b/com.discord/res/values-uk/strings.xml
@@ -2761,10 +2761,6 @@ AFK. Це не впливає на браузери."
Замість цього ти можеш завантажити своє повідомлення як файл.
О, ні! Твоє повідомлення довше за 2000 символів.
більше, ніж %1$s тому
- Ти хочеш знову підключитися до твого останнього голосового каналу? Просте знаходження в голосовому каналі — це чудовий привід повідомити інших, що ти не проти трохи відірватися.
- Ні, дякую!
- З поверненням!
- Повторне підключення до **%1$s**
Остання синхронізація: %1$s
Запустити %1$s
Дізнатися більше
@@ -3517,7 +3513,6 @@ AFK. Це не впливає на браузери."
Схоже, ця можливість у тебе на відновленні. Зачекай ще **%1$s та %2$s**, а потім спробуй ще раз.
Схоже, ця можливість у тебе на відновленні. Зачекай ще **%1$s та %2$s**, а потім спробуй ще раз.
Схоже, ця можливість у тебе на відновленні. Зачекай ще **%1$s**, а потім спробуй ще раз.
- Вітаємо! Ми подвоїли кількість прискорень, які ти отримаєш за передплату Nitro.
Підтримай свій чудовий сервер за допомогою прискорення та отримай спеціальний бейдж!
Прискорити цей сервер
Зрозуміло
diff --git a/com.discord/res/values-vi/strings.xml b/com.discord/res/values-vi/strings.xml
index f568b432c8..2bf04b39cc 100644
--- a/com.discord/res/values-vi/strings.xml
+++ b/com.discord/res/values-vi/strings.xml
@@ -2729,10 +2729,6 @@ khi bạn đang phát biểu."
Thay vào đó, bạn có thể tải tin nhắn lên dưới dạng tệp.
Ôi không! Tin nhắn của bạn dài hơn 2000 ký tự.
hơn %1$s trước
- Bạn có muốn kết nối lại kênh đàm thoại gần đây nhất không? Việc xuất hiện trong kênh thoại là một cách tốt để báo hiệu cho những người khác thấy rằng bạn đang muốn trò chuyện.
- Không cảm ơn!
- Chào mừng trở lại!
- Kết nối lại **%1$s**
đồng bộ gần nhất: %1$s
Chạy %1$s
Tìm hiểu thêm
@@ -3479,7 +3475,6 @@ Nó sẽ được gỡ bỏ khỏi các máy chủ đã liên kết và hủy tr
Có vẻ như bạn đang trong thời gian hồi. Vui lòng chờ trong **%1$s và %2$s** trước khi thử lại lần nữa
Có vẻ như bạn đang trong thời gian hồi. Vui lòng chờ trong **%1$s và %2$s** trước khi thử lại lần nữa
Có vẻ như bạn đang trong thời gian hồi. Vui lòng chờ trong **%1$s** trước khi thử lại lần nữa
- Chúc mừng! Chúng tôi đã nhân đôi số lượng Nâng Cấp nhận được khi đăng ký Nitro.
Hỗ trợ máy chủ hàng đầu bằng cách nâng cấp và nhận một huy hiệu đặc biệt!
Nâng Cấp Máy Chủ Này
Hiểu rồi chứ
diff --git a/com.discord/res/values-zh-rCN/strings.xml b/com.discord/res/values-zh-rCN/strings.xml
index f5ab23998b..062ce5cdda 100644
--- a/com.discord/res/values-zh-rCN/strings.xml
+++ b/com.discord/res/values-zh-rCN/strings.xml
@@ -2757,10 +2757,6 @@
您可以转而通过文件的方式上传消息。
糟糕!您的消息超过了2000字符数。
超过 %1$s 前
- 您想重新连接至上一个语音频道吗?在语音频道中闲荡,他人就会知道您想一起玩。
- 不了,谢谢!
- 欢迎回来!
- 重新连接至 **%1$s**
上一次同步时间:%1$s
运行 %1$s
了解更多
@@ -3509,7 +3505,6 @@
看来您还在冷却中。请耐心等待 **%1$s %2$s**,然后再试一次
看来您还在冷却中。请耐心等待 **%1$s %2$s**,然后再试一次
看来您还在冷却中。请耐心等待 **%1$s**,然后再试一次
- 恭喜!我们已经将您通过 Nitro 订阅所获得的助力数量翻倍了。
使用助力支持您的顶级服务器,获得一枚专属徽章!
助力此服务器
收到
diff --git a/com.discord/res/values-zh-rTW/strings.xml b/com.discord/res/values-zh-rTW/strings.xml
index 283a7dc4ed..16637b87b1 100644
--- a/com.discord/res/values-zh-rTW/strings.xml
+++ b/com.discord/res/values-zh-rTW/strings.xml
@@ -2758,10 +2758,6 @@
您可以將訊息以檔案形式上傳。
天哪!您的訊息已超過 2,000 個字元。
是在於 %1$s 前
- 您想要重新連線至上一個語音頻道嗎?在語音頻道裡閒晃是個讓大家知道您想要交朋友的好方法。
- 不用了,謝謝!
- 歡迎回來!
- 重新連線至 **%1$s**
最後同步時間: %1$s
啟動 %1$s
了解更多
@@ -3508,7 +3504,6 @@
看來您還處於冷卻時間。請等到 **%1$s %2$s**後再試一次
看來您還處於冷卻時間。請等到 **%1$s %2$s**後再試一次
看來您還處於冷卻時間。請等到 **%1$s**後再試一次
- 恭喜!您透過 Nitro 訂閱獲得兩倍數量的加成。
透過加成支援您的主要伺服器,並獲得一枚特殊徽章!
加成此伺服器
知道了
diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml
index 78aa17df94..bc477da7a4 100644
--- a/com.discord/res/values/public.xml
+++ b/com.discord/res/values/public.xml
@@ -9904,5160 +9904,5168 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml
index 64fa157596..deddf49868 100644
--- a/com.discord/res/values/strings.xml
+++ b/com.discord/res/values/strings.xml
@@ -137,6 +137,8 @@
Add a Role
Add a Server
Tap to add a server!
+ Tap to create your first group!
+ Tap to create your first chatroom!
Add Friends
Add a Channel or Category
Add a channel to override its default notification settings
@@ -722,7 +724,7 @@
Total
Transaction History
Your Subscription
- These are your current subscriptions. They will be billed on the same billing cycle. You can update any subcription at any time.
+ These are your current subscriptions. They will be billed on the same billing cycle. You can update any subscription at any time.
By purchasing a Discord subscription, you agree to our [Terms of Service](%1$s) and [Privacy Policy](%2$s). Nitro and Server Boost are auto-recurring subscriptions. You authorize Discord to immediately charge the payment method provided at %3$s and to continue to do so automatically monthly until you cancel. You may cancel anytime.
By purchasing a Discord subscription, you agree to our [Terms of Service](%1$s) and [Privacy Policy](%2$s). Nitro and Server Boost are auto-recurring subscriptions. You authorize Discord to immediately charge the payment method provided at %3$s and to continue to do so automatically yearly until you cancel. You may cancel anytime.
This payment source is invalid.
@@ -762,6 +764,13 @@
Tax is included with the price.
Your payment methods are encrypted and stored with a secure payment processing service.
Select a payment source to continue
+ Add Payment Method
+ Redeem Xbox Game Pass
+ Purchase Server Boosts
+ View Payment History
+ Gift Discord Nitro
+ Purchase Discord Nitro
+ Switch Discord Nitro Plan
Address
Awaiting Authentication
Payment Information
@@ -1025,7 +1034,7 @@ ONE MORE THING {fixed}
OR
Collapse
Collapse Category
- d9a46dd8-dd94-41c5-9b62-507115950609
+ 387645b4-59b4-4509-a31b-198408f89495
Coming Soon
Search Animated GIFs on the Web
Displays text with emphasis.
@@ -1769,6 +1778,7 @@ ONE MORE THING {fixed}
Friends
Name
Status
+ Do Not Disturb - %1$s
Wumpus has no friends. You could though!
"Let them know you're here!"
Share my username
@@ -1777,6 +1787,7 @@ ONE MORE THING {fixed}
"I just joined Discord, and my username is %1$s. Let's chat!"
"No one's around to play with Wumpus."
"There are no pending friend requests. Here's a Wumpus for now."
+ Idle - %1$s
Offline - %1$s
Online - %1$s
See All
@@ -2982,10 +2993,6 @@ Want to know more about Discord?"
You can upload your message as a file instead.
Oh no! Your message is over 2000 characters.
more than %1$s ago
- Would you like to reconnect to your last voice channel? Idling in a voice channel is a great way to signal to others that you want to hang out.
- No thanks!
- Welcome back!
- Reconnect to **%1$s**
last sync: %1$s
Launch %1$s
Learn More
@@ -3398,6 +3405,7 @@ Want to know more about Discord?"
Setup notifications to know when your friends send a message.
Turn Notifications ON
"Don't miss a thing!"
+ See what people are up to
Continue
Nope
You must be at least eighteen years old to view this channel. Are you over eighteen and willing to see adult content?
@@ -3628,6 +3636,7 @@ Want to know more about Discord?"
Something went wrong, try again.
**PayPal** account authorized. Return to **Discord** to complete the transaction.
Pending
+ People
%1$s%% since last week
Need help with permissions?
Media access denied - Discord requires access to storage to post attachments.
@@ -3849,7 +3858,6 @@ The changes to your subscription are reflected below:"
"Looks like you're on cooldown. Please wait **%1$s and %2$s** before trying again"
"Looks like you're on cooldown. Please wait **%1$s and %2$s** before trying again"
"Looks like you're on cooldown. Please wait **%1$s** before trying again"
- Congrats! We doubled the number of Boosts you get with your Nitro subscription.
Support your top server with a boost and get a special badge!
Boost This Server
You Boosted %1$s
@@ -5326,7 +5334,7 @@ You cannot take any moderation actions until you enable it."
Xbox One Only
Gimme that PC code!
Gimme that Xbox code!
- "Since you have a boost subscription, we'll give you Nitro subcription credit. Nitro credit will be applied when you subscribe to **%1$s**."
+ "Since you have a boost subscription, we'll give you Nitro subscription credit. Nitro credit will be applied when you subscribe to **%1$s**."
Redeem
You now have Nitro Credit! Subscribe to **%1$s** today to apply your Nitro credit.
Nice!
@@ -5350,5 +5358,5 @@ You cannot take any moderation actions until you enable it."
"You're viewing older messages"
Chinese, China
Chinese, Taiwan
- - false
+ - false
diff --git a/com.discord/smali/androidx/activity/R$string.smali b/com.discord/smali/androidx/activity/R$string.smali
index 8147d9bda3..7cf50a4656 100644
--- a/com.discord/smali/androidx/activity/R$string.smali
+++ b/com.discord/smali/androidx/activity/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$string.smali b/com.discord/smali/androidx/appcompat/R$string.smali
index 3e39e3da13..b446d3dd60 100644
--- a/com.discord/smali/androidx/appcompat/R$string.smali
+++ b/com.discord/smali/androidx/appcompat/R$string.smali
@@ -69,9 +69,9 @@
.field public static final abc_toolbar_collapse_description:I = 0x7f12001d
-.field public static final search_menu_title:I = 0x7f1210e5
+.field public static final search_menu_title:I = 0x7f1210ed
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
# 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 09de46737e..683786af1c 100644
--- a/com.discord/smali/androidx/appcompat/resources/R$string.smali
+++ b/com.discord/smali/androidx/appcompat/resources/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
# direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$string.smali b/com.discord/smali/androidx/asynclayoutinflater/R$string.smali
index 3e630fc7f5..2bd3db2855 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$string.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
# direct methods
diff --git a/com.discord/smali/androidx/browser/R$string.smali b/com.discord/smali/androidx/browser/R$string.smali
index 987f04953f..1687600451 100644
--- a/com.discord/smali/androidx/browser/R$string.smali
+++ b/com.discord/smali/androidx/browser/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
# direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$string.smali b/com.discord/smali/androidx/coordinatorlayout/R$string.smali
index a147d890bd..8d41240c8e 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$string.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
# direct methods
diff --git a/com.discord/smali/androidx/core/R$string.smali b/com.discord/smali/androidx/core/R$string.smali
index 277f2177bd..44f146d674 100644
--- a/com.discord/smali/androidx/core/R$string.smali
+++ b/com.discord/smali/androidx/core/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
# 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 c6e06798ec..c13d665bc0 100644
--- a/com.discord/smali/androidx/core/ktx/R$string.smali
+++ b/com.discord/smali/androidx/core/ktx/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
# direct methods
diff --git a/com.discord/smali/androidx/customview/R$string.smali b/com.discord/smali/androidx/customview/R$string.smali
index 7bc98a0321..615de51d19 100644
--- a/com.discord/smali/androidx/customview/R$string.smali
+++ b/com.discord/smali/androidx/customview/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
# direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$string.smali b/com.discord/smali/androidx/drawerlayout/R$string.smali
index aade85fff3..60ab684276 100644
--- a/com.discord/smali/androidx/drawerlayout/R$string.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
# direct methods
diff --git a/com.discord/smali/androidx/dynamicanimation/R$string.smali b/com.discord/smali/androidx/dynamicanimation/R$string.smali
index d8d0ec78eb..381f4dd7b8 100644
--- a/com.discord/smali/androidx/dynamicanimation/R$string.smali
+++ b/com.discord/smali/androidx/dynamicanimation/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
# direct methods
diff --git a/com.discord/smali/androidx/fragment/R$string.smali b/com.discord/smali/androidx/fragment/R$string.smali
index 0abb8c8112..11a044a2cc 100644
--- a/com.discord/smali/androidx/fragment/R$string.smali
+++ b/com.discord/smali/androidx/fragment/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
# 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 424ad1b3d0..87b51c4f49 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$string.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
# 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 66da9d8f33..70649e5409 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$string.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
# 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 0785f103e1..729c92e6b3 100644
--- a/com.discord/smali/androidx/legacy/v4/R$string.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
# direct methods
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$string.smali b/com.discord/smali/androidx/lifecycle/extensions/R$string.smali
index c6f9ddb2b6..ded8f6ca55 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$string.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
# direct methods
diff --git a/com.discord/smali/androidx/loader/R$string.smali b/com.discord/smali/androidx/loader/R$string.smali
index cfd67833d5..6b1a669ffc 100644
--- a/com.discord/smali/androidx/loader/R$string.smali
+++ b/com.discord/smali/androidx/loader/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
# direct methods
diff --git a/com.discord/smali/androidx/media/R$string.smali b/com.discord/smali/androidx/media/R$string.smali
index c4a7955878..f5f11b5f72 100644
--- a/com.discord/smali/androidx/media/R$string.smali
+++ b/com.discord/smali/androidx/media/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
# direct methods
diff --git a/com.discord/smali/androidx/preference/R$string.smali b/com.discord/smali/androidx/preference/R$string.smali
index d50a3b8c05..fa7a661956 100644
--- a/com.discord/smali/androidx/preference/R$string.smali
+++ b/com.discord/smali/androidx/preference/R$string.smali
@@ -69,23 +69,23 @@
.field public static final abc_toolbar_collapse_description:I = 0x7f12001d
-.field public static final copy:I = 0x7f120468
+.field public static final copy:I = 0x7f120471
-.field public static final expand_button_title:I = 0x7f1205b1
+.field public static final expand_button_title:I = 0x7f1205ba
-.field public static final not_set:I = 0x7f120cc9
+.field public static final not_set:I = 0x7f120cd0
-.field public static final preference_copied:I = 0x7f120e30
+.field public static final preference_copied:I = 0x7f120e39
-.field public static final search_menu_title:I = 0x7f1210e5
+.field public static final search_menu_title:I = 0x7f1210ed
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
-.field public static final summary_collapsed_preference_list:I = 0x7f1211ea
+.field public static final summary_collapsed_preference_list:I = 0x7f1211f2
-.field public static final v7_preference_off:I = 0x7f1213fb
+.field public static final v7_preference_off:I = 0x7f121403
-.field public static final v7_preference_on:I = 0x7f1213fc
+.field public static final v7_preference_on:I = 0x7f121404
# 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 bfc7ecc17f..87aba024ce 100644
--- a/com.discord/smali/androidx/preference/ktx/R$string.smali
+++ b/com.discord/smali/androidx/preference/ktx/R$string.smali
@@ -69,23 +69,23 @@
.field public static final abc_toolbar_collapse_description:I = 0x7f12001d
-.field public static final copy:I = 0x7f120468
+.field public static final copy:I = 0x7f120471
-.field public static final expand_button_title:I = 0x7f1205b1
+.field public static final expand_button_title:I = 0x7f1205ba
-.field public static final not_set:I = 0x7f120cc9
+.field public static final not_set:I = 0x7f120cd0
-.field public static final preference_copied:I = 0x7f120e30
+.field public static final preference_copied:I = 0x7f120e39
-.field public static final search_menu_title:I = 0x7f1210e5
+.field public static final search_menu_title:I = 0x7f1210ed
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
-.field public static final summary_collapsed_preference_list:I = 0x7f1211ea
+.field public static final summary_collapsed_preference_list:I = 0x7f1211f2
-.field public static final v7_preference_off:I = 0x7f1213fb
+.field public static final v7_preference_off:I = 0x7f121403
-.field public static final v7_preference_on:I = 0x7f1213fc
+.field public static final v7_preference_on:I = 0x7f121404
# direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$string.smali b/com.discord/smali/androidx/recyclerview/R$string.smali
index c913252dd7..00f2df066c 100644
--- a/com.discord/smali/androidx/recyclerview/R$string.smali
+++ b/com.discord/smali/androidx/recyclerview/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
# direct methods
diff --git a/com.discord/smali/androidx/room/R$string.smali b/com.discord/smali/androidx/room/R$string.smali
index 24dea66e8b..6609099597 100644
--- a/com.discord/smali/androidx/room/R$string.smali
+++ b/com.discord/smali/androidx/room/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
# direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$string.smali b/com.discord/smali/androidx/slidingpanelayout/R$string.smali
index e11103c117..ebeae09073 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$string.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
# direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$string.smali b/com.discord/smali/androidx/swiperefreshlayout/R$string.smali
index 202572ce58..3b9a8cb96c 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$string.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
# direct methods
diff --git a/com.discord/smali/androidx/transition/R$string.smali b/com.discord/smali/androidx/transition/R$string.smali
index 079dbb4478..ffc4566868 100644
--- a/com.discord/smali/androidx/transition/R$string.smali
+++ b/com.discord/smali/androidx/transition/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$string.smali b/com.discord/smali/androidx/vectordrawable/R$string.smali
index 95fdfbc1b6..81f5f29c64 100644
--- a/com.discord/smali/androidx/vectordrawable/R$string.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
# 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 0cfe588cb2..ef8d00784b 100644
--- a/com.discord/smali/androidx/vectordrawable/animated/R$string.smali
+++ b/com.discord/smali/androidx/vectordrawable/animated/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
# direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$string.smali b/com.discord/smali/androidx/viewpager/R$string.smali
index 9873a7eec0..d3e4019a9f 100644
--- a/com.discord/smali/androidx/viewpager/R$string.smali
+++ b/com.discord/smali/androidx/viewpager/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
# direct methods
diff --git a/com.discord/smali/androidx/viewpager2/R$string.smali b/com.discord/smali/androidx/viewpager2/R$string.smali
index 229cd52f1e..67e450ad95 100644
--- a/com.discord/smali/androidx/viewpager2/R$string.smali
+++ b/com.discord/smali/androidx/viewpager2/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
# direct methods
diff --git a/com.discord/smali/androidx/work/R$string.smali b/com.discord/smali/androidx/work/R$string.smali
index cd290ce6c4..344749a0ea 100644
--- a/com.discord/smali/androidx/work/R$string.smali
+++ b/com.discord/smali/androidx/work/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
# 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 4c15cb30e9..1c4b78c480 100644
--- a/com.discord/smali/androidx/work/ktx/R$string.smali
+++ b/com.discord/smali/androidx/work/ktx/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
# direct methods
diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali
index 0012605f2e..9a21567fcd 100644
--- a/com.discord/smali/com/discord/BuildConfig.smali
+++ b/com.discord/smali/com/discord/BuildConfig.smali
@@ -36,11 +36,11 @@
.field public static final SAMSUNGxDISCORD_CLIENT_ID:Ljava/lang/String; = "97t47j218f"
-.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1025"
+.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1026"
-.field public static final VERSION_CODE:I = 0x401
+.field public static final VERSION_CODE:I = 0x402
-.field public static final VERSION_NAME:Ljava/lang/String; = "10.2.5"
+.field public static final VERSION_NAME:Ljava/lang/String; = "10.2.6"
# direct methods
diff --git a/com.discord/smali/com/discord/app/App.smali b/com.discord/smali/com/discord/app/App.smali
index 9bfc5b0dd4..4488240d20 100644
--- a/com.discord/smali/com/discord/app/App.smali
+++ b/com.discord/smali/com/discord/app/App.smali
@@ -73,6 +73,10 @@
invoke-super {p0}, Landroid/app/Application;->onCreate()V
+ sget-object v0, Lcom/discord/utilities/app/ApplicationProvider;->INSTANCE:Lcom/discord/utilities/app/ApplicationProvider;
+
+ invoke-virtual {v0, p0}, Lcom/discord/utilities/app/ApplicationProvider;->init(Landroid/app/Application;)V
+
sget-object v0, Lcom/discord/utilities/time/ClockFactory;->INSTANCE:Lcom/discord/utilities/time/ClockFactory;
invoke-virtual {v0, p0}, Lcom/discord/utilities/time/ClockFactory;->init(Landroid/app/Application;)V
diff --git a/com.discord/smali/com/discord/app/AppActivity$c.smali b/com.discord/smali/com/discord/app/AppActivity$c.smali
index 7ce077c10b..87a5bb08d3 100644
--- a/com.discord/smali/com/discord/app/AppActivity$c.smali
+++ b/com.discord/smali/com/discord/app/AppActivity$c.smali
@@ -108,6 +108,18 @@
invoke-virtual {v0, v1}, Lcom/discord/utilities/keyboard/Keyboard;->init(Landroid/app/Application;)V
+ sget-object v0, Lcom/discord/utilities/media/AudioOutputMonitor;->Companion:Lcom/discord/utilities/media/AudioOutputMonitor$Companion;
+
+ iget-object v1, p0, Lcom/discord/app/AppActivity$c;->this$0:Lcom/discord/app/AppActivity;
+
+ invoke-virtual {v1}, Landroid/app/Activity;->getApplication()Landroid/app/Application;
+
+ move-result-object v1
+
+ invoke-static {v1, v2}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ invoke-virtual {v0, v1}, Lcom/discord/utilities/media/AudioOutputMonitor$Companion;->initialize(Landroid/app/Application;)V
+
:cond_0
return-void
.end method
diff --git a/com.discord/smali/com/discord/app/AppFragment$b.smali b/com.discord/smali/com/discord/app/AppFragment$b.smali
index 265ef836b1..5a1ef8b7a4 100644
--- a/com.discord/smali/com/discord/app/AppFragment$b.smali
+++ b/com.discord/smali/com/discord/app/AppFragment$b.smali
@@ -82,7 +82,7 @@
iget-object v3, p0, Lcom/discord/app/AppFragment$b;->this$0:Lcom/discord/app/AppFragment;
- const v4, 0x7f12052f
+ const v4, 0x7f120538
invoke-virtual {v3, v4}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/app/AppFragment$c.smali b/com.discord/smali/com/discord/app/AppFragment$c.smali
index 376d6edc8f..8ac63161b5 100644
--- a/com.discord/smali/com/discord/app/AppFragment$c.smali
+++ b/com.discord/smali/com/discord/app/AppFragment$c.smali
@@ -60,7 +60,7 @@
iget-object v2, p0, Lcom/discord/app/AppFragment$c;->a:Lcom/discord/app/AppFragment;
- const v3, 0x7f12132d
+ const v3, 0x7f121335
const/4 v4, 0x1
diff --git a/com.discord/smali/com/discord/app/AppPermissions.smali b/com.discord/smali/com/discord/app/AppPermissions.smali
index dd270f9f5d..6b43690608 100644
--- a/com.discord/smali/com/discord/app/AppPermissions.smali
+++ b/com.discord/smali/com/discord/app/AppPermissions.smali
@@ -323,7 +323,7 @@
goto :goto_0
:cond_0
- const p1, 0x7f120e06
+ const p1, 0x7f120e0f
invoke-virtual {v0, p1}, Lcom/discord/app/AppPermissions$a;->invoke(I)Lkotlin/jvm/functions/Function0;
@@ -332,7 +332,7 @@
goto :goto_0
:cond_1
- const p1, 0x7f120e00
+ const p1, 0x7f120e09
invoke-virtual {v0, p1}, Lcom/discord/app/AppPermissions$a;->invoke(I)Lkotlin/jvm/functions/Function0;
@@ -341,7 +341,7 @@
goto :goto_0
:cond_2
- const p1, 0x7f120dff
+ const p1, 0x7f120e08
invoke-virtual {v0, p1}, Lcom/discord/app/AppPermissions$a;->invoke(I)Lkotlin/jvm/functions/Function0;
@@ -350,7 +350,7 @@
goto :goto_0
:cond_3
- const p1, 0x7f120e01
+ const p1, 0x7f120e0a
invoke-virtual {v0, p1}, Lcom/discord/app/AppPermissions$a;->invoke(I)Lkotlin/jvm/functions/Function0;
diff --git a/com.discord/smali/com/discord/app/DiscordConnectService.smali b/com.discord/smali/com/discord/app/DiscordConnectService.smali
index 14cb6baf3d..80adada3bf 100644
--- a/com.discord/smali/com/discord/app/DiscordConnectService.smali
+++ b/com.discord/smali/com/discord/app/DiscordConnectService.smali
@@ -115,7 +115,7 @@
move-result-object v0
- const v1, 0x7f120435
+ const v1, 0x7f12043e
invoke-virtual {p0, v1}, Landroid/app/Service;->getString(I)Ljava/lang/String;
@@ -125,7 +125,7 @@
move-result-object v0
- const v1, 0x7f12043c
+ const v1, 0x7f120445
invoke-virtual {p0, v1}, Landroid/app/Service;->getString(I)Ljava/lang/String;
@@ -271,7 +271,7 @@
:goto_2
if-eqz v5, :cond_3
- const v3, 0x7f120d8b
+ const v3, 0x7f120d93
const/16 v4, 0xc
diff --git a/com.discord/smali/com/discord/gateway/R$string.smali b/com.discord/smali/com/discord/gateway/R$string.smali
index a163f251fc..f19bbfe915 100644
--- a/com.discord/smali/com/discord/gateway/R$string.smali
+++ b/com.discord/smali/com/discord/gateway/R$string.smali
@@ -69,165 +69,165 @@
.field public static final abc_toolbar_collapse_description:I = 0x7f12001d
-.field public static final app_name:I = 0x7f1200c8
+.field public static final app_name:I = 0x7f1200ca
-.field public static final appbar_scrolling_view_behavior:I = 0x7f1200d0
+.field public static final appbar_scrolling_view_behavior:I = 0x7f1200d2
-.field public static final bottom_sheet_behavior:I = 0x7f12032f
+.field public static final bottom_sheet_behavior:I = 0x7f120338
-.field public static final character_counter_content_description:I = 0x7f1203bb
+.field public static final character_counter_content_description:I = 0x7f1203c4
-.field public static final character_counter_overflowed_content_description:I = 0x7f1203bc
+.field public static final character_counter_overflowed_content_description:I = 0x7f1203c5
-.field public static final character_counter_pattern:I = 0x7f1203bd
+.field public static final character_counter_pattern:I = 0x7f1203c6
-.field public static final chip_text:I = 0x7f1203c8
+.field public static final chip_text:I = 0x7f1203d1
-.field public static final clear_text_end_icon_content_description:I = 0x7f1203d3
+.field public static final clear_text_end_icon_content_description:I = 0x7f1203dc
-.field public static final common_google_play_services_enable_button:I = 0x7f1203fc
+.field public static final common_google_play_services_enable_button:I = 0x7f120405
-.field public static final common_google_play_services_enable_text:I = 0x7f1203fd
+.field public static final common_google_play_services_enable_text:I = 0x7f120406
-.field public static final common_google_play_services_enable_title:I = 0x7f1203fe
+.field public static final common_google_play_services_enable_title:I = 0x7f120407
-.field public static final common_google_play_services_install_button:I = 0x7f1203ff
+.field public static final common_google_play_services_install_button:I = 0x7f120408
-.field public static final common_google_play_services_install_text:I = 0x7f120400
+.field public static final common_google_play_services_install_text:I = 0x7f120409
-.field public static final common_google_play_services_install_title:I = 0x7f120401
+.field public static final common_google_play_services_install_title:I = 0x7f12040a
-.field public static final common_google_play_services_notification_channel_name:I = 0x7f120402
+.field public static final common_google_play_services_notification_channel_name:I = 0x7f12040b
-.field public static final common_google_play_services_notification_ticker:I = 0x7f120403
+.field public static final common_google_play_services_notification_ticker:I = 0x7f12040c
-.field public static final common_google_play_services_unknown_issue:I = 0x7f120404
+.field public static final common_google_play_services_unknown_issue:I = 0x7f12040d
-.field public static final common_google_play_services_unsupported_text:I = 0x7f120405
+.field public static final common_google_play_services_unsupported_text:I = 0x7f12040e
-.field public static final common_google_play_services_update_button:I = 0x7f120406
+.field public static final common_google_play_services_update_button:I = 0x7f12040f
-.field public static final common_google_play_services_update_text:I = 0x7f120407
+.field public static final common_google_play_services_update_text:I = 0x7f120410
-.field public static final common_google_play_services_update_title:I = 0x7f120408
+.field public static final common_google_play_services_update_title:I = 0x7f120411
-.field public static final common_google_play_services_updating_text:I = 0x7f120409
+.field public static final common_google_play_services_updating_text:I = 0x7f120412
-.field public static final common_google_play_services_wear_update_text:I = 0x7f12040a
+.field public static final common_google_play_services_wear_update_text:I = 0x7f120413
-.field public static final common_open_on_phone:I = 0x7f12040b
+.field public static final common_open_on_phone:I = 0x7f120414
-.field public static final common_signin_button_text:I = 0x7f12040c
+.field public static final common_signin_button_text:I = 0x7f120415
-.field public static final common_signin_button_text_long:I = 0x7f12040d
+.field public static final common_signin_button_text_long:I = 0x7f120416
-.field public static final copy:I = 0x7f120468
+.field public static final copy:I = 0x7f120471
-.field public static final error_icon_content_description:I = 0x7f1205a2
+.field public static final error_icon_content_description:I = 0x7f1205ab
-.field public static final expand_button_title:I = 0x7f1205b1
+.field public static final expand_button_title:I = 0x7f1205ba
-.field public static final exposed_dropdown_menu_content_description:I = 0x7f1205bd
+.field public static final exposed_dropdown_menu_content_description:I = 0x7f1205c6
-.field public static final fab_transformation_scrim_behavior:I = 0x7f1205be
+.field public static final fab_transformation_scrim_behavior:I = 0x7f1205c7
-.field public static final fab_transformation_sheet_behavior:I = 0x7f1205bf
+.field public static final fab_transformation_sheet_behavior:I = 0x7f1205c8
-.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f1209bc
+.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f1209c7
-.field public static final icon_content_description:I = 0x7f120a48
+.field public static final icon_content_description:I = 0x7f120a53
-.field public static final mtrl_badge_numberless_content_description:I = 0x7f120c32
+.field public static final mtrl_badge_numberless_content_description:I = 0x7f120c39
-.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120c33
+.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120c3a
-.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120c34
+.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120c3b
-.field public static final mtrl_picker_a11y_next_month:I = 0x7f120c35
+.field public static final mtrl_picker_a11y_next_month:I = 0x7f120c3c
-.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120c36
+.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120c3d
-.field public static final mtrl_picker_announce_current_selection:I = 0x7f120c37
+.field public static final mtrl_picker_announce_current_selection:I = 0x7f120c3e
-.field public static final mtrl_picker_cancel:I = 0x7f120c38
+.field public static final mtrl_picker_cancel:I = 0x7f120c3f
-.field public static final mtrl_picker_confirm:I = 0x7f120c39
+.field public static final mtrl_picker_confirm:I = 0x7f120c40
-.field public static final mtrl_picker_date_header_selected:I = 0x7f120c3a
+.field public static final mtrl_picker_date_header_selected:I = 0x7f120c41
-.field public static final mtrl_picker_date_header_title:I = 0x7f120c3b
+.field public static final mtrl_picker_date_header_title:I = 0x7f120c42
-.field public static final mtrl_picker_date_header_unselected:I = 0x7f120c3c
+.field public static final mtrl_picker_date_header_unselected:I = 0x7f120c43
-.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120c3d
+.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120c44
-.field public static final mtrl_picker_invalid_format:I = 0x7f120c3e
+.field public static final mtrl_picker_invalid_format:I = 0x7f120c45
-.field public static final mtrl_picker_invalid_format_example:I = 0x7f120c3f
+.field public static final mtrl_picker_invalid_format_example:I = 0x7f120c46
-.field public static final mtrl_picker_invalid_format_use:I = 0x7f120c40
+.field public static final mtrl_picker_invalid_format_use:I = 0x7f120c47
-.field public static final mtrl_picker_invalid_range:I = 0x7f120c41
+.field public static final mtrl_picker_invalid_range:I = 0x7f120c48
-.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120c42
+.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120c49
-.field public static final mtrl_picker_out_of_range:I = 0x7f120c43
+.field public static final mtrl_picker_out_of_range:I = 0x7f120c4a
-.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120c44
+.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120c4b
-.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120c45
+.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120c4c
-.field public static final mtrl_picker_range_header_selected:I = 0x7f120c46
+.field public static final mtrl_picker_range_header_selected:I = 0x7f120c4d
-.field public static final mtrl_picker_range_header_title:I = 0x7f120c47
+.field public static final mtrl_picker_range_header_title:I = 0x7f120c4e
-.field public static final mtrl_picker_range_header_unselected:I = 0x7f120c48
+.field public static final mtrl_picker_range_header_unselected:I = 0x7f120c4f
-.field public static final mtrl_picker_save:I = 0x7f120c49
+.field public static final mtrl_picker_save:I = 0x7f120c50
-.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120c4a
+.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120c51
-.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120c4b
+.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120c52
-.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120c4c
+.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120c53
-.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120c4d
+.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120c54
-.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120c4e
+.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120c55
-.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120c4f
+.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120c56
-.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120c50
+.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120c57
-.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120c51
+.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120c58
-.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120c52
+.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120c59
-.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120c53
+.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120c5a
-.field public static final not_set:I = 0x7f120cc9
+.field public static final not_set:I = 0x7f120cd0
-.field public static final password_toggle_content_description:I = 0x7f120dba
+.field public static final password_toggle_content_description:I = 0x7f120dc2
-.field public static final path_password_eye:I = 0x7f120dbc
+.field public static final path_password_eye:I = 0x7f120dc4
-.field public static final path_password_eye_mask_strike_through:I = 0x7f120dbd
+.field public static final path_password_eye_mask_strike_through:I = 0x7f120dc5
-.field public static final path_password_eye_mask_visible:I = 0x7f120dbe
+.field public static final path_password_eye_mask_visible:I = 0x7f120dc6
-.field public static final path_password_strike_through:I = 0x7f120dbf
+.field public static final path_password_strike_through:I = 0x7f120dc7
-.field public static final preference_copied:I = 0x7f120e30
+.field public static final preference_copied:I = 0x7f120e39
-.field public static final search_menu_title:I = 0x7f1210e5
+.field public static final search_menu_title:I = 0x7f1210ed
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
-.field public static final summary_collapsed_preference_list:I = 0x7f1211ea
+.field public static final summary_collapsed_preference_list:I = 0x7f1211f2
-.field public static final v7_preference_off:I = 0x7f1213fb
+.field public static final v7_preference_off:I = 0x7f121403
-.field public static final v7_preference_on:I = 0x7f1213fc
+.field public static final v7_preference_on:I = 0x7f121404
# direct methods
diff --git a/com.discord/smali/com/discord/models/domain/ModelApplication.smali b/com.discord/smali/com/discord/models/domain/ModelApplication.smali
index 605c3a5e79..bb918f1b80 100644
--- a/com.discord/smali/com/discord/models/domain/ModelApplication.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelApplication.smali
@@ -123,7 +123,7 @@
iget-wide p2, p0, Lcom/discord/models/domain/ModelApplication;->id:J
- const-string p4, "://discord"
+ const-string p4, "://connect/_discord"
invoke-static {p1, p2, p3, p4}, Le/e/b/a/a;->a(Ljava/lang/StringBuilder;JLjava/lang/String;)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/models/domain/ModelVoice$OutputMode.smali b/com.discord/smali/com/discord/models/domain/ModelVoice$OutputMode.smali
deleted file mode 100644
index 6cf0712027..0000000000
--- a/com.discord/smali/com/discord/models/domain/ModelVoice$OutputMode.smali
+++ /dev/null
@@ -1,135 +0,0 @@
-.class public final enum Lcom/discord/models/domain/ModelVoice$OutputMode;
-.super Ljava/lang/Enum;
-.source "ModelVoice.java"
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingClass;
- value = Lcom/discord/models/domain/ModelVoice;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
- accessFlags = 0x4019
- name = "OutputMode"
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
- value = {
- "Ljava/lang/Enum<",
- "Lcom/discord/models/domain/ModelVoice$OutputMode;",
- ">;"
- }
-.end annotation
-
-
-# static fields
-.field public static final synthetic $VALUES:[Lcom/discord/models/domain/ModelVoice$OutputMode;
-
-.field public static final enum IN_EAR:Lcom/discord/models/domain/ModelVoice$OutputMode;
-
-.field public static final enum SPEAKER:Lcom/discord/models/domain/ModelVoice$OutputMode;
-
-
-# instance fields
-.field public final analyticsValue:Ljava/lang/String;
-
-
-# direct methods
-.method public static constructor ()V
- .locals 5
-
- new-instance v0, Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- const/4 v1, 0x0
-
- const-string v2, "IN_EAR"
-
- const-string v3, "in_ear"
-
- invoke-direct {v0, v2, v1, v3}, Lcom/discord/models/domain/ModelVoice$OutputMode;->(Ljava/lang/String;ILjava/lang/String;)V
-
- sput-object v0, Lcom/discord/models/domain/ModelVoice$OutputMode;->IN_EAR:Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- new-instance v0, Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- const/4 v2, 0x1
-
- const-string v3, "SPEAKER"
-
- const-string v4, "speaker"
-
- invoke-direct {v0, v3, v2, v4}, Lcom/discord/models/domain/ModelVoice$OutputMode;->(Ljava/lang/String;ILjava/lang/String;)V
-
- sput-object v0, Lcom/discord/models/domain/ModelVoice$OutputMode;->SPEAKER:Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- const/4 v0, 0x2
-
- new-array v0, v0, [Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- sget-object v3, Lcom/discord/models/domain/ModelVoice$OutputMode;->IN_EAR:Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- aput-object v3, v0, v1
-
- sget-object v1, Lcom/discord/models/domain/ModelVoice$OutputMode;->SPEAKER:Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- aput-object v1, v0, v2
-
- sput-object v0, Lcom/discord/models/domain/ModelVoice$OutputMode;->$VALUES:[Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- return-void
-.end method
-
-.method public constructor (Ljava/lang/String;ILjava/lang/String;)V
- .locals 0
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "(",
- "Ljava/lang/String;",
- ")V"
- }
- .end annotation
-
- invoke-direct {p0, p1, p2}, Ljava/lang/Enum;->(Ljava/lang/String;I)V
-
- iput-object p3, p0, Lcom/discord/models/domain/ModelVoice$OutputMode;->analyticsValue:Ljava/lang/String;
-
- return-void
-.end method
-
-.method public static valueOf(Ljava/lang/String;)Lcom/discord/models/domain/ModelVoice$OutputMode;
- .locals 1
-
- const-class v0, Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- invoke-static {v0, p0}, Ljava/lang/Enum;->valueOf(Ljava/lang/Class;Ljava/lang/String;)Ljava/lang/Enum;
-
- move-result-object p0
-
- check-cast p0, Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- return-object p0
-.end method
-
-.method public static values()[Lcom/discord/models/domain/ModelVoice$OutputMode;
- .locals 1
-
- sget-object v0, Lcom/discord/models/domain/ModelVoice$OutputMode;->$VALUES:[Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- invoke-virtual {v0}, [Lcom/discord/models/domain/ModelVoice$OutputMode;->clone()Ljava/lang/Object;
-
- move-result-object v0
-
- check-cast v0, [Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- return-object v0
-.end method
-
-
-# virtual methods
-.method public getAnalyticsValue()Ljava/lang/String;
- .locals 1
-
- iget-object v0, p0, Lcom/discord/models/domain/ModelVoice$OutputMode;->analyticsValue:Ljava/lang/String;
-
- return-object v0
-.end method
diff --git a/com.discord/smali/com/discord/models/domain/ModelVoice.smali b/com.discord/smali/com/discord/models/domain/ModelVoice.smali
index 737c895261..6e2b79d132 100644
--- a/com.discord/smali/com/discord/models/domain/ModelVoice.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelVoice.smali
@@ -7,8 +7,7 @@
.annotation system Ldalvik/annotation/MemberClasses;
value = {
Lcom/discord/models/domain/ModelVoice$State;,
- Lcom/discord/models/domain/ModelVoice$Server;,
- Lcom/discord/models/domain/ModelVoice$OutputMode;
+ Lcom/discord/models/domain/ModelVoice$Server;
}
.end annotation
diff --git a/com.discord/smali/com/discord/restapi/R$string.smali b/com.discord/smali/com/discord/restapi/R$string.smali
index d221e046df..640a7b85f0 100644
--- a/com.discord/smali/com/discord/restapi/R$string.smali
+++ b/com.discord/smali/com/discord/restapi/R$string.smali
@@ -69,163 +69,163 @@
.field public static final abc_toolbar_collapse_description:I = 0x7f12001d
-.field public static final appbar_scrolling_view_behavior:I = 0x7f1200d0
+.field public static final appbar_scrolling_view_behavior:I = 0x7f1200d2
-.field public static final bottom_sheet_behavior:I = 0x7f12032f
+.field public static final bottom_sheet_behavior:I = 0x7f120338
-.field public static final character_counter_content_description:I = 0x7f1203bb
+.field public static final character_counter_content_description:I = 0x7f1203c4
-.field public static final character_counter_overflowed_content_description:I = 0x7f1203bc
+.field public static final character_counter_overflowed_content_description:I = 0x7f1203c5
-.field public static final character_counter_pattern:I = 0x7f1203bd
+.field public static final character_counter_pattern:I = 0x7f1203c6
-.field public static final chip_text:I = 0x7f1203c8
+.field public static final chip_text:I = 0x7f1203d1
-.field public static final clear_text_end_icon_content_description:I = 0x7f1203d3
+.field public static final clear_text_end_icon_content_description:I = 0x7f1203dc
-.field public static final common_google_play_services_enable_button:I = 0x7f1203fc
+.field public static final common_google_play_services_enable_button:I = 0x7f120405
-.field public static final common_google_play_services_enable_text:I = 0x7f1203fd
+.field public static final common_google_play_services_enable_text:I = 0x7f120406
-.field public static final common_google_play_services_enable_title:I = 0x7f1203fe
+.field public static final common_google_play_services_enable_title:I = 0x7f120407
-.field public static final common_google_play_services_install_button:I = 0x7f1203ff
+.field public static final common_google_play_services_install_button:I = 0x7f120408
-.field public static final common_google_play_services_install_text:I = 0x7f120400
+.field public static final common_google_play_services_install_text:I = 0x7f120409
-.field public static final common_google_play_services_install_title:I = 0x7f120401
+.field public static final common_google_play_services_install_title:I = 0x7f12040a
-.field public static final common_google_play_services_notification_channel_name:I = 0x7f120402
+.field public static final common_google_play_services_notification_channel_name:I = 0x7f12040b
-.field public static final common_google_play_services_notification_ticker:I = 0x7f120403
+.field public static final common_google_play_services_notification_ticker:I = 0x7f12040c
-.field public static final common_google_play_services_unknown_issue:I = 0x7f120404
+.field public static final common_google_play_services_unknown_issue:I = 0x7f12040d
-.field public static final common_google_play_services_unsupported_text:I = 0x7f120405
+.field public static final common_google_play_services_unsupported_text:I = 0x7f12040e
-.field public static final common_google_play_services_update_button:I = 0x7f120406
+.field public static final common_google_play_services_update_button:I = 0x7f12040f
-.field public static final common_google_play_services_update_text:I = 0x7f120407
+.field public static final common_google_play_services_update_text:I = 0x7f120410
-.field public static final common_google_play_services_update_title:I = 0x7f120408
+.field public static final common_google_play_services_update_title:I = 0x7f120411
-.field public static final common_google_play_services_updating_text:I = 0x7f120409
+.field public static final common_google_play_services_updating_text:I = 0x7f120412
-.field public static final common_google_play_services_wear_update_text:I = 0x7f12040a
+.field public static final common_google_play_services_wear_update_text:I = 0x7f120413
-.field public static final common_open_on_phone:I = 0x7f12040b
+.field public static final common_open_on_phone:I = 0x7f120414
-.field public static final common_signin_button_text:I = 0x7f12040c
+.field public static final common_signin_button_text:I = 0x7f120415
-.field public static final common_signin_button_text_long:I = 0x7f12040d
+.field public static final common_signin_button_text_long:I = 0x7f120416
-.field public static final copy:I = 0x7f120468
+.field public static final copy:I = 0x7f120471
-.field public static final error_icon_content_description:I = 0x7f1205a2
+.field public static final error_icon_content_description:I = 0x7f1205ab
-.field public static final expand_button_title:I = 0x7f1205b1
+.field public static final expand_button_title:I = 0x7f1205ba
-.field public static final exposed_dropdown_menu_content_description:I = 0x7f1205bd
+.field public static final exposed_dropdown_menu_content_description:I = 0x7f1205c6
-.field public static final fab_transformation_scrim_behavior:I = 0x7f1205be
+.field public static final fab_transformation_scrim_behavior:I = 0x7f1205c7
-.field public static final fab_transformation_sheet_behavior:I = 0x7f1205bf
+.field public static final fab_transformation_sheet_behavior:I = 0x7f1205c8
-.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f1209bc
+.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f1209c7
-.field public static final icon_content_description:I = 0x7f120a48
+.field public static final icon_content_description:I = 0x7f120a53
-.field public static final mtrl_badge_numberless_content_description:I = 0x7f120c32
+.field public static final mtrl_badge_numberless_content_description:I = 0x7f120c39
-.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120c33
+.field public static final mtrl_chip_close_icon_content_description:I = 0x7f120c3a
-.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120c34
+.field public static final mtrl_exceed_max_badge_number_suffix:I = 0x7f120c3b
-.field public static final mtrl_picker_a11y_next_month:I = 0x7f120c35
+.field public static final mtrl_picker_a11y_next_month:I = 0x7f120c3c
-.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120c36
+.field public static final mtrl_picker_a11y_prev_month:I = 0x7f120c3d
-.field public static final mtrl_picker_announce_current_selection:I = 0x7f120c37
+.field public static final mtrl_picker_announce_current_selection:I = 0x7f120c3e
-.field public static final mtrl_picker_cancel:I = 0x7f120c38
+.field public static final mtrl_picker_cancel:I = 0x7f120c3f
-.field public static final mtrl_picker_confirm:I = 0x7f120c39
+.field public static final mtrl_picker_confirm:I = 0x7f120c40
-.field public static final mtrl_picker_date_header_selected:I = 0x7f120c3a
+.field public static final mtrl_picker_date_header_selected:I = 0x7f120c41
-.field public static final mtrl_picker_date_header_title:I = 0x7f120c3b
+.field public static final mtrl_picker_date_header_title:I = 0x7f120c42
-.field public static final mtrl_picker_date_header_unselected:I = 0x7f120c3c
+.field public static final mtrl_picker_date_header_unselected:I = 0x7f120c43
-.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120c3d
+.field public static final mtrl_picker_day_of_week_column_header:I = 0x7f120c44
-.field public static final mtrl_picker_invalid_format:I = 0x7f120c3e
+.field public static final mtrl_picker_invalid_format:I = 0x7f120c45
-.field public static final mtrl_picker_invalid_format_example:I = 0x7f120c3f
+.field public static final mtrl_picker_invalid_format_example:I = 0x7f120c46
-.field public static final mtrl_picker_invalid_format_use:I = 0x7f120c40
+.field public static final mtrl_picker_invalid_format_use:I = 0x7f120c47
-.field public static final mtrl_picker_invalid_range:I = 0x7f120c41
+.field public static final mtrl_picker_invalid_range:I = 0x7f120c48
-.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120c42
+.field public static final mtrl_picker_navigate_to_year_description:I = 0x7f120c49
-.field public static final mtrl_picker_out_of_range:I = 0x7f120c43
+.field public static final mtrl_picker_out_of_range:I = 0x7f120c4a
-.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120c44
+.field public static final mtrl_picker_range_header_only_end_selected:I = 0x7f120c4b
-.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120c45
+.field public static final mtrl_picker_range_header_only_start_selected:I = 0x7f120c4c
-.field public static final mtrl_picker_range_header_selected:I = 0x7f120c46
+.field public static final mtrl_picker_range_header_selected:I = 0x7f120c4d
-.field public static final mtrl_picker_range_header_title:I = 0x7f120c47
+.field public static final mtrl_picker_range_header_title:I = 0x7f120c4e
-.field public static final mtrl_picker_range_header_unselected:I = 0x7f120c48
+.field public static final mtrl_picker_range_header_unselected:I = 0x7f120c4f
-.field public static final mtrl_picker_save:I = 0x7f120c49
+.field public static final mtrl_picker_save:I = 0x7f120c50
-.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120c4a
+.field public static final mtrl_picker_text_input_date_hint:I = 0x7f120c51
-.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120c4b
+.field public static final mtrl_picker_text_input_date_range_end_hint:I = 0x7f120c52
-.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120c4c
+.field public static final mtrl_picker_text_input_date_range_start_hint:I = 0x7f120c53
-.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120c4d
+.field public static final mtrl_picker_text_input_day_abbr:I = 0x7f120c54
-.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120c4e
+.field public static final mtrl_picker_text_input_month_abbr:I = 0x7f120c55
-.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120c4f
+.field public static final mtrl_picker_text_input_year_abbr:I = 0x7f120c56
-.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120c50
+.field public static final mtrl_picker_toggle_to_calendar_input_mode:I = 0x7f120c57
-.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120c51
+.field public static final mtrl_picker_toggle_to_day_selection:I = 0x7f120c58
-.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120c52
+.field public static final mtrl_picker_toggle_to_text_input_mode:I = 0x7f120c59
-.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120c53
+.field public static final mtrl_picker_toggle_to_year_selection:I = 0x7f120c5a
-.field public static final not_set:I = 0x7f120cc9
+.field public static final not_set:I = 0x7f120cd0
-.field public static final password_toggle_content_description:I = 0x7f120dba
+.field public static final password_toggle_content_description:I = 0x7f120dc2
-.field public static final path_password_eye:I = 0x7f120dbc
+.field public static final path_password_eye:I = 0x7f120dc4
-.field public static final path_password_eye_mask_strike_through:I = 0x7f120dbd
+.field public static final path_password_eye_mask_strike_through:I = 0x7f120dc5
-.field public static final path_password_eye_mask_visible:I = 0x7f120dbe
+.field public static final path_password_eye_mask_visible:I = 0x7f120dc6
-.field public static final path_password_strike_through:I = 0x7f120dbf
+.field public static final path_password_strike_through:I = 0x7f120dc7
-.field public static final preference_copied:I = 0x7f120e30
+.field public static final preference_copied:I = 0x7f120e39
-.field public static final search_menu_title:I = 0x7f1210e5
+.field public static final search_menu_title:I = 0x7f1210ed
-.field public static final status_bar_notification_info_overflow:I = 0x7f121197
+.field public static final status_bar_notification_info_overflow:I = 0x7f12119f
-.field public static final summary_collapsed_preference_list:I = 0x7f1211ea
+.field public static final summary_collapsed_preference_list:I = 0x7f1211f2
-.field public static final v7_preference_off:I = 0x7f1213fb
+.field public static final v7_preference_off:I = 0x7f121403
-.field public static final v7_preference_on:I = 0x7f1213fc
+.field public static final v7_preference_on:I = 0x7f121404
# direct methods
diff --git a/com.discord/smali/com/discord/stores/StoreAnalytics$trackCallReportProblem$1.smali b/com.discord/smali/com/discord/stores/StoreAnalytics$trackCallReportProblem$1.smali
index 6ed6babd9d..efddb0384a 100644
--- a/com.discord/smali/com/discord/stores/StoreAnalytics$trackCallReportProblem$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAnalytics$trackCallReportProblem$1.smali
@@ -84,115 +84,135 @@
.end method
.method public final invoke()V
- .locals 15
+ .locals 17
- iget-object v0, p0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->this$0:Lcom/discord/stores/StoreAnalytics;
+ move-object/from16 v0, p0
- invoke-static {v0}, Lcom/discord/stores/StoreAnalytics;->access$getStores$p(Lcom/discord/stores/StoreAnalytics;)Lcom/discord/stores/StoreStream;
+ iget-object v1, v0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->this$0:Lcom/discord/stores/StoreAnalytics;
- move-result-object v0
+ invoke-static {v1}, Lcom/discord/stores/StoreAnalytics;->access$getStores$p(Lcom/discord/stores/StoreAnalytics;)Lcom/discord/stores/StoreStream;
- invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getUsers$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreUser;
+ move-result-object v1
- move-result-object v0
+ invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getUsers$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreUser;
- iget-object v0, v0, Lcom/discord/stores/StoreUser;->me:Lcom/discord/models/domain/ModelUser$Me;
+ move-result-object v1
- if-eqz v0, :cond_1
+ iget-object v1, v1, Lcom/discord/stores/StoreUser;->me:Lcom/discord/models/domain/ModelUser$Me;
- invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->getId()J
+ if-eqz v1, :cond_1
- move-result-wide v2
+ invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
- iget-object v0, p0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->this$0:Lcom/discord/stores/StoreAnalytics;
+ move-result-wide v3
- invoke-static {v0}, Lcom/discord/stores/StoreAnalytics;->access$getStores$p(Lcom/discord/stores/StoreAnalytics;)Lcom/discord/stores/StoreStream;
+ iget-object v1, v0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->this$0:Lcom/discord/stores/StoreAnalytics;
- move-result-object v0
+ invoke-static {v1}, Lcom/discord/stores/StoreAnalytics;->access$getStores$p(Lcom/discord/stores/StoreAnalytics;)Lcom/discord/stores/StoreStream;
- invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getChannels$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreChannels;
+ move-result-object v1
- move-result-object v0
+ invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getChannels$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreChannels;
- iget-wide v4, p0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->$channelId:J
+ move-result-object v1
- invoke-virtual {v0, v4, v5}, Lcom/discord/stores/StoreChannels;->getBlocking$app_productionDiscordExternalRelease(J)Lcom/discord/models/domain/ModelChannel;
+ iget-wide v5, v0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->$channelId:J
- move-result-object v5
-
- if-eqz v5, :cond_1
-
- iget-object v0, p0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->this$0:Lcom/discord/stores/StoreAnalytics;
-
- invoke-static {v0}, Lcom/discord/stores/StoreAnalytics;->access$getStores$p(Lcom/discord/stores/StoreAnalytics;)Lcom/discord/stores/StoreStream;
-
- move-result-object v0
-
- invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getMediaSettings$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreMediaSettings;
-
- move-result-object v0
-
- sget-object v1, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
-
- iget-object v4, p0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->$rtcConnectionId:Ljava/lang/String;
-
- iget-object v6, p0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->this$0:Lcom/discord/stores/StoreAnalytics;
-
- invoke-static {v6}, Lcom/discord/stores/StoreAnalytics;->access$getStores$p(Lcom/discord/stores/StoreAnalytics;)Lcom/discord/stores/StoreStream;
+ invoke-virtual {v1, v5, v6}, Lcom/discord/stores/StoreChannels;->getBlocking$app_productionDiscordExternalRelease(J)Lcom/discord/models/domain/ModelChannel;
move-result-object v6
- invoke-virtual {v6}, Lcom/discord/stores/StoreStream;->getVoiceStates$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreVoiceStates;
+ if-eqz v6, :cond_1
- move-result-object v6
+ iget-object v1, v0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->this$0:Lcom/discord/stores/StoreAnalytics;
- invoke-virtual {v6}, Lcom/discord/stores/StoreVoiceStates;->getMediaStatesBlocking()Ljava/util/Map;
+ invoke-static {v1}, Lcom/discord/stores/StoreAnalytics;->access$getStores$p(Lcom/discord/stores/StoreAnalytics;)Lcom/discord/stores/StoreStream;
- move-result-object v6
+ move-result-object v1
- invoke-virtual {v5}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
+ invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getMediaSettings$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreMediaSettings;
+
+ move-result-object v1
+
+ sget-object v2, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker;
+
+ iget-object v5, v0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->$rtcConnectionId:Ljava/lang/String;
+
+ iget-object v7, v0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->this$0:Lcom/discord/stores/StoreAnalytics;
+
+ invoke-static {v7}, Lcom/discord/stores/StoreAnalytics;->access$getStores$p(Lcom/discord/stores/StoreAnalytics;)Lcom/discord/stores/StoreStream;
move-result-object v7
- invoke-interface {v6, v7}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v7}, Lcom/discord/stores/StoreStream;->getVoiceStates$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreVoiceStates;
- move-result-object v6
+ move-result-object v7
- check-cast v6, Ljava/util/Map;
+ invoke-virtual {v7}, Lcom/discord/stores/StoreVoiceStates;->getMediaStatesBlocking()Ljava/util/Map;
- if-eqz v6, :cond_0
+ move-result-object v7
+
+ invoke-virtual {v6}, Lcom/discord/models/domain/ModelChannel;->getGuildId()Ljava/lang/Long;
+
+ move-result-object v8
+
+ invoke-interface {v7, v8}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+ move-result-object v7
+
+ check-cast v7, Ljava/util/Map;
+
+ if-eqz v7, :cond_0
goto :goto_0
:cond_0
invoke-static {}, Lt/q/l;->emptyMap()Ljava/util/Map;
- move-result-object v6
+ move-result-object v7
:goto_0
- iget-object v7, p0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->$duration:Ljava/lang/Long;
+ iget-object v8, v0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->$duration:Ljava/lang/Long;
- iget-object v8, p0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->$mediaSessionId:Ljava/lang/String;
+ iget-object v9, v0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->$mediaSessionId:Ljava/lang/String;
- iget-object v9, p0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->$feedbackRating:Lcom/discord/widgets/voice/feedback/FeedbackRating;
+ iget-object v10, v0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->$feedbackRating:Lcom/discord/widgets/voice/feedback/FeedbackRating;
- iget-object v10, p0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->$reasonCode:Ljava/lang/Integer;
+ iget-object v11, v0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->$reasonCode:Ljava/lang/Integer;
- iget-object v11, p0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->$reasonDescription:Ljava/lang/String;
+ iget-object v12, v0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->$reasonDescription:Ljava/lang/String;
- invoke-virtual {v0}, Lcom/discord/stores/StoreMediaSettings;->getVoiceConfigurationBlocking()Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+ invoke-virtual {v1}, Lcom/discord/stores/StoreMediaSettings;->getVoiceConfigurationBlocking()Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
- move-result-object v12
+ move-result-object v13
- invoke-virtual {v0}, Lcom/discord/stores/StoreMediaSettings;->getVideoHardwareScalingBlocking()Z
+ iget-object v14, v0, Lcom/discord/stores/StoreAnalytics$trackCallReportProblem$1;->this$0:Lcom/discord/stores/StoreAnalytics;
- move-result v13
+ invoke-static {v14}, Lcom/discord/stores/StoreAnalytics;->access$getStores$p(Lcom/discord/stores/StoreAnalytics;)Lcom/discord/stores/StoreStream;
- invoke-virtual {v0}, Lcom/discord/stores/StoreMediaSettings;->getAudioModeBlocking()I
+ move-result-object v14
- move-result v14
+ invoke-virtual {v14}, Lcom/discord/stores/StoreStream;->getAudioDevices$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreAudioDevices;
- invoke-virtual/range {v1 .. v14}, Lcom/discord/utilities/analytics/AnalyticsTracker;->callReportProblem(JLjava/lang/String;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/lang/Long;Ljava/lang/String;Lcom/discord/widgets/voice/feedback/FeedbackRating;Ljava/lang/Integer;Ljava/lang/String;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZI)V
+ move-result-object v14
+
+ invoke-virtual {v14}, Lcom/discord/stores/StoreAudioDevices;->getAudioDevicesState$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+
+ move-result-object v14
+
+ invoke-virtual {v14}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->getSelectedOutputDevice()Lcom/discord/stores/StoreAudioDevices$OutputDevice;
+
+ move-result-object v14
+
+ invoke-virtual {v1}, Lcom/discord/stores/StoreMediaSettings;->getVideoHardwareScalingBlocking()Z
+
+ move-result v15
+
+ invoke-virtual {v1}, Lcom/discord/stores/StoreMediaSettings;->getAudioModeBlocking()I
+
+ move-result v16
+
+ invoke-virtual/range {v2 .. v16}, Lcom/discord/utilities/analytics/AnalyticsTracker;->callReportProblem(JLjava/lang/String;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/lang/Long;Ljava/lang/String;Lcom/discord/widgets/voice/feedback/FeedbackRating;Ljava/lang/Integer;Ljava/lang/String;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Lcom/discord/stores/StoreAudioDevices$OutputDevice;ZI)V
:cond_1
return-void
diff --git a/com.discord/smali/com/discord/stores/StoreAudioDevices$AudioDevicesState.smali b/com.discord/smali/com/discord/stores/StoreAudioDevices$AudioDevicesState.smali
new file mode 100644
index 0000000000..7b9265b8b5
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreAudioDevices$AudioDevicesState.smali
@@ -0,0 +1,254 @@
+.class public final Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+.super Ljava/lang/Object;
+.source "StoreAudioDevices.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+ value = Lcom/discord/stores/StoreAudioDevices;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = "AudioDevicesState"
+.end annotation
+
+
+# instance fields
+.field public final audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
+
+.field public final selectedOutputDevice:Lcom/discord/stores/StoreAudioDevices$OutputDevice;
+
+
+# direct methods
+.method public constructor (Lcom/discord/utilities/media/AudioOutputState;Lcom/discord/stores/StoreAudioDevices$OutputDevice;)V
+ .locals 1
+
+ const/4 v0, 0x0
+
+ if-eqz p1, :cond_1
+
+ if-eqz p2, :cond_0
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ iput-object p1, p0, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
+
+ iput-object p2, p0, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->selectedOutputDevice:Lcom/discord/stores/StoreAudioDevices$OutputDevice;
+
+ return-void
+
+ :cond_0
+ const-string p1, "selectedOutputDevice"
+
+ invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+
+ throw v0
+
+ :cond_1
+ const-string p1, "audioOutputState"
+
+ invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+
+ throw v0
+.end method
+
+.method public static synthetic copy$default(Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;Lcom/discord/utilities/media/AudioOutputState;Lcom/discord/stores/StoreAudioDevices$OutputDevice;ILjava/lang/Object;)Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+ .locals 0
+
+ and-int/lit8 p4, p3, 0x1
+
+ if-eqz p4, :cond_0
+
+ iget-object p1, p0, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
+
+ :cond_0
+ and-int/lit8 p3, p3, 0x2
+
+ if-eqz p3, :cond_1
+
+ iget-object p2, p0, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->selectedOutputDevice:Lcom/discord/stores/StoreAudioDevices$OutputDevice;
+
+ :cond_1
+ invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->copy(Lcom/discord/utilities/media/AudioOutputState;Lcom/discord/stores/StoreAudioDevices$OutputDevice;)Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+
+ move-result-object p0
+
+ return-object p0
+.end method
+
+
+# virtual methods
+.method public final component1()Lcom/discord/utilities/media/AudioOutputState;
+ .locals 1
+
+ iget-object v0, p0, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
+
+ return-object v0
+.end method
+
+.method public final component2()Lcom/discord/stores/StoreAudioDevices$OutputDevice;
+ .locals 1
+
+ iget-object v0, p0, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->selectedOutputDevice:Lcom/discord/stores/StoreAudioDevices$OutputDevice;
+
+ return-object v0
+.end method
+
+.method public final copy(Lcom/discord/utilities/media/AudioOutputState;Lcom/discord/stores/StoreAudioDevices$OutputDevice;)Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+ .locals 1
+
+ const/4 v0, 0x0
+
+ if-eqz p1, :cond_1
+
+ if-eqz p2, :cond_0
+
+ new-instance v0, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+
+ invoke-direct {v0, p1, p2}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->(Lcom/discord/utilities/media/AudioOutputState;Lcom/discord/stores/StoreAudioDevices$OutputDevice;)V
+
+ return-object v0
+
+ :cond_0
+ const-string p1, "selectedOutputDevice"
+
+ invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+
+ throw v0
+
+ :cond_1
+ const-string p1, "audioOutputState"
+
+ invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+
+ throw v0
+.end method
+
+.method public equals(Ljava/lang/Object;)Z
+ .locals 2
+
+ if-eq p0, p1, :cond_1
+
+ instance-of v0, p1, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+
+ if-eqz v0, :cond_0
+
+ check-cast p1, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+
+ iget-object v0, p0, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
+
+ iget-object v1, p1, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
+
+ invoke-static {v0, v1}, Lt/u/b/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+ move-result v0
+
+ if-eqz v0, :cond_0
+
+ iget-object v0, p0, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->selectedOutputDevice:Lcom/discord/stores/StoreAudioDevices$OutputDevice;
+
+ iget-object p1, p1, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->selectedOutputDevice:Lcom/discord/stores/StoreAudioDevices$OutputDevice;
+
+ invoke-static {v0, p1}, Lt/u/b/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+ move-result p1
+
+ if-eqz p1, :cond_0
+
+ goto :goto_0
+
+ :cond_0
+ const/4 p1, 0x0
+
+ return p1
+
+ :cond_1
+ :goto_0
+ const/4 p1, 0x1
+
+ return p1
+.end method
+
+.method public final getAudioOutputState()Lcom/discord/utilities/media/AudioOutputState;
+ .locals 1
+
+ iget-object v0, p0, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
+
+ return-object v0
+.end method
+
+.method public final getSelectedOutputDevice()Lcom/discord/stores/StoreAudioDevices$OutputDevice;
+ .locals 1
+
+ iget-object v0, p0, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->selectedOutputDevice:Lcom/discord/stores/StoreAudioDevices$OutputDevice;
+
+ return-object v0
+.end method
+
+.method public hashCode()I
+ .locals 3
+
+ iget-object v0, p0, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
+
+ const/4 v1, 0x0
+
+ if-eqz v0, :cond_0
+
+ invoke-virtual {v0}, Lcom/discord/utilities/media/AudioOutputState;->hashCode()I
+
+ move-result v0
+
+ goto :goto_0
+
+ :cond_0
+ const/4 v0, 0x0
+
+ :goto_0
+ mul-int/lit8 v0, v0, 0x1f
+
+ iget-object v2, p0, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->selectedOutputDevice:Lcom/discord/stores/StoreAudioDevices$OutputDevice;
+
+ if-eqz v2, :cond_1
+
+ invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+ move-result v1
+
+ :cond_1
+ add-int/2addr v0, v1
+
+ return v0
+.end method
+
+.method public toString()Ljava/lang/String;
+ .locals 2
+
+ const-string v0, "AudioDevicesState(audioOutputState="
+
+ invoke-static {v0}, Le/e/b/a/a;->a(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+ move-result-object v0
+
+ iget-object v1, p0, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
+
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+ const-string v1, ", selectedOutputDevice="
+
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+ iget-object v1, p0, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->selectedOutputDevice:Lcom/discord/stores/StoreAudioDevices$OutputDevice;
+
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
+ const-string v1, ")"
+
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+ invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+
+ move-result-object v0
+
+ return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreAudioDevices$Companion.smali b/com.discord/smali/com/discord/stores/StoreAudioDevices$Companion.smali
new file mode 100644
index 0000000000..b10dd2ad4a
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreAudioDevices$Companion.smali
@@ -0,0 +1,70 @@
+.class public final Lcom/discord/stores/StoreAudioDevices$Companion;
+.super Ljava/lang/Object;
+.source "StoreAudioDevices.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+ value = Lcom/discord/stores/StoreAudioDevices;
+.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/StoreAudioDevices$Companion;->()V
+
+ return-void
+.end method
+
+.method public static synthetic DEFAULT_AUDIO_DEVICES_STATE$annotations()V
+ .locals 0
+ .annotation build Landroidx/annotation/VisibleForTesting;
+ .end annotation
+
+ return-void
+.end method
+
+.method public static synthetic DEFAULT_OUTPUT_STATE$annotations()V
+ .locals 0
+ .annotation build Landroidx/annotation/VisibleForTesting;
+ .end annotation
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public final getDEFAULT_AUDIO_DEVICES_STATE$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+ .locals 1
+
+ invoke-static {}, Lcom/discord/stores/StoreAudioDevices;->access$getDEFAULT_AUDIO_DEVICES_STATE$cp()Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+
+ move-result-object v0
+
+ return-object v0
+.end method
+
+.method public final getDEFAULT_OUTPUT_STATE$app_productionDiscordExternalRelease()Lcom/discord/utilities/media/AudioOutputState;
+ .locals 1
+
+ invoke-static {}, Lcom/discord/stores/StoreAudioDevices;->access$getDEFAULT_OUTPUT_STATE$cp()Lcom/discord/utilities/media/AudioOutputState;
+
+ move-result-object v0
+
+ return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreAudioDevices$OutputDevice$NonSpeaker.smali b/com.discord/smali/com/discord/stores/StoreAudioDevices$OutputDevice$NonSpeaker.smali
new file mode 100644
index 0000000000..6e32c08db2
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreAudioDevices$OutputDevice$NonSpeaker.smali
@@ -0,0 +1,42 @@
+.class public final Lcom/discord/stores/StoreAudioDevices$OutputDevice$NonSpeaker;
+.super Lcom/discord/stores/StoreAudioDevices$OutputDevice;
+.source "StoreAudioDevices.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+ value = Lcom/discord/stores/StoreAudioDevices$OutputDevice;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = "NonSpeaker"
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/stores/StoreAudioDevices$OutputDevice$NonSpeaker;
+
+
+# direct methods
+.method public static constructor ()V
+ .locals 1
+
+ new-instance v0, Lcom/discord/stores/StoreAudioDevices$OutputDevice$NonSpeaker;
+
+ invoke-direct {v0}, Lcom/discord/stores/StoreAudioDevices$OutputDevice$NonSpeaker;->()V
+
+ sput-object v0, Lcom/discord/stores/StoreAudioDevices$OutputDevice$NonSpeaker;->INSTANCE:Lcom/discord/stores/StoreAudioDevices$OutputDevice$NonSpeaker;
+
+ return-void
+.end method
+
+.method public constructor ()V
+ .locals 1
+
+ const/4 v0, 0x0
+
+ invoke-direct {p0, v0}, Lcom/discord/stores/StoreAudioDevices$OutputDevice;->(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+ return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreAudioDevices$OutputDevice$Speaker.smali b/com.discord/smali/com/discord/stores/StoreAudioDevices$OutputDevice$Speaker.smali
new file mode 100644
index 0000000000..d373cf69f2
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreAudioDevices$OutputDevice$Speaker.smali
@@ -0,0 +1,42 @@
+.class public final Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;
+.super Lcom/discord/stores/StoreAudioDevices$OutputDevice;
+.source "StoreAudioDevices.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+ value = Lcom/discord/stores/StoreAudioDevices$OutputDevice;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = "Speaker"
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;
+
+
+# direct methods
+.method public static constructor ()V
+ .locals 1
+
+ new-instance v0, Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;
+
+ invoke-direct {v0}, Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;->()V
+
+ sput-object v0, Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;->INSTANCE:Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;
+
+ return-void
+.end method
+
+.method public constructor ()V
+ .locals 1
+
+ const/4 v0, 0x0
+
+ invoke-direct {p0, v0}, Lcom/discord/stores/StoreAudioDevices$OutputDevice;->(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+ return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreAudioDevices$OutputDevice.smali b/com.discord/smali/com/discord/stores/StoreAudioDevices$OutputDevice.smali
new file mode 100644
index 0000000000..168fedc2fb
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreAudioDevices$OutputDevice.smali
@@ -0,0 +1,39 @@
+.class public abstract Lcom/discord/stores/StoreAudioDevices$OutputDevice;
+.super Ljava/lang/Object;
+.source "StoreAudioDevices.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+ value = Lcom/discord/stores/StoreAudioDevices;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x409
+ name = "OutputDevice"
+.end annotation
+
+.annotation system Ldalvik/annotation/MemberClasses;
+ value = {
+ Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;,
+ Lcom/discord/stores/StoreAudioDevices$OutputDevice$NonSpeaker;
+ }
+.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/StoreAudioDevices$OutputDevice;->()V
+
+ return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreAudioDevices$init$1$1.smali b/com.discord/smali/com/discord/stores/StoreAudioDevices$init$1$1.smali
new file mode 100644
index 0000000000..0a6da8b5f8
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreAudioDevices$init$1$1.smali
@@ -0,0 +1,74 @@
+.class public final Lcom/discord/stores/StoreAudioDevices$init$1$1;
+.super Lt/u/b/k;
+.source "StoreAudioDevices.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/stores/StoreAudioDevices$init$1;->invoke(Lcom/discord/utilities/media/AudioOutputState;)V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Lt/u/b/k;",
+ "Lkotlin/jvm/functions/Function0<",
+ "Lkotlin/Unit;",
+ ">;"
+ }
+.end annotation
+
+
+# instance fields
+.field public final synthetic $it:Lcom/discord/utilities/media/AudioOutputState;
+
+.field public final synthetic this$0:Lcom/discord/stores/StoreAudioDevices$init$1;
+
+
+# direct methods
+.method public constructor (Lcom/discord/stores/StoreAudioDevices$init$1;Lcom/discord/utilities/media/AudioOutputState;)V
+ .locals 0
+
+ iput-object p1, p0, Lcom/discord/stores/StoreAudioDevices$init$1$1;->this$0:Lcom/discord/stores/StoreAudioDevices$init$1;
+
+ iput-object p2, p0, Lcom/discord/stores/StoreAudioDevices$init$1$1;->$it:Lcom/discord/utilities/media/AudioOutputState;
+
+ const/4 p1, 0x0
+
+ invoke-direct {p0, p1}, Lt/u/b/k;->(I)V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic invoke()Ljava/lang/Object;
+ .locals 1
+
+ invoke-virtual {p0}, Lcom/discord/stores/StoreAudioDevices$init$1$1;->invoke()V
+
+ sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+ return-object v0
+.end method
+
+.method public final invoke()V
+ .locals 2
+
+ iget-object v0, p0, Lcom/discord/stores/StoreAudioDevices$init$1$1;->this$0:Lcom/discord/stores/StoreAudioDevices$init$1;
+
+ iget-object v0, v0, Lcom/discord/stores/StoreAudioDevices$init$1;->this$0:Lcom/discord/stores/StoreAudioDevices;
+
+ iget-object v1, p0, Lcom/discord/stores/StoreAudioDevices$init$1$1;->$it:Lcom/discord/utilities/media/AudioOutputState;
+
+ invoke-static {v0, v1}, Lcom/discord/stores/StoreAudioDevices;->access$updateAudioOutputState(Lcom/discord/stores/StoreAudioDevices;Lcom/discord/utilities/media/AudioOutputState;)V
+
+ return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreAudioDevices$init$1.smali b/com.discord/smali/com/discord/stores/StoreAudioDevices$init$1.smali
new file mode 100644
index 0000000000..697c630594
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreAudioDevices$init$1.smali
@@ -0,0 +1,88 @@
+.class public final Lcom/discord/stores/StoreAudioDevices$init$1;
+.super Lt/u/b/k;
+.source "StoreAudioDevices.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function1;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/stores/StoreAudioDevices;->init()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Lt/u/b/k;",
+ "Lkotlin/jvm/functions/Function1<",
+ "Lcom/discord/utilities/media/AudioOutputState;",
+ "Lkotlin/Unit;",
+ ">;"
+ }
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/stores/StoreAudioDevices;
+
+
+# direct methods
+.method public constructor (Lcom/discord/stores/StoreAudioDevices;)V
+ .locals 0
+
+ iput-object p1, p0, Lcom/discord/stores/StoreAudioDevices$init$1;->this$0:Lcom/discord/stores/StoreAudioDevices;
+
+ const/4 p1, 0x1
+
+ invoke-direct {p0, p1}, Lt/u/b/k;->(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/utilities/media/AudioOutputState;
+
+ invoke-virtual {p0, p1}, Lcom/discord/stores/StoreAudioDevices$init$1;->invoke(Lcom/discord/utilities/media/AudioOutputState;)V
+
+ sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+ return-object p1
+.end method
+
+.method public final invoke(Lcom/discord/utilities/media/AudioOutputState;)V
+ .locals 2
+
+ if-eqz p1, :cond_0
+
+ iget-object v0, p0, Lcom/discord/stores/StoreAudioDevices$init$1;->this$0:Lcom/discord/stores/StoreAudioDevices;
+
+ invoke-static {v0}, Lcom/discord/stores/StoreAudioDevices;->access$getDispatcher$p(Lcom/discord/stores/StoreAudioDevices;)Lcom/discord/stores/Dispatcher;
+
+ move-result-object v0
+
+ new-instance v1, Lcom/discord/stores/StoreAudioDevices$init$1$1;
+
+ invoke-direct {v1, p0, p1}, Lcom/discord/stores/StoreAudioDevices$init$1$1;->(Lcom/discord/stores/StoreAudioDevices$init$1;Lcom/discord/utilities/media/AudioOutputState;)V
+
+ invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
+
+ return-void
+
+ :cond_0
+ const-string p1, "it"
+
+ invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+
+ const/4 p1, 0x0
+
+ throw p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreAudioDevices$toggleSpeakerOutput$1.smali b/com.discord/smali/com/discord/stores/StoreAudioDevices$toggleSpeakerOutput$1.smali
new file mode 100644
index 0000000000..afe59bc389
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreAudioDevices$toggleSpeakerOutput$1.smali
@@ -0,0 +1,97 @@
+.class public final Lcom/discord/stores/StoreAudioDevices$toggleSpeakerOutput$1;
+.super Lt/u/b/k;
+.source "StoreAudioDevices.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/stores/StoreAudioDevices;->toggleSpeakerOutput()V
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Lt/u/b/k;",
+ "Lkotlin/jvm/functions/Function0<",
+ "Lkotlin/Unit;",
+ ">;"
+ }
+.end annotation
+
+
+# instance fields
+.field public final synthetic this$0:Lcom/discord/stores/StoreAudioDevices;
+
+
+# direct methods
+.method public constructor (Lcom/discord/stores/StoreAudioDevices;)V
+ .locals 0
+
+ iput-object p1, p0, Lcom/discord/stores/StoreAudioDevices$toggleSpeakerOutput$1;->this$0:Lcom/discord/stores/StoreAudioDevices;
+
+ const/4 p1, 0x0
+
+ invoke-direct {p0, p1}, Lt/u/b/k;->(I)V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public bridge synthetic invoke()Ljava/lang/Object;
+ .locals 1
+
+ invoke-virtual {p0}, Lcom/discord/stores/StoreAudioDevices$toggleSpeakerOutput$1;->invoke()V
+
+ sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit;
+
+ return-object v0
+.end method
+
+.method public final invoke()V
+ .locals 3
+
+ iget-object v0, p0, Lcom/discord/stores/StoreAudioDevices$toggleSpeakerOutput$1;->this$0:Lcom/discord/stores/StoreAudioDevices;
+
+ invoke-virtual {v0}, Lcom/discord/stores/StoreAudioDevices;->getAudioDevicesState$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+
+ move-result-object v1
+
+ invoke-virtual {v1}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->getSelectedOutputDevice()Lcom/discord/stores/StoreAudioDevices$OutputDevice;
+
+ move-result-object v1
+
+ instance-of v2, v1, Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;
+
+ if-eqz v2, :cond_0
+
+ sget-object v1, Lcom/discord/stores/StoreAudioDevices$OutputDevice$NonSpeaker;->INSTANCE:Lcom/discord/stores/StoreAudioDevices$OutputDevice$NonSpeaker;
+
+ goto :goto_0
+
+ :cond_0
+ instance-of v1, v1, Lcom/discord/stores/StoreAudioDevices$OutputDevice$NonSpeaker;
+
+ if-eqz v1, :cond_1
+
+ sget-object v1, Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;->INSTANCE:Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;
+
+ :goto_0
+ invoke-static {v0, v1}, Lcom/discord/stores/StoreAudioDevices;->access$updateSelectedOutputDevice(Lcom/discord/stores/StoreAudioDevices;Lcom/discord/stores/StoreAudioDevices$OutputDevice;)V
+
+ return-void
+
+ :cond_1
+ new-instance v0, Lt/g;
+
+ invoke-direct {v0}, Lt/g;->()V
+
+ throw v0
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreAudioDevices.smali b/com.discord/smali/com/discord/stores/StoreAudioDevices.smali
new file mode 100644
index 0000000000..efc040aef1
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreAudioDevices.smali
@@ -0,0 +1,483 @@
+.class public final Lcom/discord/stores/StoreAudioDevices;
+.super Lcom/discord/stores/Store;
+.source "StoreAudioDevices.kt"
+
+# interfaces
+.implements Lcom/discord/stores/DispatchHandler;
+
+
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+ value = {
+ Lcom/discord/stores/StoreAudioDevices$OutputDevice;,
+ Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;,
+ Lcom/discord/stores/StoreAudioDevices$Companion;
+ }
+.end annotation
+
+
+# static fields
+.field public static final Companion:Lcom/discord/stores/StoreAudioDevices$Companion;
+
+.field public static final DEFAULT_AUDIO_DEVICES_STATE:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+
+.field public static final DEFAULT_OUTPUT_DEVICE:Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;
+
+.field public static final DEFAULT_OUTPUT_STATE:Lcom/discord/utilities/media/AudioOutputState;
+
+
+# instance fields
+.field public audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+
+.field public final audioDevicesStateSubject:Lrx/subjects/SerializedSubject;
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Lrx/subjects/SerializedSubject<",
+ "Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;",
+ "Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;",
+ ">;"
+ }
+ .end annotation
+.end field
+
+.field public final audioOutputMonitor:Lcom/discord/utilities/media/AudioOutputMonitor;
+
+.field public final dispatcher:Lcom/discord/stores/Dispatcher;
+
+.field public isDirty:Z
+
+
+# direct methods
+.method public static constructor ()V
+ .locals 3
+
+ new-instance v0, Lcom/discord/stores/StoreAudioDevices$Companion;
+
+ const/4 v1, 0x0
+
+ invoke-direct {v0, v1}, Lcom/discord/stores/StoreAudioDevices$Companion;->(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+ sput-object v0, Lcom/discord/stores/StoreAudioDevices;->Companion:Lcom/discord/stores/StoreAudioDevices$Companion;
+
+ sget-object v0, Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;->INSTANCE:Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;
+
+ sput-object v0, Lcom/discord/stores/StoreAudioDevices;->DEFAULT_OUTPUT_DEVICE:Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;
+
+ new-instance v0, Lcom/discord/utilities/media/AudioOutputState;
+
+ const/4 v1, 0x1
+
+ invoke-direct {v0, v1, v1, v1, v1}, Lcom/discord/utilities/media/AudioOutputState;->(ZZZZ)V
+
+ sput-object v0, Lcom/discord/stores/StoreAudioDevices;->DEFAULT_OUTPUT_STATE:Lcom/discord/utilities/media/AudioOutputState;
+
+ new-instance v0, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+
+ sget-object v1, Lcom/discord/stores/StoreAudioDevices;->DEFAULT_OUTPUT_STATE:Lcom/discord/utilities/media/AudioOutputState;
+
+ sget-object v2, Lcom/discord/stores/StoreAudioDevices;->DEFAULT_OUTPUT_DEVICE:Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;
+
+ invoke-direct {v0, v1, v2}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->(Lcom/discord/utilities/media/AudioOutputState;Lcom/discord/stores/StoreAudioDevices$OutputDevice;)V
+
+ sput-object v0, Lcom/discord/stores/StoreAudioDevices;->DEFAULT_AUDIO_DEVICES_STATE:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+
+ return-void
+.end method
+
+.method public constructor (Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/media/AudioOutputMonitor;)V
+ .locals 1
+
+ const/4 v0, 0x0
+
+ if-eqz p1, :cond_1
+
+ if-eqz p2, :cond_0
+
+ invoke-direct {p0}, Lcom/discord/stores/Store;->()V
+
+ iput-object p1, p0, Lcom/discord/stores/StoreAudioDevices;->dispatcher:Lcom/discord/stores/Dispatcher;
+
+ iput-object p2, p0, Lcom/discord/stores/StoreAudioDevices;->audioOutputMonitor:Lcom/discord/utilities/media/AudioOutputMonitor;
+
+ sget-object p1, Lcom/discord/stores/StoreAudioDevices;->DEFAULT_AUDIO_DEVICES_STATE:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+
+ iput-object p1, p0, Lcom/discord/stores/StoreAudioDevices;->audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+
+ new-instance p1, Lrx/subjects/SerializedSubject;
+
+ iget-object p2, p0, Lcom/discord/stores/StoreAudioDevices;->audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+
+ invoke-static {p2}, Lrx/subjects/BehaviorSubject;->a(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject;
+
+ move-result-object p2
+
+ invoke-direct {p1, p2}, Lrx/subjects/SerializedSubject;->(Lrx/subjects/Subject;)V
+
+ iput-object p1, p0, Lcom/discord/stores/StoreAudioDevices;->audioDevicesStateSubject:Lrx/subjects/SerializedSubject;
+
+ return-void
+
+ :cond_0
+ const-string p1, "audioOutputMonitor"
+
+ invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+
+ throw v0
+
+ :cond_1
+ const-string p1, "dispatcher"
+
+ invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+
+ throw v0
+.end method
+
+.method public synthetic constructor (Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/media/AudioOutputMonitor;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ .locals 0
+
+ and-int/lit8 p3, p3, 0x2
+
+ if-eqz p3, :cond_0
+
+ sget-object p2, Lcom/discord/utilities/media/AudioOutputMonitor;->Companion:Lcom/discord/utilities/media/AudioOutputMonitor$Companion;
+
+ invoke-virtual {p2}, Lcom/discord/utilities/media/AudioOutputMonitor$Companion;->getINSTANCE()Lcom/discord/utilities/media/AudioOutputMonitor;
+
+ move-result-object p2
+
+ :cond_0
+ invoke-direct {p0, p1, p2}, Lcom/discord/stores/StoreAudioDevices;->(Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/media/AudioOutputMonitor;)V
+
+ return-void
+.end method
+
+.method public static final synthetic access$getDEFAULT_AUDIO_DEVICES_STATE$cp()Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+ .locals 1
+
+ sget-object v0, Lcom/discord/stores/StoreAudioDevices;->DEFAULT_AUDIO_DEVICES_STATE:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+
+ return-object v0
+.end method
+
+.method public static final synthetic access$getDEFAULT_OUTPUT_STATE$cp()Lcom/discord/utilities/media/AudioOutputState;
+ .locals 1
+
+ sget-object v0, Lcom/discord/stores/StoreAudioDevices;->DEFAULT_OUTPUT_STATE:Lcom/discord/utilities/media/AudioOutputState;
+
+ return-object v0
+.end method
+
+.method public static final synthetic access$getDispatcher$p(Lcom/discord/stores/StoreAudioDevices;)Lcom/discord/stores/Dispatcher;
+ .locals 0
+
+ iget-object p0, p0, Lcom/discord/stores/StoreAudioDevices;->dispatcher:Lcom/discord/stores/Dispatcher;
+
+ return-object p0
+.end method
+
+.method public static final synthetic access$updateAudioOutputState(Lcom/discord/stores/StoreAudioDevices;Lcom/discord/utilities/media/AudioOutputState;)V
+ .locals 0
+
+ invoke-direct {p0, p1}, Lcom/discord/stores/StoreAudioDevices;->updateAudioOutputState(Lcom/discord/utilities/media/AudioOutputState;)V
+
+ return-void
+.end method
+
+.method public static final synthetic access$updateSelectedOutputDevice(Lcom/discord/stores/StoreAudioDevices;Lcom/discord/stores/StoreAudioDevices$OutputDevice;)V
+ .locals 0
+
+ invoke-direct {p0, p1}, Lcom/discord/stores/StoreAudioDevices;->updateSelectedOutputDevice(Lcom/discord/stores/StoreAudioDevices$OutputDevice;)V
+
+ return-void
+.end method
+
+.method private final autoSelectAudioOutput()V
+ .locals 1
+ .annotation runtime Lcom/discord/stores/StoreThread;
+ .end annotation
+
+ iget-object v0, p0, Lcom/discord/stores/StoreAudioDevices;->audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+
+ invoke-virtual {v0}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->getAudioOutputState()Lcom/discord/utilities/media/AudioOutputState;
+
+ move-result-object v0
+
+ invoke-virtual {v0}, Lcom/discord/utilities/media/AudioOutputState;->isExternalAudioOutputConnected()Z
+
+ move-result v0
+
+ if-eqz v0, :cond_0
+
+ sget-object v0, Lcom/discord/stores/StoreAudioDevices$OutputDevice$NonSpeaker;->INSTANCE:Lcom/discord/stores/StoreAudioDevices$OutputDevice$NonSpeaker;
+
+ invoke-direct {p0, v0}, Lcom/discord/stores/StoreAudioDevices;->updateSelectedOutputDevice(Lcom/discord/stores/StoreAudioDevices$OutputDevice;)V
+
+ goto :goto_0
+
+ :cond_0
+ sget-object v0, Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;->INSTANCE:Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;
+
+ invoke-direct {p0, v0}, Lcom/discord/stores/StoreAudioDevices;->updateSelectedOutputDevice(Lcom/discord/stores/StoreAudioDevices$OutputDevice;)V
+
+ :goto_0
+ return-void
+.end method
+
+.method private final updateAudioOutputState(Lcom/discord/utilities/media/AudioOutputState;)V
+ .locals 4
+ .annotation runtime Lcom/discord/stores/StoreThread;
+ .end annotation
+
+ iget-object v0, p0, Lcom/discord/stores/StoreAudioDevices;->audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+
+ invoke-virtual {v0}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->getAudioOutputState()Lcom/discord/utilities/media/AudioOutputState;
+
+ move-result-object v0
+
+ invoke-virtual {v0}, Lcom/discord/utilities/media/AudioOutputState;->isExternalAudioOutputConnected()Z
+
+ move-result v0
+
+ iget-object v1, p0, Lcom/discord/stores/StoreAudioDevices;->audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+
+ const/4 v2, 0x0
+
+ const/4 v3, 0x2
+
+ invoke-static {v1, p1, v2, v3, v2}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->copy$default(Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;Lcom/discord/utilities/media/AudioOutputState;Lcom/discord/stores/StoreAudioDevices$OutputDevice;ILjava/lang/Object;)Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+
+ move-result-object v1
+
+ iput-object v1, p0, Lcom/discord/stores/StoreAudioDevices;->audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+
+ if-nez v0, :cond_0
+
+ invoke-virtual {p1}, Lcom/discord/utilities/media/AudioOutputState;->isExternalAudioOutputConnected()Z
+
+ move-result p1
+
+ if-eqz p1, :cond_0
+
+ sget-object p1, Lcom/discord/stores/StoreAudioDevices$OutputDevice$NonSpeaker;->INSTANCE:Lcom/discord/stores/StoreAudioDevices$OutputDevice$NonSpeaker;
+
+ invoke-direct {p0, p1}, Lcom/discord/stores/StoreAudioDevices;->updateSelectedOutputDevice(Lcom/discord/stores/StoreAudioDevices$OutputDevice;)V
+
+ :cond_0
+ const/4 p1, 0x1
+
+ iput-boolean p1, p0, Lcom/discord/stores/StoreAudioDevices;->isDirty:Z
+
+ return-void
+.end method
+
+.method private final updateSelectedOutputDevice(Lcom/discord/stores/StoreAudioDevices$OutputDevice;)V
+ .locals 3
+ .annotation runtime Lcom/discord/stores/StoreThread;
+ .end annotation
+
+ iget-object v0, p0, Lcom/discord/stores/StoreAudioDevices;->audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+
+ const/4 v1, 0x1
+
+ const/4 v2, 0x0
+
+ invoke-static {v0, v2, p1, v1, v2}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->copy$default(Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;Lcom/discord/utilities/media/AudioOutputState;Lcom/discord/stores/StoreAudioDevices$OutputDevice;ILjava/lang/Object;)Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+
+ move-result-object p1
+
+ iput-object p1, p0, Lcom/discord/stores/StoreAudioDevices;->audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+
+ iput-boolean v1, p0, Lcom/discord/stores/StoreAudioDevices;->isDirty:Z
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public final getAudioDevicesState()Lrx/Observable;
+ .locals 2
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "()",
+ "Lrx/Observable<",
+ "Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;",
+ ">;"
+ }
+ .end annotation
+
+ iget-object v0, p0, Lcom/discord/stores/StoreAudioDevices;->audioDevicesStateSubject: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;->a()Lrx/Observable;
+
+ move-result-object v0
+
+ const-string v1, "audioDevicesStateSubject\u2026 .distinctUntilChanged()"
+
+ invoke-static {v0, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ return-object v0
+.end method
+
+.method public final getAudioDevicesState$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+ .locals 1
+
+ iget-object v0, p0, Lcom/discord/stores/StoreAudioDevices;->audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+
+ return-object v0
+.end method
+
+.method public final handleStreamRtcConnectionStateChange(Lcom/discord/rtcconnection/RtcConnection$State;)V
+ .locals 1
+ .annotation runtime Lcom/discord/stores/StoreThread;
+ .end annotation
+
+ if-eqz p1, :cond_2
+
+ sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->a:Lcom/discord/rtcconnection/RtcConnection$State$f;
+
+ invoke-static {p1, v0}, Lt/u/b/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+ move-result p1
+
+ if-eqz p1, :cond_0
+
+ iget-object p1, p0, Lcom/discord/stores/StoreAudioDevices;->audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+
+ invoke-virtual {p1}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->getAudioOutputState()Lcom/discord/utilities/media/AudioOutputState;
+
+ move-result-object p1
+
+ invoke-virtual {p1}, Lcom/discord/utilities/media/AudioOutputState;->isExternalAudioOutputConnected()Z
+
+ move-result p1
+
+ if-nez p1, :cond_0
+
+ const/4 p1, 0x1
+
+ goto :goto_0
+
+ :cond_0
+ const/4 p1, 0x0
+
+ :goto_0
+ if-eqz p1, :cond_1
+
+ sget-object p1, Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;->INSTANCE:Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;
+
+ invoke-direct {p0, p1}, Lcom/discord/stores/StoreAudioDevices;->updateSelectedOutputDevice(Lcom/discord/stores/StoreAudioDevices$OutputDevice;)V
+
+ :cond_1
+ return-void
+
+ :cond_2
+ const-string p1, "state"
+
+ invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+
+ const/4 p1, 0x0
+
+ throw p1
+.end method
+
+.method public final handleVoiceChannelSelected()V
+ .locals 0
+ .annotation runtime Lcom/discord/stores/StoreThread;
+ .end annotation
+
+ invoke-direct {p0}, Lcom/discord/stores/StoreAudioDevices;->autoSelectAudioOutput()V
+
+ return-void
+.end method
+
+.method public final init()V
+ .locals 10
+
+ iget-object v0, p0, Lcom/discord/stores/StoreAudioDevices;->audioOutputMonitor:Lcom/discord/utilities/media/AudioOutputMonitor;
+
+ invoke-virtual {v0}, Lcom/discord/utilities/media/AudioOutputMonitor;->getOutputState()Lrx/Observable;
+
+ move-result-object v1
+
+ const-class v2, Lcom/discord/stores/StoreAudioDevices;
+
+ new-instance v7, Lcom/discord/stores/StoreAudioDevices$init$1;
+
+ invoke-direct {v7, p0}, Lcom/discord/stores/StoreAudioDevices$init$1;->(Lcom/discord/stores/StoreAudioDevices;)V
+
+ const/4 v3, 0x0
+
+ const/4 v4, 0x0
+
+ const/4 v5, 0x0
+
+ const/4 v6, 0x0
+
+ 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
+.end method
+
+.method public onDispatchEnded()V
+ .locals 2
+
+ iget-boolean v0, p0, Lcom/discord/stores/StoreAudioDevices;->isDirty:Z
+
+ if-nez v0, :cond_0
+
+ return-void
+
+ :cond_0
+ iget-object v0, p0, Lcom/discord/stores/StoreAudioDevices;->audioDevicesStateSubject:Lrx/subjects/SerializedSubject;
+
+ iget-object v1, p0, Lcom/discord/stores/StoreAudioDevices;->audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+
+ invoke-virtual {v0, v1}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
+
+ const/4 v0, 0x0
+
+ iput-boolean v0, p0, Lcom/discord/stores/StoreAudioDevices;->isDirty:Z
+
+ return-void
+.end method
+
+.method public final setAudioDevicesState$app_productionDiscordExternalRelease(Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;)V
+ .locals 0
+
+ if-eqz p1, :cond_0
+
+ iput-object p1, p0, Lcom/discord/stores/StoreAudioDevices;->audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+
+ return-void
+
+ :cond_0
+ const-string p1, ""
+
+ invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+
+ const/4 p1, 0x0
+
+ throw p1
+.end method
+
+.method public final toggleSpeakerOutput()V
+ .locals 2
+
+ iget-object v0, p0, Lcom/discord/stores/StoreAudioDevices;->dispatcher:Lcom/discord/stores/Dispatcher;
+
+ new-instance v1, Lcom/discord/stores/StoreAudioDevices$toggleSpeakerOutput$1;
+
+ invoke-direct {v1, p0}, Lcom/discord/stores/StoreAudioDevices$toggleSpeakerOutput$1;->(Lcom/discord/stores/StoreAudioDevices;)V
+
+ invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V
+
+ return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration.smali b/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration.smali
index c45671cc9c..2f4d9263b7 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration.smali
@@ -15,67 +15,41 @@
# instance fields
-.field public final audioMode:I
+.field public final audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
-.field public final audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
+.field public final audioMode:I
.field public final connectionState:Lcom/discord/rtcconnection/RtcConnection$State;
-.field public final outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
-
-.field public final streamConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
-
# direct methods
-.method public constructor (Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/models/domain/ModelVoice$OutputMode;Lcom/discord/utilities/media/AudioOutputState;I)V
+.method public constructor (Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;I)V
.locals 1
const/4 v0, 0x0
- if-eqz p1, :cond_3
+ if-eqz p1, :cond_1
- if-eqz p2, :cond_2
-
- if-eqz p3, :cond_1
-
- if-eqz p4, :cond_0
+ if-eqz p2, :cond_0
invoke-direct {p0}, Ljava/lang/Object;->()V
iput-object p1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->connectionState:Lcom/discord/rtcconnection/RtcConnection$State;
- iput-object p2, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->streamConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
+ iput-object p2, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
- iput-object p3, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- iput-object p4, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
-
- iput p5, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioMode:I
+ iput p3, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioMode:I
return-void
:cond_0
- const-string p1, "audioOutputState"
+ const-string p1, "audioDevicesState"
invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
throw v0
:cond_1
- const-string p1, "outputMode"
-
- invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
-
- throw v0
-
- :cond_2
- const-string p1, "streamConnectionState"
-
- invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
-
- throw v0
-
- :cond_3
const-string p1, "connectionState"
invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
@@ -83,65 +57,31 @@
throw v0
.end method
-.method public static synthetic copy$default(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/models/domain/ModelVoice$OutputMode;Lcom/discord/utilities/media/AudioOutputState;IILjava/lang/Object;)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
- .locals 3
+.method public static synthetic copy$default(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;IILjava/lang/Object;)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
+ .locals 0
- and-int/lit8 p7, p6, 0x1
+ and-int/lit8 p5, p4, 0x1
- if-eqz p7, :cond_0
+ if-eqz p5, :cond_0
iget-object p1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->connectionState:Lcom/discord/rtcconnection/RtcConnection$State;
:cond_0
- and-int/lit8 p7, p6, 0x2
+ and-int/lit8 p5, p4, 0x2
- if-eqz p7, :cond_1
+ if-eqz p5, :cond_1
- iget-object p2, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->streamConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
+ iget-object p2, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
:cond_1
- move-object p7, p2
+ and-int/lit8 p4, p4, 0x4
- and-int/lit8 p2, p6, 0x4
+ if-eqz p4, :cond_2
- if-eqz p2, :cond_2
-
- iget-object p3, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
+ iget p3, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioMode:I
:cond_2
- move-object v0, p3
-
- and-int/lit8 p2, p6, 0x8
-
- if-eqz p2, :cond_3
-
- iget-object p4, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
-
- :cond_3
- move-object v1, p4
-
- and-int/lit8 p2, p6, 0x10
-
- if-eqz p2, :cond_4
-
- iget p5, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioMode:I
-
- :cond_4
- move v2, p5
-
- move-object p2, p0
-
- move-object p3, p1
-
- move-object p4, p7
-
- move-object p5, v0
-
- move-object p6, v1
-
- move p7, v2
-
- invoke-virtual/range {p2 .. p7}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->copy(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/models/domain/ModelVoice$OutputMode;Lcom/discord/utilities/media/AudioOutputState;I)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
+ invoke-virtual {p0, p1, p2, p3}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->copy(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;I)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
move-result-object p0
@@ -158,31 +98,15 @@
return-object v0
.end method
-.method public final component2()Lcom/discord/rtcconnection/RtcConnection$State;
+.method public final component2()Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
.locals 1
- iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->streamConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
+ iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
return-object v0
.end method
-.method public final component3()Lcom/discord/models/domain/ModelVoice$OutputMode;
- .locals 1
-
- iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- return-object v0
-.end method
-
-.method public final component4()Lcom/discord/utilities/media/AudioOutputState;
- .locals 1
-
- iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
-
- return-object v0
-.end method
-
-.method public final component5()I
+.method public final component3()I
.locals 1
iget v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioMode:I
@@ -190,59 +114,29 @@
return v0
.end method
-.method public final copy(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/models/domain/ModelVoice$OutputMode;Lcom/discord/utilities/media/AudioOutputState;I)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
- .locals 7
+.method public final copy(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;I)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
+ .locals 1
const/4 v0, 0x0
- if-eqz p1, :cond_3
+ if-eqz p1, :cond_1
- if-eqz p2, :cond_2
-
- if-eqz p3, :cond_1
-
- if-eqz p4, :cond_0
+ if-eqz p2, :cond_0
new-instance v0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
- move-object v1, v0
-
- move-object v2, p1
-
- move-object v3, p2
-
- move-object v4, p3
-
- move-object v5, p4
-
- move v6, p5
-
- invoke-direct/range {v1 .. v6}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/models/domain/ModelVoice$OutputMode;Lcom/discord/utilities/media/AudioOutputState;I)V
+ invoke-direct {v0, p1, p2, p3}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;I)V
return-object v0
:cond_0
- const-string p1, "audioOutputState"
+ const-string p1, "audioDevicesState"
invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
throw v0
:cond_1
- const-string p1, "outputMode"
-
- invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
-
- throw v0
-
- :cond_2
- const-string p1, "streamConnectionState"
-
- invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
-
- throw v0
-
- :cond_3
const-string p1, "connectionState"
invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
@@ -271,29 +165,9 @@
if-eqz v0, :cond_0
- iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->streamConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
+ iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
- iget-object v1, p1, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->streamConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
-
- invoke-static {v0, v1}, Lt/u/b/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
- move-result v0
-
- if-eqz v0, :cond_0
-
- iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- iget-object v1, p1, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- invoke-static {v0, v1}, Lt/u/b/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
- move-result v0
-
- if-eqz v0, :cond_0
-
- iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
-
- iget-object v1, p1, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
+ iget-object v1, p1, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
invoke-static {v0, v1}, Lt/u/b/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
@@ -321,6 +195,14 @@
return p1
.end method
+.method public final getAudioDevicesState()Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+ .locals 1
+
+ iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+
+ return-object v0
+.end method
+
.method public final getAudioMode()I
.locals 1
@@ -329,14 +211,6 @@
return v0
.end method
-.method public final getAudioOutputState()Lcom/discord/utilities/media/AudioOutputState;
- .locals 1
-
- iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
-
- return-object v0
-.end method
-
.method public final getConnectionState()Lcom/discord/rtcconnection/RtcConnection$State;
.locals 1
@@ -345,22 +219,6 @@
return-object v0
.end method
-.method public final getOutputMode()Lcom/discord/models/domain/ModelVoice$OutputMode;
- .locals 1
-
- iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- return-object v0
-.end method
-
-.method public final getStreamConnectionState()Lcom/discord/rtcconnection/RtcConnection$State;
- .locals 1
-
- iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->streamConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
-
- return-object v0
-.end method
-
.method public hashCode()I
.locals 3
@@ -382,51 +240,15 @@
:goto_0
mul-int/lit8 v0, v0, 0x1f
- iget-object v2, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->streamConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
+ iget-object v2, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
if-eqz v2, :cond_1
- invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
-
- move-result v2
-
- goto :goto_1
-
- :cond_1
- const/4 v2, 0x0
-
- :goto_1
- add-int/2addr v0, v2
-
- mul-int/lit8 v0, v0, 0x1f
-
- iget-object v2, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- if-eqz v2, :cond_2
-
- invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
-
- move-result v2
-
- goto :goto_2
-
- :cond_2
- const/4 v2, 0x0
-
- :goto_2
- add-int/2addr v0, v2
-
- mul-int/lit8 v0, v0, 0x1f
-
- iget-object v2, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
-
- if-eqz v2, :cond_3
-
- invoke-virtual {v2}, Lcom/discord/utilities/media/AudioOutputState;->hashCode()I
+ invoke-virtual {v2}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->hashCode()I
move-result v1
- :cond_3
+ :cond_1
add-int/2addr v0, v1
mul-int/lit8 v0, v0, 0x1f
@@ -455,27 +277,11 @@
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
- const-string v1, ", streamConnectionState="
+ const-string v1, ", audioDevicesState="
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
- iget-object v1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->streamConnectionState:Lcom/discord/rtcconnection/RtcConnection$State;
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
- const-string v1, ", outputMode="
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- iget-object v1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
- const-string v1, ", audioOutputState="
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- iget-object v1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioOutputState:Lcom/discord/utilities/media/AudioOutputState;
+ iget-object v1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->audioDevicesState:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager.smali b/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager.smali
index bc82909fa3..b748545bef 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager$MediaEngineAudioManager.smali
@@ -165,11 +165,11 @@
# virtual methods
.method public final configure(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;)V
- .locals 7
+ .locals 5
const/4 v0, 0x0
- if-eqz p1, :cond_e
+ if-eqz p1, :cond_a
iget-object v1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
@@ -182,195 +182,145 @@
move-result-object v1
- invoke-virtual {p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->component2()Lcom/discord/rtcconnection/RtcConnection$State;
+ invoke-virtual {p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->component2()Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
move-result-object v2
- invoke-virtual {p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->component3()Lcom/discord/models/domain/ModelVoice$OutputMode;
+ sget-object v3, Lcom/discord/rtcconnection/RtcConnection$State$f;->a:Lcom/discord/rtcconnection/RtcConnection$State$f;
- move-result-object v3
+ if-ne v1, v3, :cond_7
- invoke-virtual {p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->component4()Lcom/discord/utilities/media/AudioOutputState;
+ invoke-virtual {v2}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->getAudioOutputState()Lcom/discord/utilities/media/AudioOutputState;
- move-result-object v4
+ move-result-object v0
- sget-object v5, Lcom/discord/rtcconnection/RtcConnection$State$f;->a:Lcom/discord/rtcconnection/RtcConnection$State$f;
+ invoke-virtual {v2}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->getSelectedOutputDevice()Lcom/discord/stores/StoreAudioDevices$OutputDevice;
- if-ne v1, v5, :cond_b
+ move-result-object v1
- iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->initialAudioManagerSettings:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
+ iget-object v2, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->initialAudioManagerSettings:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
- if-eqz v0, :cond_1
+ if-eqz v2, :cond_1
goto :goto_0
:cond_1
- iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
-
- invoke-direct {p0, v0}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->extractSettings(Landroid/media/AudioManager;)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
-
- move-result-object v0
-
- :goto_0
- iput-object v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->initialAudioManagerSettings:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
-
- invoke-virtual {v4}, Lcom/discord/utilities/media/AudioOutputState;->isBluetoothHeadsetDisconnected()Z
-
- move-result v0
-
- const/4 v1, 0x0
-
- const/4 v5, 0x1
-
- if-eqz v0, :cond_3
-
- invoke-virtual {v4}, Lcom/discord/utilities/media/AudioOutputState;->isHeadsetUnplugged()Z
-
- move-result v0
-
- if-nez v0, :cond_2
-
- goto :goto_1
-
- :cond_2
- const/4 v0, 0x0
-
- goto :goto_2
-
- :cond_3
- :goto_1
- const/4 v0, 0x1
-
- :goto_2
- sget-object v6, Lcom/discord/models/domain/ModelVoice$OutputMode;->SPEAKER:Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- if-ne v3, v6, :cond_4
-
- const/4 v3, 0x1
-
- goto :goto_3
-
- :cond_4
- const/4 v3, 0x0
-
- :goto_3
- sget-object v6, Lcom/discord/rtcconnection/RtcConnection$State$f;->a:Lcom/discord/rtcconnection/RtcConnection$State$f;
-
- invoke-static {v2, v6}, Lt/u/b/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
- move-result v2
-
- if-eqz v2, :cond_5
-
- if-nez v0, :cond_5
-
- const/4 v0, 0x1
-
- goto :goto_4
-
- :cond_5
- const/4 v0, 0x0
-
- :goto_4
iget-object v2, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
- if-nez v3, :cond_7
+ invoke-direct {p0, v2}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->extractSettings(Landroid/media/AudioManager;)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
- if-eqz v0, :cond_6
+ move-result-object v2
- goto :goto_5
+ :goto_0
+ iput-object v2, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->initialAudioManagerSettings:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
- :cond_6
- const/4 v0, 0x0
+ iget-object v2, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
- goto :goto_6
+ instance-of v1, v1, Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;
- :cond_7
- :goto_5
- const/4 v0, 0x1
+ invoke-virtual {v2, v1}, Landroid/media/AudioManager;->setSpeakerphoneOn(Z)V
- :goto_6
- invoke-virtual {v2, v0}, Landroid/media/AudioManager;->setSpeakerphoneOn(Z)V
-
- iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
+ iget-object v2, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
invoke-virtual {p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->getAudioMode()I
move-result p1
- const/4 v2, 0x2
+ const/4 v3, 0x2
- const/4 v6, 0x3
+ const/4 v4, 0x3
- if-eq p1, v2, :cond_8
+ if-eq p1, v3, :cond_2
- goto :goto_7
+ goto :goto_1
- :cond_8
- const/4 v6, 0x2
+ :cond_2
+ const/4 v4, 0x2
- :goto_7
- invoke-virtual {v0, v6}, Landroid/media/AudioManager;->setMode(I)V
+ :goto_1
+ invoke-virtual {v2, v4}, Landroid/media/AudioManager;->setMode(I)V
- if-nez v3, :cond_9
-
- invoke-virtual {v4}, Lcom/discord/utilities/media/AudioOutputState;->isBluetoothHeadsetDisconnected()Z
+ invoke-virtual {v0}, Lcom/discord/utilities/media/AudioOutputState;->isBluetoothHeadsetDisconnected()Z
move-result p1
+ const/4 v2, 0x1
+
+ const/4 v3, 0x0
+
+ if-nez p1, :cond_3
+
+ invoke-virtual {v0}, Lcom/discord/utilities/media/AudioOutputState;->isBluetoothAdapterDisabled()Z
+
+ move-result p1
+
+ if-nez p1, :cond_3
+
+ const/4 p1, 0x1
+
+ goto :goto_2
+
+ :cond_3
+ const/4 p1, 0x0
+
+ :goto_2
+ if-eqz p1, :cond_4
+
+ invoke-virtual {v0}, Lcom/discord/utilities/media/AudioOutputState;->isBluetoothScoDisconnected()Z
+
+ move-result v0
+
+ if-eqz v0, :cond_4
+
+ goto :goto_3
+
+ :cond_4
+ const/4 v2, 0x0
+
+ :goto_3
+ iget-boolean v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->isBluetoothScoStarted:Z
+
+ if-eqz v0, :cond_6
+
+ if-nez v1, :cond_5
+
if-nez p1, :cond_9
- invoke-virtual {v4}, Lcom/discord/utilities/media/AudioOutputState;->isBluetoothScoDisconnected()Z
+ :cond_5
+ iget-object p1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
- move-result p1
+ invoke-direct {p0, p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->stopBluetoothSCO(Landroid/media/AudioManager;)V
- if-eqz p1, :cond_9
+ goto :goto_4
- const/4 v1, 0x1
+ :cond_6
+ if-nez v1, :cond_9
- :cond_9
- if-eqz v1, :cond_a
-
- iget-boolean p1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->isBluetoothScoStarted:Z
-
- if-nez p1, :cond_a
+ if-eqz v2, :cond_9
iget-object p1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
invoke-direct {p0, p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->startBluetoothSCO(Landroid/media/AudioManager;)V
- goto :goto_8
+ goto :goto_4
- :cond_a
- if-nez v1, :cond_d
-
- iget-boolean p1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->isBluetoothScoStarted:Z
-
- if-eqz p1, :cond_d
-
- iget-object p1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
-
- invoke-direct {p0, p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->stopBluetoothSCO(Landroid/media/AudioManager;)V
-
- goto :goto_8
-
- :cond_b
+ :cond_7
iget-object p1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->initialAudioManagerSettings:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
- if-eqz p1, :cond_c
+ if-eqz p1, :cond_8
iget-object v1, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->audioManager:Landroid/media/AudioManager;
invoke-direct {p0, v1, p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->useSettings(Landroid/media/AudioManager;Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;)V
- :cond_c
+ :cond_8
iput-object v0, p0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->initialAudioManagerSettings:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$AudioManagerSettings;
- :cond_d
- :goto_8
+ :cond_9
+ :goto_4
return-void
- :cond_e
+ :cond_a
const-string p1, "configuration"
invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
diff --git a/com.discord/smali/com/discord/stores/StoreAudioManager$init$1.smali b/com.discord/smali/com/discord/stores/StoreAudioManager$init$1.smali
index 1ec73c811d..eb3d221f51 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioManager$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager$init$1.smali
@@ -1,9 +1,9 @@
-.class public final Lcom/discord/stores/StoreAudioManager$init$1;
-.super Ljava/lang/Object;
+.class public final synthetic Lcom/discord/stores/StoreAudioManager$init$1;
+.super Lt/u/b/i;
.source "StoreAudioManager.kt"
# interfaces
-.implements Lb0/l/i;
+.implements Lkotlin/jvm/functions/Function3;
# annotations
@@ -12,20 +12,19 @@
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
- accessFlags = 0x19
+ accessFlags = 0x1019
name = null
.end annotation
.annotation system Ldalvik/annotation/Signature;
value = {
- "",
- "Ljava/lang/Object;",
- "Lb0/l/i<",
- "TT;TR;>;"
+ "Lt/u/b/i;",
+ "Lkotlin/jvm/functions/Function3<",
+ "Lcom/discord/rtcconnection/RtcConnection$State;",
+ "Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;",
+ "Ljava/lang/Integer;",
+ "Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;",
+ ">;"
}
.end annotation
@@ -48,31 +47,89 @@
.end method
.method public constructor ()V
- .locals 0
+ .locals 1
- invoke-direct {p0}, Ljava/lang/Object;->()V
+ const/4 v0, 0x3
+
+ invoke-direct {p0, v0}, Lt/u/b/i;->(I)V
return-void
.end method
# virtual methods
-.method public final call(Lcom/discord/stores/StoreStreamRtcConnection$State;)Lcom/discord/rtcconnection/RtcConnection$State;
+.method public final getName()Ljava/lang/String;
+ .locals 1
+
+ const-string v0, ""
+
+ return-object v0
+.end method
+
+.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
+ .locals 1
+
+ const-class v0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
+
+ invoke-static {v0}, Lt/u/b/w;->getOrCreateKotlinClass(Ljava/lang/Class;)Lt/y/b;
+
+ move-result-object v0
+
+ return-object v0
+.end method
+
+.method public final getSignature()Ljava/lang/String;
+ .locals 1
+
+ const-string v0, "(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;I)V"
+
+ return-object v0
+.end method
+
+.method public final invoke(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;I)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
+ .locals 1
+
+ const/4 v0, 0x0
+
+ if-eqz p1, :cond_1
+
+ if-eqz p2, :cond_0
+
+ new-instance v0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
+
+ invoke-direct {v0, p1, p2, p3}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;I)V
+
+ return-object v0
+
+ :cond_0
+ const-string p1, "p2"
+
+ invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+
+ throw v0
+
+ :cond_1
+ const-string p1, "p1"
+
+ invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+
+ throw v0
+.end method
+
+.method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
.locals 0
- invoke-virtual {p1}, Lcom/discord/stores/StoreStreamRtcConnection$State;->getRtcConnectionState()Lcom/discord/rtcconnection/RtcConnection$State;
-
- move-result-object p1
-
- return-object p1
-.end method
-
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
- .locals 0
-
- check-cast p1, Lcom/discord/stores/StoreStreamRtcConnection$State;
-
- invoke-virtual {p0, p1}, Lcom/discord/stores/StoreAudioManager$init$1;->call(Lcom/discord/stores/StoreStreamRtcConnection$State;)Lcom/discord/rtcconnection/RtcConnection$State;
+ check-cast p1, Lcom/discord/rtcconnection/RtcConnection$State;
+
+ check-cast p2, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
+
+ check-cast p3, Ljava/lang/Number;
+
+ invoke-virtual {p3}, Ljava/lang/Number;->intValue()I
+
+ move-result p3
+
+ invoke-virtual {p0, p1, p2, p3}, Lcom/discord/stores/StoreAudioManager$init$1;->invoke(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;I)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
move-result-object p1
diff --git a/com.discord/smali/com/discord/stores/StoreAudioManager$init$2.smali b/com.discord/smali/com/discord/stores/StoreAudioManager$init$2.smali
index 50a473f036..56eed57c96 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioManager$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager$init$2.smali
@@ -1,9 +1,9 @@
-.class public final synthetic Lcom/discord/stores/StoreAudioManager$init$2;
-.super Lt/u/b/i;
+.class public final Lcom/discord/stores/StoreAudioManager$init$2;
+.super Lt/u/b/k;
.source "StoreAudioManager.kt"
# interfaces
-.implements Lkotlin/jvm/functions/Function5;
+.implements Lkotlin/jvm/functions/Function1;
# annotations
@@ -12,172 +12,62 @@
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
- accessFlags = 0x1019
+ accessFlags = 0x19
name = null
.end annotation
.annotation system Ldalvik/annotation/Signature;
value = {
- "Lt/u/b/i;",
- "Lkotlin/jvm/functions/Function5<",
- "Lcom/discord/rtcconnection/RtcConnection$State;",
- "Lcom/discord/rtcconnection/RtcConnection$State;",
- "Lcom/discord/models/domain/ModelVoice$OutputMode;",
- "Lcom/discord/utilities/media/AudioOutputState;",
- "Ljava/lang/Integer;",
+ "Lt/u/b/k;",
+ "Lkotlin/jvm/functions/Function1<",
"Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;",
+ "Lkotlin/Unit;",
">;"
}
.end annotation
-# static fields
-.field public static final INSTANCE:Lcom/discord/stores/StoreAudioManager$init$2;
+# instance fields
+.field public final synthetic $audioManager:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;
# direct methods
-.method public static constructor ()V
- .locals 1
+.method public constructor (Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;)V
+ .locals 0
- new-instance v0, Lcom/discord/stores/StoreAudioManager$init$2;
+ iput-object p1, p0, Lcom/discord/stores/StoreAudioManager$init$2;->$audioManager:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;
- invoke-direct {v0}, Lcom/discord/stores/StoreAudioManager$init$2;->()V
+ const/4 p1, 0x1
- sput-object v0, Lcom/discord/stores/StoreAudioManager$init$2;->INSTANCE:Lcom/discord/stores/StoreAudioManager$init$2;
-
- return-void
-.end method
-
-.method public constructor ()V
- .locals 1
-
- const/4 v0, 0x5
-
- invoke-direct {p0, v0}, Lt/u/b/i;->(I)V
+ invoke-direct {p0, p1}, Lt/u/b/k;->(I)V
return-void
.end method
# virtual methods
-.method public final getName()Ljava/lang/String;
- .locals 1
+.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
+ .locals 0
- const-string v0, ""
+ check-cast p1, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
- return-object v0
-.end method
+ invoke-virtual {p0, p1}, Lcom/discord/stores/StoreAudioManager$init$2;->invoke(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;)V
-.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
- .locals 1
-
- const-class v0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
-
- invoke-static {v0}, Lt/u/b/w;->getOrCreateKotlinClass(Ljava/lang/Class;)Lt/y/b;
-
- move-result-object v0
-
- return-object v0
-.end method
-
-.method public final getSignature()Ljava/lang/String;
- .locals 1
-
- const-string v0, "(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/models/domain/ModelVoice$OutputMode;Lcom/discord/utilities/media/AudioOutputState;I)V"
-
- return-object v0
-.end method
-
-.method public final invoke(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/models/domain/ModelVoice$OutputMode;Lcom/discord/utilities/media/AudioOutputState;I)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
- .locals 7
-
- const/4 v0, 0x0
-
- if-eqz p1, :cond_3
-
- if-eqz p2, :cond_2
-
- if-eqz p3, :cond_1
-
- if-eqz p4, :cond_0
-
- new-instance v0, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
-
- move-object v1, v0
-
- move-object v2, p1
-
- move-object v3, p2
-
- move-object v4, p3
-
- move-object v5, p4
-
- move v6, p5
-
- invoke-direct/range {v1 .. v6}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;->(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/models/domain/ModelVoice$OutputMode;Lcom/discord/utilities/media/AudioOutputState;I)V
-
- return-object v0
-
- :cond_0
- const-string p1, "p4"
-
- invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
-
- throw v0
-
- :cond_1
- const-string p1, "p3"
-
- invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
-
- throw v0
-
- :cond_2
- const-string p1, "p2"
-
- invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
-
- throw v0
-
- :cond_3
- const-string p1, "p1"
-
- invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
-
- throw v0
-.end method
-
-.method public bridge synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- .locals 6
-
- move-object v1, p1
-
- check-cast v1, Lcom/discord/rtcconnection/RtcConnection$State;
-
- move-object v2, p2
-
- check-cast v2, Lcom/discord/rtcconnection/RtcConnection$State;
-
- move-object v3, p3
-
- check-cast v3, Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- move-object v4, p4
-
- check-cast v4, Lcom/discord/utilities/media/AudioOutputState;
-
- check-cast p5, Ljava/lang/Number;
-
- invoke-virtual {p5}, Ljava/lang/Number;->intValue()I
-
- move-result v5
-
- move-object v0, p0
-
- invoke-virtual/range {v0 .. v5}, Lcom/discord/stores/StoreAudioManager$init$2;->invoke(Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/models/domain/ModelVoice$OutputMode;Lcom/discord/utilities/media/AudioOutputState;I)Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;
-
- move-result-object p1
+ sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
return-object p1
.end method
+
+.method public final invoke(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;)V
+ .locals 2
+
+ iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$init$2;->$audioManager:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;
+
+ const-string v1, "it"
+
+ invoke-static {p1, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+
+ invoke-virtual {v0, p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->configure(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;)V
+
+ return-void
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreAudioManager$init$3.smali b/com.discord/smali/com/discord/stores/StoreAudioManager$init$3.smali
deleted file mode 100644
index ddb3648510..0000000000
--- a/com.discord/smali/com/discord/stores/StoreAudioManager$init$3.smali
+++ /dev/null
@@ -1,73 +0,0 @@
-.class public final Lcom/discord/stores/StoreAudioManager$init$3;
-.super Lt/u/b/k;
-.source "StoreAudioManager.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/stores/StoreAudioManager;->init(Landroid/content/Context;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
- accessFlags = 0x19
- name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
- value = {
- "Lt/u/b/k;",
- "Lkotlin/jvm/functions/Function1<",
- "Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;",
- "Lkotlin/Unit;",
- ">;"
- }
-.end annotation
-
-
-# instance fields
-.field public final synthetic $audioManager:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;
-
-
-# direct methods
-.method public constructor (Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;)V
- .locals 0
-
- iput-object p1, p0, Lcom/discord/stores/StoreAudioManager$init$3;->$audioManager:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;
-
- const/4 p1, 0x1
-
- invoke-direct {p0, p1}, Lt/u/b/k;->(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/StoreAudioManager$MediaEngineAudioManager$Configuration;
-
- invoke-virtual {p0, p1}, Lcom/discord/stores/StoreAudioManager$init$3;->invoke(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;)V
-
- sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
-
- return-object p1
-.end method
-
-.method public final invoke(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;)V
- .locals 2
-
- iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$init$3;->$audioManager:Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;
-
- const-string v1, "it"
-
- invoke-static {p1, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- invoke-virtual {v0, p1}, Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;->configure(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager$Configuration;)V
-
- return-void
-.end method
diff --git a/com.discord/smali/com/discord/stores/StoreAudioManager$sam$rx_functions_Func5$0.smali b/com.discord/smali/com/discord/stores/StoreAudioManager$sam$rx_functions_Func3$0.smali
similarity index 52%
rename from com.discord/smali/com/discord/stores/StoreAudioManager$sam$rx_functions_Func5$0.smali
rename to com.discord/smali/com/discord/stores/StoreAudioManager$sam$rx_functions_Func3$0.smali
index 333656559a..685c11ed3e 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioManager$sam$rx_functions_Func5$0.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager$sam$rx_functions_Func3$0.smali
@@ -1,44 +1,34 @@
-.class public final Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func5$0;
+.class public final Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func3$0;
.super Ljava/lang/Object;
.source "StoreAudioManager.kt"
# interfaces
-.implements Lrx/functions/Func5;
+.implements Lrx/functions/Func3;
# instance fields
-.field public final synthetic function:Lkotlin/jvm/functions/Function5;
+.field public final synthetic function:Lkotlin/jvm/functions/Function3;
# direct methods
-.method public constructor (Lkotlin/jvm/functions/Function5;)V
+.method public constructor (Lkotlin/jvm/functions/Function3;)V
.locals 0
invoke-direct {p0}, Ljava/lang/Object;->()V
- iput-object p1, p0, Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func5$0;->function:Lkotlin/jvm/functions/Function5;
+ iput-object p1, p0, Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func3$0;->function:Lkotlin/jvm/functions/Function3;
return-void
.end method
# virtual methods
-.method public final synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- .locals 6
+.method public final synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ .locals 1
- iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func5$0;->function:Lkotlin/jvm/functions/Function5;
+ iget-object v0, p0, Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func3$0;->function:Lkotlin/jvm/functions/Function3;
- move-object v1, p1
-
- move-object v2, p2
-
- move-object v3, p3
-
- move-object v4, p4
-
- move-object v5, p5
-
- invoke-interface/range {v0 .. v5}, Lkotlin/jvm/functions/Function5;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-interface {v0, p1, p2, p3}, Lkotlin/jvm/functions/Function3;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
move-result-object p1
diff --git a/com.discord/smali/com/discord/stores/StoreAudioManager.smali b/com.discord/smali/com/discord/stores/StoreAudioManager.smali
index 32a2a2b394..35b89fff19 100644
--- a/com.discord/smali/com/discord/stores/StoreAudioManager.smali
+++ b/com.discord/smali/com/discord/stores/StoreAudioManager.smali
@@ -13,15 +13,15 @@
# instance fields
+.field public final audioDevices:Lcom/discord/stores/StoreAudioDevices;
+
.field public final mediaSettings:Lcom/discord/stores/StoreMediaSettings;
.field public final rtcConnectionStore:Lcom/discord/stores/StoreRtcConnection;
-.field public final streamRtcConnectionStore:Lcom/discord/stores/StoreStreamRtcConnection;
-
# direct methods
-.method public constructor (Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreRtcConnection;Lcom/discord/stores/StoreStreamRtcConnection;)V
+.method public constructor (Lcom/discord/stores/StoreAudioDevices;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreRtcConnection;)V
.locals 1
const/4 v0, 0x0
@@ -34,34 +34,34 @@
invoke-direct {p0}, Lcom/discord/stores/Store;->()V
- iput-object p1, p0, Lcom/discord/stores/StoreAudioManager;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
+ iput-object p1, p0, Lcom/discord/stores/StoreAudioManager;->audioDevices:Lcom/discord/stores/StoreAudioDevices;
- iput-object p2, p0, Lcom/discord/stores/StoreAudioManager;->rtcConnectionStore:Lcom/discord/stores/StoreRtcConnection;
+ iput-object p2, p0, Lcom/discord/stores/StoreAudioManager;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
- iput-object p3, p0, Lcom/discord/stores/StoreAudioManager;->streamRtcConnectionStore:Lcom/discord/stores/StoreStreamRtcConnection;
+ iput-object p3, p0, Lcom/discord/stores/StoreAudioManager;->rtcConnectionStore:Lcom/discord/stores/StoreRtcConnection;
return-void
:cond_0
- const-string p1, "streamRtcConnectionStore"
-
- invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
-
- throw v0
-
- :cond_1
const-string p1, "rtcConnectionStore"
invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
throw v0
- :cond_2
+ :cond_1
const-string p1, "mediaSettings"
invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
throw v0
+
+ :cond_2
+ const-string p1, "audioDevices"
+
+ invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+
+ throw v0
.end method
@@ -87,54 +87,34 @@
invoke-virtual {p1}, Lcom/discord/stores/StoreRtcConnection;->getConnectionState()Lrx/Observable;
- move-result-object v1
-
- iget-object p1, p0, Lcom/discord/stores/StoreAudioManager;->streamRtcConnectionStore:Lcom/discord/stores/StoreStreamRtcConnection;
-
- invoke-virtual {p1}, Lcom/discord/stores/StoreStreamRtcConnection;->getState()Lrx/Observable;
-
move-result-object p1
- sget-object v2, Lcom/discord/stores/StoreAudioManager$init$1;->INSTANCE:Lcom/discord/stores/StoreAudioManager$init$1;
+ iget-object v1, p0, Lcom/discord/stores/StoreAudioManager;->audioDevices:Lcom/discord/stores/StoreAudioDevices;
- invoke-virtual {p1, v2}, Lrx/Observable;->f(Lb0/l/i;)Lrx/Observable;
+ invoke-virtual {v1}, Lcom/discord/stores/StoreAudioDevices;->getAudioDevicesState()Lrx/Observable;
+
+ move-result-object v1
+
+ iget-object v2, p0, Lcom/discord/stores/StoreAudioManager;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
+
+ invoke-virtual {v2}, Lcom/discord/stores/StoreMediaSettings;->getAudioMode()Lrx/Observable;
move-result-object v2
- iget-object p1, p0, Lcom/discord/stores/StoreAudioManager;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
+ sget-object v3, Lcom/discord/stores/StoreAudioManager$init$1;->INSTANCE:Lcom/discord/stores/StoreAudioManager$init$1;
- invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings;->getOutputMode()Lrx/Observable;
+ if-eqz v3, :cond_0
- move-result-object v3
+ new-instance v4, Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func3$0;
- iget-object p1, p0, Lcom/discord/stores/StoreAudioManager;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
+ invoke-direct {v4, v3}, Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func3$0;->(Lkotlin/jvm/functions/Function3;)V
- invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings;->getAudioOutputState()Lrx/Observable;
-
- move-result-object v4
-
- iget-object p1, p0, Lcom/discord/stores/StoreAudioManager;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
-
- invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings;->getAudioMode()Lrx/Observable;
-
- move-result-object v5
-
- sget-object p1, Lcom/discord/stores/StoreAudioManager$init$2;->INSTANCE:Lcom/discord/stores/StoreAudioManager$init$2;
-
- if-eqz p1, :cond_0
-
- new-instance v6, Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func5$0;
-
- invoke-direct {v6, p1}, Lcom/discord/stores/StoreAudioManager$sam$rx_functions_Func5$0;->(Lkotlin/jvm/functions/Function5;)V
-
- move-object p1, v6
+ move-object v3, v4
:cond_0
- move-object v6, p1
+ check-cast v3, Lrx/functions/Func3;
- check-cast v6, Lrx/functions/Func5;
-
- invoke-static/range {v1 .. v6}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func5;)Lrx/Observable;
+ invoke-static {p1, v1, v2, v3}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func3;)Lrx/Observable;
move-result-object p1
@@ -142,7 +122,11 @@
invoke-static {p1, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
+ const-wide/16 v1, 0x1f4
+
+ sget-object v3, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+ invoke-static {p1, v1, v2, v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->leadingEdgeThrottle(Lrx/Observable;JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
move-result-object p1
@@ -164,9 +148,9 @@
const/4 v6, 0x0
- new-instance v7, Lcom/discord/stores/StoreAudioManager$init$3;
+ new-instance v7, Lcom/discord/stores/StoreAudioManager$init$2;
- invoke-direct {v7, v0}, Lcom/discord/stores/StoreAudioManager$init$3;->(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;)V
+ invoke-direct {v7, v0}, Lcom/discord/stores/StoreAudioManager$init$2;->(Lcom/discord/stores/StoreAudioManager$MediaEngineAudioManager;)V
const/16 v8, 0x1e
diff --git a/com.discord/smali/com/discord/stores/StoreChangeLog.smali b/com.discord/smali/com/discord/stores/StoreChangeLog.smali
index 10086351a6..f9a5ede359 100644
--- a/com.discord/smali/com/discord/stores/StoreChangeLog.smali
+++ b/com.discord/smali/com/discord/stores/StoreChangeLog.smali
@@ -214,7 +214,7 @@
const-string v1, "en"
- const v2, 0x7f120392
+ const v2, 0x7f12039b
invoke-virtual {v0, p1, v2, v1}, Lcom/discord/utilities/StringUtils;->getStringByLocale(Landroid/content/Context;ILjava/lang/String;)Ljava/lang/String;
@@ -282,7 +282,7 @@
goto :goto_2
:cond_3
- const p2, 0x7f120393
+ const p2, 0x7f12039c
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -431,7 +431,7 @@
if-eqz p1, :cond_0
- const v0, 0x7f120393
+ const v0, 0x7f12039c
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$makeGroup$textResolver$1.smali b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$makeGroup$textResolver$1.smali
index aeabc2eeeb..bb77e14406 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$makeGroup$textResolver$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$makeGroup$textResolver$1.smali
@@ -112,7 +112,7 @@
throw p1
:cond_2
- const v0, 0x7f12119d
+ const v0, 0x7f1211a5
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -121,7 +121,7 @@
goto :goto_0
:cond_3
- const v0, 0x7f12119e
+ const v0, 0x7f1211a6
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
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 caf4d49c5e..e21c0c1d6c 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, 0x7f120381
+ const p1, 0x7f12038a
goto :goto_0
:cond_0
- const p1, 0x7f1203a0
+ const p1, 0x7f1203a9
:goto_0
const/4 v1, 0x0
diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali
index af995dad14..01e14ff946 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, 0x401
+ const/16 v0, 0x402
iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali
index 84cfb696cb..e51a8b702a 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali
@@ -59,7 +59,7 @@
if-eqz p2, :cond_0
- const p1, 0x7f12043f
+ const p1, 0x7f120448
goto :goto_0
@@ -72,7 +72,7 @@
if-eqz p2, :cond_1
- const p1, 0x7f12043c
+ const p1, 0x7f120445
goto :goto_0
@@ -85,7 +85,7 @@
if-eqz p2, :cond_2
- const p1, 0x7f12043b
+ const p1, 0x7f120444
goto :goto_0
@@ -98,7 +98,7 @@
if-eqz p2, :cond_3
- const p1, 0x7f12043e
+ const p1, 0x7f120447
goto :goto_0
@@ -111,7 +111,7 @@
if-eqz p2, :cond_4
- const p1, 0x7f120443
+ const p1, 0x7f12044c
goto :goto_0
@@ -124,7 +124,7 @@
if-eqz p2, :cond_5
- const p1, 0x7f120442
+ const p1, 0x7f12044b
goto :goto_0
@@ -137,7 +137,7 @@
if-eqz p2, :cond_6
- const p1, 0x7f12043d
+ const p1, 0x7f120446
goto :goto_0
@@ -150,7 +150,7 @@
if-eqz p1, :cond_7
- const p1, 0x7f120441
+ const p1, 0x7f12044a
: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 172fd53bb1..3c5a26136e 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, 0x7f1213fe
+ const v1, 0x7f121406
const/4 v2, 0x0
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$1.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$1.smali
index 908c3bf03f..6f3bf3dbe0 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$1.smali
@@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/stores/StoreMediaNotification;->(Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreRtcConnection;)V
+ value = Lcom/discord/stores/StoreMediaNotification;->(Lcom/discord/stores/StoreAudioDevices;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreRtcConnection;)V
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$2$1.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$2$1.smali
index 56861a73a9..e5841d078c 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$2$1.smali
@@ -53,40 +53,48 @@
# virtual methods
-.method public final call(Ljava/lang/String;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Lcom/discord/utilities/media/AudioOutputState;Lcom/discord/widgets/voice/model/CallModel;)Lcom/discord/stores/StoreMediaNotification$NotificationData;
+.method public final call(Ljava/lang/String;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;Lcom/discord/widgets/voice/model/CallModel;)Lcom/discord/stores/StoreMediaNotification$NotificationData;
.locals 10
- invoke-virtual {p3}, Lcom/discord/utilities/media/AudioOutputState;->isBluetoothAdapterDisabled()Z
+ invoke-virtual {p3}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->getAudioOutputState()Lcom/discord/utilities/media/AudioOutputState;
- move-result v0
+ move-result-object v0
- const/4 v1, 0x0
+ invoke-virtual {p3}, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;->getSelectedOutputDevice()Lcom/discord/stores/StoreAudioDevices$OutputDevice;
- const/4 v2, 0x1
+ move-result-object p3
- if-nez v0, :cond_1
+ invoke-virtual {v0}, Lcom/discord/utilities/media/AudioOutputState;->isBluetoothAdapterDisabled()Z
- invoke-virtual {p3}, Lcom/discord/utilities/media/AudioOutputState;->isBluetoothHeadsetDisconnected()Z
+ move-result v1
- move-result v0
+ const/4 v2, 0x0
- if-eqz v0, :cond_0
+ const/4 v3, 0x1
+
+ if-nez v1, :cond_1
+
+ invoke-virtual {v0}, Lcom/discord/utilities/media/AudioOutputState;->isBluetoothHeadsetDisconnected()Z
+
+ move-result v1
+
+ if-eqz v1, :cond_0
goto :goto_0
:cond_0
- const/4 v0, 0x0
+ const/4 v1, 0x0
goto :goto_1
:cond_1
:goto_0
- const/4 v0, 0x1
+ const/4 v1, 0x1
:goto_1
- invoke-virtual {p3}, Lcom/discord/utilities/media/AudioOutputState;->isHeadsetUnplugged()Z
+ invoke-virtual {v0}, Lcom/discord/utilities/media/AudioOutputState;->isHeadsetUnplugged()Z
- move-result p3
+ move-result v0
if-eqz p4, :cond_3
@@ -94,7 +102,7 @@
move-result p4
- if-eq p4, v2, :cond_2
+ if-eq p4, v3, :cond_2
goto :goto_2
@@ -108,38 +116,24 @@
const/4 p4, 0x1
:goto_3
- invoke-virtual {p2}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getOutputMode()Lcom/discord/models/domain/ModelVoice$OutputMode;
+ instance-of p3, p3, Lcom/discord/stores/StoreAudioDevices$OutputDevice$NonSpeaker;
- move-result-object v3
+ if-eqz p4, :cond_4
- sget-object v4, Lcom/discord/models/domain/ModelVoice$OutputMode;->IN_EAR:Lcom/discord/models/domain/ModelVoice$OutputMode;
+ if-eqz v0, :cond_4
- if-ne v3, v4, :cond_4
+ if-eqz v1, :cond_4
- const/4 v3, 0x1
+ if-eqz p3, :cond_4
+
+ const/4 v9, 0x1
goto :goto_4
:cond_4
- const/4 v3, 0x0
-
- :goto_4
- if-eqz p4, :cond_5
-
- if-eqz p3, :cond_5
-
- if-eqz v0, :cond_5
-
- if-eqz v3, :cond_5
-
- const/4 v9, 0x1
-
- goto :goto_5
-
- :cond_5
const/4 v9, 0x0
- :goto_5
+ :goto_4
new-instance p3, Lcom/discord/stores/StoreMediaNotification$NotificationData;
iget-object v5, p0, Lcom/discord/stores/StoreMediaNotification$notificationDataObservable$2$1;->$connectionState:Lcom/discord/rtcconnection/RtcConnection$State;
@@ -176,11 +170,11 @@
check-cast p2, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
- check-cast p3, Lcom/discord/utilities/media/AudioOutputState;
+ check-cast p3, Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
check-cast p4, Lcom/discord/widgets/voice/model/CallModel;
- invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/stores/StoreMediaNotification$notificationDataObservable$2$1;->call(Ljava/lang/String;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Lcom/discord/utilities/media/AudioOutputState;Lcom/discord/widgets/voice/model/CallModel;)Lcom/discord/stores/StoreMediaNotification$NotificationData;
+ invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/stores/StoreMediaNotification$notificationDataObservable$2$1;->call(Ljava/lang/String;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;Lcom/discord/widgets/voice/model/CallModel;)Lcom/discord/stores/StoreMediaNotification$NotificationData;
move-result-object p1
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$2.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$2.smali
index 5558605a0d..3382c421b1 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$notificationDataObservable$2.smali
@@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/stores/StoreMediaNotification;->(Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreRtcConnection;)V
+ value = Lcom/discord/stores/StoreMediaNotification;->(Lcom/discord/stores/StoreAudioDevices;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreRtcConnection;)V
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
@@ -145,11 +145,11 @@
iget-object v3, p0, Lcom/discord/stores/StoreMediaNotification$notificationDataObservable$2;->this$0:Lcom/discord/stores/StoreMediaNotification;
- invoke-static {v3}, Lcom/discord/stores/StoreMediaNotification;->access$getMediaSettingsStore$p(Lcom/discord/stores/StoreMediaNotification;)Lcom/discord/stores/StoreMediaSettings;
+ invoke-static {v3}, Lcom/discord/stores/StoreMediaNotification;->access$getAudioDevicesStore$p(Lcom/discord/stores/StoreMediaNotification;)Lcom/discord/stores/StoreAudioDevices;
move-result-object v3
- invoke-virtual {v3}, Lcom/discord/stores/StoreMediaSettings;->getAudioOutputState()Lrx/Observable;
+ invoke-virtual {v3}, Lcom/discord/stores/StoreAudioDevices;->getAudioDevicesState()Lrx/Observable;
move-result-object v3
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification.smali
index 6f378d9893..61e746f8c7 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaNotification.smali
@@ -19,6 +19,8 @@
# instance fields
+.field public final audioDevicesStore:Lcom/discord/stores/StoreAudioDevices;
+
.field public final mediaSettingsStore:Lcom/discord/stores/StoreMediaSettings;
.field public final notificationDataObservable:Lrx/Observable;
@@ -71,22 +73,26 @@
return-void
.end method
-.method public constructor (Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreRtcConnection;)V
+.method public constructor (Lcom/discord/stores/StoreAudioDevices;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreRtcConnection;)V
.locals 1
const/4 v0, 0x0
- if-eqz p1, :cond_2
+ if-eqz p1, :cond_3
- if-eqz p2, :cond_1
+ if-eqz p2, :cond_2
- if-eqz p3, :cond_0
+ if-eqz p3, :cond_1
+
+ if-eqz p4, :cond_0
invoke-direct {p0}, Lcom/discord/stores/Store;->()V
- iput-object p1, p0, Lcom/discord/stores/StoreMediaNotification;->mediaSettingsStore:Lcom/discord/stores/StoreMediaSettings;
+ iput-object p1, p0, Lcom/discord/stores/StoreMediaNotification;->audioDevicesStore:Lcom/discord/stores/StoreAudioDevices;
- iput-object p2, p0, Lcom/discord/stores/StoreMediaNotification;->voiceChannelSelectedStore:Lcom/discord/stores/StoreVoiceChannelSelected;
+ iput-object p2, p0, Lcom/discord/stores/StoreMediaNotification;->mediaSettingsStore:Lcom/discord/stores/StoreMediaSettings;
+
+ iput-object p3, p0, Lcom/discord/stores/StoreMediaNotification;->voiceChannelSelectedStore:Lcom/discord/stores/StoreVoiceChannelSelected;
iget-object p1, p0, Lcom/discord/stores/StoreMediaNotification;->voiceChannelSelectedStore:Lcom/discord/stores/StoreVoiceChannelSelected;
@@ -94,7 +100,7 @@
move-result-object p1
- invoke-virtual {p3}, Lcom/discord/stores/StoreRtcConnection;->getConnectionState()Lrx/Observable;
+ invoke-virtual {p4}, Lcom/discord/stores/StoreRtcConnection;->getConnectionState()Lrx/Observable;
move-result-object p2
@@ -152,6 +158,21 @@
invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
throw v0
+
+ :cond_3
+ const-string p1, "audioDevicesStore"
+
+ invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+
+ throw v0
+.end method
+
+.method public static final synthetic access$getAudioDevicesStore$p(Lcom/discord/stores/StoreMediaNotification;)Lcom/discord/stores/StoreAudioDevices;
+ .locals 0
+
+ iget-object p0, p0, Lcom/discord/stores/StoreMediaNotification;->audioDevicesStore:Lcom/discord/stores/StoreAudioDevices;
+
+ return-object p0
.end method
.method public static final synthetic access$getMediaSettingsStore$p(Lcom/discord/stores/StoreMediaNotification;)Lcom/discord/stores/StoreMediaSettings;
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$init$2$1$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$1$1$1.smali
similarity index 73%
rename from com.discord/smali/com/discord/stores/StoreMediaSettings$init$2$1$1.smali
rename to com.discord/smali/com/discord/stores/StoreMediaSettings$1$1$1.smali
index b25029a75f..e7d72708c8 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$init$2$1$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$1$1$1.smali
@@ -1,4 +1,4 @@
-.class public final Lcom/discord/stores/StoreMediaSettings$init$2$1$1;
+.class public final Lcom/discord/stores/StoreMediaSettings$1$1$1;
.super Ljava/lang/Object;
.source "StoreMediaSettings.kt"
@@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/stores/StoreMediaSettings$init$2$1;->call(Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
+ value = Lcom/discord/stores/StoreMediaSettings$1$1;->call(Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
@@ -31,18 +31,18 @@
# static fields
-.field public static final INSTANCE:Lcom/discord/stores/StoreMediaSettings$init$2$1$1;
+.field public static final INSTANCE:Lcom/discord/stores/StoreMediaSettings$1$1$1;
# direct methods
.method public static constructor ()V
.locals 1
- new-instance v0, Lcom/discord/stores/StoreMediaSettings$init$2$1$1;
+ new-instance v0, Lcom/discord/stores/StoreMediaSettings$1$1$1;
- invoke-direct {v0}, Lcom/discord/stores/StoreMediaSettings$init$2$1$1;->()V
+ invoke-direct {v0}, Lcom/discord/stores/StoreMediaSettings$1$1$1;->()V
- sput-object v0, Lcom/discord/stores/StoreMediaSettings$init$2$1$1;->INSTANCE:Lcom/discord/stores/StoreMediaSettings$init$2$1$1;
+ sput-object v0, Lcom/discord/stores/StoreMediaSettings$1$1$1;->INSTANCE:Lcom/discord/stores/StoreMediaSettings$1$1$1;
return-void
.end method
@@ -62,7 +62,7 @@
check-cast p1, Ljava/lang/Integer;
- invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$init$2$1$1;->call(Ljava/lang/Integer;)Z
+ invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$1$1$1;->call(Ljava/lang/Integer;)Z
move-result p1
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$init$2$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$1$1.smali
similarity index 74%
rename from com.discord/smali/com/discord/stores/StoreMediaSettings$init$2$1.smali
rename to com.discord/smali/com/discord/stores/StoreMediaSettings$1$1.smali
index 307f8d36a2..9f89290bc1 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$init$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$1$1.smali
@@ -1,4 +1,4 @@
-.class public final Lcom/discord/stores/StoreMediaSettings$init$2$1;
+.class public final Lcom/discord/stores/StoreMediaSettings$1$1;
.super Ljava/lang/Object;
.source "StoreMediaSettings.kt"
@@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/stores/StoreMediaSettings$init$2;->call(Ljava/lang/Long;)Lrx/Observable;
+ value = Lcom/discord/stores/StoreMediaSettings$1;->call(Ljava/lang/Long;)Lrx/Observable;
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
@@ -35,16 +35,16 @@
# instance fields
.field public final synthetic $id:Ljava/lang/Long;
-.field public final synthetic this$0:Lcom/discord/stores/StoreMediaSettings$init$2;
+.field public final synthetic this$0:Lcom/discord/stores/StoreMediaSettings$1;
# direct methods
-.method public constructor (Lcom/discord/stores/StoreMediaSettings$init$2;Ljava/lang/Long;)V
+.method public constructor (Lcom/discord/stores/StoreMediaSettings$1;Ljava/lang/Long;)V
.locals 0
- iput-object p1, p0, Lcom/discord/stores/StoreMediaSettings$init$2$1;->this$0:Lcom/discord/stores/StoreMediaSettings$init$2;
+ iput-object p1, p0, Lcom/discord/stores/StoreMediaSettings$1$1;->this$0:Lcom/discord/stores/StoreMediaSettings$1;
- iput-object p2, p0, Lcom/discord/stores/StoreMediaSettings$init$2$1;->$id:Ljava/lang/Long;
+ iput-object p2, p0, Lcom/discord/stores/StoreMediaSettings$1$1;->$id:Ljava/lang/Long;
invoke-direct {p0}, Ljava/lang/Object;->()V
@@ -58,7 +58,7 @@
check-cast p1, Lcom/discord/models/domain/ModelChannel;
- invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$init$2$1;->call(Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
+ invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$1$1;->call(Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
move-result-object p1
@@ -89,9 +89,9 @@
goto :goto_0
:cond_0
- iget-object p1, p0, Lcom/discord/stores/StoreMediaSettings$init$2$1;->this$0:Lcom/discord/stores/StoreMediaSettings$init$2;
+ iget-object p1, p0, Lcom/discord/stores/StoreMediaSettings$1$1;->this$0:Lcom/discord/stores/StoreMediaSettings$1;
- iget-object p1, p1, Lcom/discord/stores/StoreMediaSettings$init$2;->this$0:Lcom/discord/stores/StoreMediaSettings;
+ iget-object p1, p1, Lcom/discord/stores/StoreMediaSettings$1;->this$0:Lcom/discord/stores/StoreMediaSettings;
invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings;->getStream()Lcom/discord/stores/StoreStream;
@@ -101,7 +101,7 @@
move-result-object p1
- iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings$init$2$1;->$id:Ljava/lang/Long;
+ iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings$1$1;->$id:Ljava/lang/Long;
const-string v1, "id"
@@ -115,7 +115,7 @@
move-result-object p1
- sget-object v0, Lcom/discord/stores/StoreMediaSettings$init$2$1$1;->INSTANCE:Lcom/discord/stores/StoreMediaSettings$init$2$1$1;
+ sget-object v0, Lcom/discord/stores/StoreMediaSettings$1$1$1;->INSTANCE:Lcom/discord/stores/StoreMediaSettings$1$1$1;
invoke-virtual {p1, v0}, Lrx/Observable;->f(Lb0/l/i;)Lrx/Observable;
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$init$2.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$1.smali
similarity index 79%
rename from com.discord/smali/com/discord/stores/StoreMediaSettings$init$2.smali
rename to com.discord/smali/com/discord/stores/StoreMediaSettings$1.smali
index c2617d1dd0..6c61e4c6a3 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$init$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$1.smali
@@ -1,4 +1,4 @@
-.class public final Lcom/discord/stores/StoreMediaSettings$init$2;
+.class public final Lcom/discord/stores/StoreMediaSettings$1;
.super Ljava/lang/Object;
.source "StoreMediaSettings.kt"
@@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/stores/StoreMediaSettings;->init(Landroid/content/Context;)V
+ value = Lcom/discord/stores/StoreMediaSettings;->(Lcom/discord/stores/StoreStream;)V
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
@@ -40,7 +40,7 @@
.method public constructor (Lcom/discord/stores/StoreMediaSettings;)V
.locals 0
- iput-object p1, p0, Lcom/discord/stores/StoreMediaSettings$init$2;->this$0:Lcom/discord/stores/StoreMediaSettings;
+ iput-object p1, p0, Lcom/discord/stores/StoreMediaSettings$1;->this$0:Lcom/discord/stores/StoreMediaSettings;
invoke-direct {p0}, Ljava/lang/Object;->()V
@@ -54,7 +54,7 @@
check-cast p1, Ljava/lang/Long;
- invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$init$2;->call(Ljava/lang/Long;)Lrx/Observable;
+ invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$1;->call(Ljava/lang/Long;)Lrx/Observable;
move-result-object p1
@@ -74,7 +74,7 @@
}
.end annotation
- iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings$init$2;->this$0:Lcom/discord/stores/StoreMediaSettings;
+ iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings$1;->this$0:Lcom/discord/stores/StoreMediaSettings;
invoke-virtual {v0}, Lcom/discord/stores/StoreMediaSettings;->getStream()Lcom/discord/stores/StoreStream;
@@ -96,9 +96,9 @@
move-result-object v0
- new-instance v1, Lcom/discord/stores/StoreMediaSettings$init$2$1;
+ new-instance v1, Lcom/discord/stores/StoreMediaSettings$1$1;
- invoke-direct {v1, p0, p1}, Lcom/discord/stores/StoreMediaSettings$init$2$1;->(Lcom/discord/stores/StoreMediaSettings$init$2;Ljava/lang/Long;)V
+ invoke-direct {v1, p0, p1}, Lcom/discord/stores/StoreMediaSettings$1$1;->(Lcom/discord/stores/StoreMediaSettings$1;Ljava/lang/Long;)V
invoke-virtual {v0, v1}, Lrx/Observable;->k(Lb0/l/i;)Lrx/Observable;
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$init$3.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$2.smali
similarity index 94%
rename from com.discord/smali/com/discord/stores/StoreMediaSettings$init$3.smali
rename to com.discord/smali/com/discord/stores/StoreMediaSettings$2.smali
index c2e0b4a17f..d46a42826c 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$init$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$2.smali
@@ -1,4 +1,4 @@
-.class public final synthetic Lcom/discord/stores/StoreMediaSettings$init$3;
+.class public final synthetic Lcom/discord/stores/StoreMediaSettings$2;
.super Lt/u/b/i;
.source "StoreMediaSettings.kt"
@@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/stores/StoreMediaSettings;->init(Landroid/content/Context;)V
+ value = Lcom/discord/stores/StoreMediaSettings;->(Lcom/discord/stores/StoreStream;)V
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
@@ -77,7 +77,7 @@
move-result p1
- invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$init$3;->invoke(Z)V
+ invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$2;->invoke(Z)V
sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$VoiceConfiguration.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$VoiceConfiguration.smali
index c7a5d0f5b9..f8eeb48dfc 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$VoiceConfiguration.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings$VoiceConfiguration.smali
@@ -29,22 +29,16 @@
.field public final noiseSuppression:Z
-.field public final outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
-
.field public final outputVolume:F
.field public final sensitivity:F
# direct methods
-.method public constructor (ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/models/domain/ModelVoice$OutputMode;F)V
- .locals 1
+.method public constructor (ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;F)V
+ .locals 0
- const/4 v0, 0x0
-
- if-eqz p8, :cond_1
-
- if-eqz p9, :cond_0
+ if-eqz p8, :cond_0
invoke-direct {p0}, Ljava/lang/Object;->()V
@@ -64,33 +58,26 @@
iput-object p8, p0, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->inputMode:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
- iput-object p9, p0, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- iput p10, p0, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->outputVolume:F
+ iput p9, p0, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->outputVolume:F
return-void
:cond_0
- const-string p1, "outputMode"
-
- invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
-
- throw v0
-
- :cond_1
const-string p1, "inputMode"
invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
- throw v0
+ const/4 p1, 0x0
+
+ throw p1
.end method
-.method public static synthetic copy$default(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/models/domain/ModelVoice$OutputMode;FILjava/lang/Object;)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
- .locals 11
+.method public static synthetic copy$default(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;FILjava/lang/Object;)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+ .locals 10
move-object v0, p0
- move/from16 v1, p11
+ move/from16 v1, p10
and-int/lit8 v2, v1, 0x1
@@ -149,7 +136,7 @@
goto :goto_4
:cond_4
- move/from16 v6, p5
+ move v6, p5
:goto_4
and-int/lit8 v7, v1, 0x20
@@ -188,30 +175,18 @@
move-object/from16 v9, p8
:goto_7
- and-int/lit16 v10, v1, 0x100
+ and-int/lit16 v1, v1, 0x100
- if-eqz v10, :cond_8
+ if-eqz v1, :cond_8
- iget-object v10, v0, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
+ iget v1, v0, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->outputVolume:F
goto :goto_8
:cond_8
- move-object/from16 v10, p9
+ move/from16 v1, p9
:goto_8
- and-int/lit16 v1, v1, 0x200
-
- if-eqz v1, :cond_9
-
- iget v1, v0, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->outputVolume:F
-
- goto :goto_9
-
- :cond_9
- move/from16 v1, p10
-
- :goto_9
move p1, v2
move p2, v3
@@ -220,7 +195,7 @@
move p4, v5
- move/from16 p5, v6
+ move p5, v6
move/from16 p6, v7
@@ -228,11 +203,9 @@
move-object/from16 p8, v9
- move-object/from16 p9, v10
+ move/from16 p9, v1
- move/from16 p10, v1
-
- invoke-virtual/range {p0 .. p10}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->copy(ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/models/domain/ModelVoice$OutputMode;F)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+ invoke-virtual/range {p0 .. p9}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->copy(ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;F)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
move-result-object v0
@@ -249,14 +222,6 @@
return v0
.end method
-.method public final component10()F
- .locals 1
-
- iget v0, p0, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->outputVolume:F
-
- return v0
-.end method
-
.method public final component2()Z
.locals 1
@@ -313,62 +278,51 @@
return-object v0
.end method
-.method public final component9()Lcom/discord/models/domain/ModelVoice$OutputMode;
+.method public final component9()F
.locals 1
- iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
+ iget v0, p0, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->outputVolume:F
- return-object v0
+ return v0
.end method
-.method public final copy(ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/models/domain/ModelVoice$OutputMode;F)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
- .locals 12
+.method public final copy(ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;F)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+ .locals 11
- const/4 v0, 0x0
+ if-eqz p8, :cond_0
- if-eqz p8, :cond_1
+ new-instance v10, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
- if-eqz p9, :cond_0
+ move-object v0, v10
- new-instance v0, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+ move v1, p1
- move-object v1, v0
+ move v2, p2
- move v2, p1
+ move v3, p3
- move v3, p2
+ move v4, p4
- move v4, p3
+ move/from16 v5, p5
- move/from16 v5, p4
+ move/from16 v6, p6
- move/from16 v6, p5
+ move/from16 v7, p7
- move/from16 v7, p6
+ move-object/from16 v8, p8
- move/from16 v8, p7
+ move/from16 v9, p9
- move-object/from16 v9, p8
+ invoke-direct/range {v0 .. v9}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->(ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;F)V
- move-object/from16 v10, p9
-
- move/from16 v11, p10
-
- invoke-direct/range {v1 .. v11}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->(ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/models/domain/ModelVoice$OutputMode;F)V
-
- return-object v0
+ return-object v10
:cond_0
- const-string v1, "outputMode"
+ const-string v0, "inputMode"
- invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+ invoke-static {v0}, Lt/u/b/j;->a(Ljava/lang/String;)V
- throw v0
-
- :cond_1
- const-string v1, "inputMode"
-
- invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+ const/4 v0, 0x0
throw v0
.end method
@@ -440,16 +394,6 @@
if-eqz v0, :cond_0
- iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- iget-object v1, p1, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- invoke-static {v0, v1}, Lt/u/b/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
- move-result v0
-
- if-eqz v0, :cond_0
-
iget v0, p0, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->outputVolume:F
iget p1, p1, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->outputVolume:F
@@ -514,14 +458,6 @@
return v0
.end method
-.method public final getOutputMode()Lcom/discord/models/domain/ModelVoice$OutputMode;
- .locals 1
-
- iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- return-object v0
-.end method
-
.method public final getOutputVolume()F
.locals 1
@@ -622,8 +558,6 @@
iget-object v1, p0, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->inputMode:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
- const/4 v2, 0x0
-
if-eqz v1, :cond_6
invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
@@ -640,19 +574,6 @@
mul-int/lit8 v0, v0, 0x1f
- iget-object v1, p0, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- if-eqz v1, :cond_7
-
- invoke-virtual {v1}, Ljava/lang/Object;->hashCode()I
-
- move-result v2
-
- :cond_7
- add-int/2addr v0, v2
-
- mul-int/lit8 v0, v0, 0x1f
-
iget v1, p0, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->outputVolume:F
invoke-static {v1}, Lb;->a(F)I
@@ -749,14 +670,6 @@
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
- const-string v1, ", outputMode="
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- iget-object v1, p0, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->outputMode:Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
-
const-string v1, ", outputVolume="
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$WhenMappings.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$WhenMappings.smali
deleted file mode 100644
index 65dd0ac5dc..0000000000
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$WhenMappings.smali
+++ /dev/null
@@ -1,48 +0,0 @@
-.class public final synthetic Lcom/discord/stores/StoreMediaSettings$WhenMappings;
-.super Ljava/lang/Object;
-
-
-# static fields
-.field public static final synthetic $EnumSwitchMapping$0:[I
-
-
-# direct methods
-.method public static synthetic constructor ()V
- .locals 3
-
- invoke-static {}, Lcom/discord/models/domain/ModelVoice$OutputMode;->values()[Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- move-result-object v0
-
- array-length v0, v0
-
- new-array v0, v0, [I
-
- sput-object v0, Lcom/discord/stores/StoreMediaSettings$WhenMappings;->$EnumSwitchMapping$0:[I
-
- sget-object v0, Lcom/discord/stores/StoreMediaSettings$WhenMappings;->$EnumSwitchMapping$0:[I
-
- sget-object v1, Lcom/discord/models/domain/ModelVoice$OutputMode;->IN_EAR:Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- invoke-virtual {v1}, Ljava/lang/Enum;->ordinal()I
-
- move-result v1
-
- const/4 v2, 0x1
-
- aput v2, v0, v1
-
- sget-object v0, Lcom/discord/stores/StoreMediaSettings$WhenMappings;->$EnumSwitchMapping$0:[I
-
- sget-object v1, Lcom/discord/models/domain/ModelVoice$OutputMode;->SPEAKER:Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- invoke-virtual {v1}, Ljava/lang/Enum;->ordinal()I
-
- move-result v1
-
- const/4 v2, 0x2
-
- aput v2, v0, v1
-
- return-void
-.end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$getOutputMode$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$getOutputMode$1.smali
deleted file mode 100644
index f2255215c1..0000000000
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$getOutputMode$1.smali
+++ /dev/null
@@ -1,80 +0,0 @@
-.class public final Lcom/discord/stores/StoreMediaSettings$getOutputMode$1;
-.super Ljava/lang/Object;
-.source "StoreMediaSettings.kt"
-
-# interfaces
-.implements Lb0/l/i;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/stores/StoreMediaSettings;->getOutputMode()Lrx/Observable;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
- accessFlags = 0x19
- name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
- value = {
- "",
- "Ljava/lang/Object;",
- "Lb0/l/i<",
- "TR;TR;>;"
- }
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/stores/StoreMediaSettings$getOutputMode$1;
-
-
-# direct methods
-.method public static constructor ()V
- .locals 1
-
- new-instance v0, Lcom/discord/stores/StoreMediaSettings$getOutputMode$1;
-
- invoke-direct {v0}, Lcom/discord/stores/StoreMediaSettings$getOutputMode$1;->()V
-
- sput-object v0, Lcom/discord/stores/StoreMediaSettings$getOutputMode$1;->INSTANCE:Lcom/discord/stores/StoreMediaSettings$getOutputMode$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 final call(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)Lcom/discord/models/domain/ModelVoice$OutputMode;
- .locals 0
-
- invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getOutputMode()Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- move-result-object p1
-
- return-object p1
-.end method
-
-.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
- .locals 0
-
- check-cast p1, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
-
- invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$getOutputMode$1;->call(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- move-result-object p1
-
- return-object p1
-.end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings$init$1.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings$init$1.smali
deleted file mode 100644
index 0bbb16ca9f..0000000000
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings$init$1.smali
+++ /dev/null
@@ -1,93 +0,0 @@
-.class public final synthetic Lcom/discord/stores/StoreMediaSettings$init$1;
-.super Lt/u/b/i;
-.source "StoreMediaSettings.kt"
-
-# interfaces
-.implements Lkotlin/jvm/functions/Function1;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/stores/StoreMediaSettings;->init(Landroid/content/Context;)V
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
- accessFlags = 0x1019
- name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
- value = {
- "Lt/u/b/i;",
- "Lkotlin/jvm/functions/Function1<",
- "Lcom/discord/utilities/media/AudioOutputState;",
- "Lkotlin/Unit;",
- ">;"
- }
-.end annotation
-
-
-# direct methods
-.method public constructor (Lrx/subjects/SerializedSubject;)V
- .locals 1
-
- const/4 v0, 0x1
-
- invoke-direct {p0, v0, p1}, Lt/u/b/i;->(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/SerializedSubject;
-
- invoke-static {v0}, Lt/u/b/w;->getOrCreateKotlinClass(Ljava/lang/Class;)Lt/y/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, Lcom/discord/utilities/media/AudioOutputState;
-
- invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMediaSettings$init$1;->invoke(Lcom/discord/utilities/media/AudioOutputState;)V
-
- sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit;
-
- return-object p1
-.end method
-
-.method public final invoke(Lcom/discord/utilities/media/AudioOutputState;)V
- .locals 1
-
- iget-object v0, p0, Lt/u/b/b;->receiver:Ljava/lang/Object;
-
- check-cast v0, Lrx/subjects/SerializedSubject;
-
- invoke-virtual {v0, p1}, Lrx/subjects/SerializedSubject;->onNext(Ljava/lang/Object;)V
-
- return-void
-.end method
diff --git a/com.discord/smali/com/discord/stores/StoreMediaSettings.smali b/com.discord/smali/com/discord/stores/StoreMediaSettings.smali
index 8e746d9d8c..6167680052 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaSettings.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaSettings.smali
@@ -17,8 +17,6 @@
.field public static final DEFAULT_AUDIO_MODE:I = 0x3
-.field public static final DEFAULT_OUTPUT_STATE:Lcom/discord/utilities/media/AudioOutputState;
-
.field public static final DEFAULT_OUTPUT_VOLUME:F = 100.0f
.field public static final DEFAULT_VOICE_CONFIG:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
@@ -48,19 +46,6 @@
.end annotation
.end field
-.field public audioOutputMonitor:Lcom/discord/utilities/media/AudioOutputMonitor;
-
-.field public final audioOutputStateSubject:Lrx/subjects/SerializedSubject;
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "Lrx/subjects/SerializedSubject<",
- "Lcom/discord/utilities/media/AudioOutputState;",
- "Lcom/discord/utilities/media/AudioOutputState;",
- ">;"
- }
- .end annotation
-.end field
-
.field public canUseVad:Z
.field public enableVideoHardwareScaling:Z
@@ -194,7 +179,7 @@
# direct methods
.method public static constructor ()V
- .locals 13
+ .locals 12
new-instance v0, Lcom/discord/stores/StoreMediaSettings$Companion;
@@ -208,8 +193,6 @@
sget-object v10, Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;->d:Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
- sget-object v11, Lcom/discord/models/domain/ModelVoice$OutputMode;->SPEAKER:Lcom/discord/models/domain/ModelVoice$OutputMode;
-
const/4 v3, 0x0
const/4 v4, 0x0
@@ -224,27 +207,19 @@
const/high16 v9, -0x3db80000 # -50.0f
- const/high16 v12, 0x42c80000 # 100.0f
+ const/high16 v11, 0x42c80000 # 100.0f
move-object v2, v0
- invoke-direct/range {v2 .. v12}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->(ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/models/domain/ModelVoice$OutputMode;F)V
+ invoke-direct/range {v2 .. v11}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->(ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;F)V
sput-object v0, Lcom/discord/stores/StoreMediaSettings;->DEFAULT_VOICE_CONFIG:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
- new-instance v0, Lcom/discord/utilities/media/AudioOutputState;
-
- const/4 v1, 0x1
-
- invoke-direct {v0, v1, v1, v1, v1}, Lcom/discord/utilities/media/AudioOutputState;->(ZZZZ)V
-
- sput-object v0, Lcom/discord/stores/StoreMediaSettings;->DEFAULT_OUTPUT_STATE:Lcom/discord/utilities/media/AudioOutputState;
-
return-void
.end method
.method public constructor (Lcom/discord/stores/StoreStream;)V
- .locals 3
+ .locals 8
if-eqz p1, :cond_0
@@ -400,22 +375,110 @@
iput-object p1, p0, Lcom/discord/stores/StoreMediaSettings;->audioModeSubject:Lrx/subjects/SerializedSubject;
- new-instance p1, Lrx/subjects/SerializedSubject;
-
- sget-object v0, Lcom/discord/stores/StoreMediaSettings;->DEFAULT_OUTPUT_STATE:Lcom/discord/utilities/media/AudioOutputState;
-
- invoke-static {v0}, Lrx/subjects/BehaviorSubject;->a(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;->audioOutputStateSubject:Lrx/subjects/SerializedSubject;
-
const/4 p1, 0x1
iput-boolean p1, p0, Lcom/discord/stores/StoreMediaSettings;->canUseVad:Z
+ iget-object p1, p0, Lcom/discord/stores/StoreMediaSettings;->voiceConfigurationCache:Lcom/discord/utilities/persister/Persister;
+
+ invoke-virtual {p1}, Lcom/discord/utilities/persister/Persister;->get()Ljava/lang/Object;
+
+ move-result-object p1
+
+ check-cast p1, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+
+ invoke-direct {p0, p1}, Lcom/discord/stores/StoreMediaSettings;->setVoiceConfiguration(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)V
+
+ iget-object p1, p0, Lcom/discord/stores/StoreMediaSettings;->mutedUsersCache:Lcom/discord/utilities/persister/Persister;
+
+ invoke-virtual {p1}, Lcom/discord/utilities/persister/Persister;->get()Ljava/lang/Object;
+
+ move-result-object p1
+
+ check-cast p1, Ljava/util/Map;
+
+ invoke-direct {p0, p1}, Lcom/discord/stores/StoreMediaSettings;->setMutedUsers(Ljava/util/Map;)V
+
+ iget-object p1, p0, Lcom/discord/stores/StoreMediaSettings;->userOutputVolumesCache:Lcom/discord/utilities/persister/Persister;
+
+ invoke-virtual {p1}, Lcom/discord/utilities/persister/Persister;->get()Ljava/lang/Object;
+
+ move-result-object p1
+
+ check-cast p1, Ljava/util/Map;
+
+ invoke-direct {p0, p1}, Lcom/discord/stores/StoreMediaSettings;->setUserOutputVolumes(Ljava/util/Map;)V
+
+ iget-object p1, p0, Lcom/discord/stores/StoreMediaSettings;->enableVideoHardwareScalingCache:Lcom/discord/utilities/persister/Persister;
+
+ invoke-virtual {p1}, Lcom/discord/utilities/persister/Persister;->get()Ljava/lang/Object;
+
+ move-result-object p1
+
+ check-cast p1, Ljava/lang/Boolean;
+
+ invoke-virtual {p1}, Ljava/lang/Boolean;->booleanValue()Z
+
+ move-result p1
+
+ invoke-direct {p0, p1}, Lcom/discord/stores/StoreMediaSettings;->setEnableVideoHardwareScaling(Z)V
+
+ iget-object p1, p0, Lcom/discord/stores/StoreMediaSettings;->audioModeCache:Lcom/discord/utilities/persister/Persister;
+
+ invoke-virtual {p1}, Lcom/discord/utilities/persister/Persister;->get()Ljava/lang/Object;
+
+ move-result-object p1
+
+ check-cast p1, Ljava/lang/Number;
+
+ invoke-virtual {p1}, Ljava/lang/Number;->intValue()I
+
+ move-result p1
+
+ invoke-direct {p0, p1}, Lcom/discord/stores/StoreMediaSettings;->setAudioMode(I)V
+
+ iget-object p1, p0, Lcom/discord/stores/StoreMediaSettings;->stream:Lcom/discord/stores/StoreStream;
+
+ invoke-virtual {p1}, Lcom/discord/stores/StoreStream;->getVoiceChannelSelected$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreVoiceChannelSelected;
+
+ move-result-object p1
+
+ invoke-virtual {p1}, Lcom/discord/stores/StoreVoiceChannelSelected;->getId()Lrx/Observable;
+
+ move-result-object p1
+
+ new-instance v0, Lcom/discord/stores/StoreMediaSettings$1;
+
+ invoke-direct {v0, p0}, Lcom/discord/stores/StoreMediaSettings$1;->(Lcom/discord/stores/StoreMediaSettings;)V
+
+ invoke-virtual {p1, v0}, Lrx/Observable;->k(Lb0/l/i;)Lrx/Observable;
+
+ move-result-object p1
+
+ sget-object v0, Le/a/b/k;->a:Le/a/b/k;
+
+ new-instance v1, Lcom/discord/stores/StoreMediaSettings$2;
+
+ invoke-direct {v1, p0}, Lcom/discord/stores/StoreMediaSettings$2;->(Lcom/discord/stores/StoreMediaSettings;)V
+
+ const-class v2, Lcom/discord/stores/StoreMediaSettings;
+
+ const/4 v3, 0x0
+
+ const/4 v4, 0x0
+
+ const/4 v5, 0x0
+
+ const/4 v6, 0x0
+
+ const/16 v7, 0x3c
+
+ invoke-static/range {v0 .. v7}, Le/a/b/k;->a(Le/a/b/k;Lkotlin/jvm/functions/Function1;Ljava/lang/Class;Lrx/functions/Action1;Lkotlin/jvm/functions/Function1;Landroid/content/Context;Lkotlin/jvm/functions/Function0;I)Lrx/Observable$c;
+
+ move-result-object v0
+
+ invoke-virtual {p1, v0}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
+
return-void
:cond_0
@@ -460,61 +523,6 @@
throw p1
.end method
-.method private final sanitize(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
- .locals 7
-
- invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getInputMode()Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;
-
- move-result-object v0
-
- if-nez v0, :cond_0
-
- sget-object v1, Lcom/discord/app/AppLog;->c:Lcom/discord/app/AppLog;
-
- const/4 v3, 0x0
-
- const/4 v4, 0x0
-
- const/4 v5, 0x6
-
- const/4 v6, 0x0
-
- const-string v2, "inputMode was null"
-
- invoke-static/range {v1 .. v6}, 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
-
- sget-object p1, Lcom/discord/stores/StoreMediaSettings;->DEFAULT_VOICE_CONFIG:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
-
- goto :goto_0
-
- :cond_0
- invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getOutputMode()Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- move-result-object v0
-
- if-nez v0, :cond_1
-
- sget-object v1, Lcom/discord/app/AppLog;->c:Lcom/discord/app/AppLog;
-
- const/4 v3, 0x0
-
- const/4 v4, 0x0
-
- const/4 v5, 0x6
-
- const/4 v6, 0x0
-
- const-string v2, "outputMode was null"
-
- invoke-static/range {v1 .. v6}, 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
-
- sget-object p1, Lcom/discord/stores/StoreMediaSettings;->DEFAULT_VOICE_CONFIG:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
-
- :cond_1
- :goto_0
- return-object p1
-.end method
-
.method private final setAudioMode(I)V
.locals 3
@@ -656,7 +664,7 @@
.end method
.method private final updateForceMute()V
- .locals 14
+ .locals 13
iget-boolean v0, p0, Lcom/discord/stores/StoreMediaSettings;->canUseVad:Z
@@ -706,13 +714,11 @@
const/4 v10, 0x0
- const/4 v11, 0x0
+ const/16 v11, 0x1fe
- const/16 v12, 0x3fe
+ const/4 v12, 0x0
- const/4 v13, 0x0
-
- invoke-static/range {v1 .. v13}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->copy$default(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/models/domain/ModelVoice$OutputMode;FILjava/lang/Object;)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+ invoke-static/range {v1 .. v12}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->copy$default(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;FILjava/lang/Object;)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
move-result-object v0
@@ -762,34 +768,6 @@
throw v0
.end method
-.method public final getAudioOutputState()Lrx/Observable;
- .locals 2
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "()",
- "Lrx/Observable<",
- "Lcom/discord/utilities/media/AudioOutputState;",
- ">;"
- }
- .end annotation
-
- iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings;->audioOutputStateSubject: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;->a()Lrx/Observable;
-
- move-result-object v0
-
- const-string v1, "audioOutputStateSubject\n\u2026 .distinctUntilChanged()"
-
- invoke-static {v0, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- return-object v0
-.end method
-
.method public final getAutomaticGainControl()Lrx/Observable;
.locals 2
.annotation system Ldalvik/annotation/Signature;
@@ -1008,44 +986,6 @@
return-object v0
.end method
-.method public final getOutputMode()Lrx/Observable;
- .locals 2
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "()",
- "Lrx/Observable<",
- "Lcom/discord/models/domain/ModelVoice$OutputMode;",
- ">;"
- }
- .end annotation
-
- iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings;->voiceConfigurationSubject:Lrx/subjects/SerializedSubject;
-
- sget-object v1, Lcom/discord/stores/StoreMediaSettings$getOutputMode$1;->INSTANCE:Lcom/discord/stores/StoreMediaSettings$getOutputMode$1;
-
- invoke-virtual {v0, v1}, Lrx/Observable;->f(Lb0/l/i;)Lrx/Observable;
-
- move-result-object v0
-
- const-string v1, "voiceConfigurationSubjec\u2026 .map { it.outputMode }"
-
- invoke-static {v0, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
-
- move-result-object v0
-
- invoke-virtual {v0}, Lrx/Observable;->a()Lrx/Observable;
-
- move-result-object v0
-
- const-string v1, "voiceConfigurationSubjec\u2026 .distinctUntilChanged()"
-
- invoke-static {v0, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
-
- return-object v0
-.end method
-
.method public final getOutputVolume()Lrx/Observable;
.locals 2
.annotation system Ldalvik/annotation/Signature;
@@ -1358,185 +1298,6 @@
throw v0
.end method
-.method public init(Landroid/content/Context;)V
- .locals 11
-
- const/4 v0, 0x0
-
- if-eqz p1, :cond_2
-
- new-instance v1, Lcom/discord/utilities/media/AudioOutputMonitor;
-
- invoke-direct {v1}, Lcom/discord/utilities/media/AudioOutputMonitor;->()V
-
- iput-object v1, p0, Lcom/discord/stores/StoreMediaSettings;->audioOutputMonitor:Lcom/discord/utilities/media/AudioOutputMonitor;
-
- iget-object v1, p0, Lcom/discord/stores/StoreMediaSettings;->voiceConfigurationCache:Lcom/discord/utilities/persister/Persister;
-
- invoke-virtual {v1}, Lcom/discord/utilities/persister/Persister;->get()Ljava/lang/Object;
-
- move-result-object v1
-
- check-cast v1, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
-
- invoke-direct {p0, v1}, Lcom/discord/stores/StoreMediaSettings;->sanitize(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
-
- move-result-object v1
-
- invoke-direct {p0, v1}, Lcom/discord/stores/StoreMediaSettings;->setVoiceConfiguration(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)V
-
- iget-object v1, p0, Lcom/discord/stores/StoreMediaSettings;->mutedUsersCache:Lcom/discord/utilities/persister/Persister;
-
- invoke-virtual {v1}, Lcom/discord/utilities/persister/Persister;->get()Ljava/lang/Object;
-
- move-result-object v1
-
- check-cast v1, Ljava/util/Map;
-
- invoke-direct {p0, v1}, Lcom/discord/stores/StoreMediaSettings;->setMutedUsers(Ljava/util/Map;)V
-
- iget-object v1, p0, Lcom/discord/stores/StoreMediaSettings;->userOutputVolumesCache:Lcom/discord/utilities/persister/Persister;
-
- invoke-virtual {v1}, Lcom/discord/utilities/persister/Persister;->get()Ljava/lang/Object;
-
- move-result-object v1
-
- check-cast v1, Ljava/util/Map;
-
- invoke-direct {p0, v1}, Lcom/discord/stores/StoreMediaSettings;->setUserOutputVolumes(Ljava/util/Map;)V
-
- iget-object v1, p0, Lcom/discord/stores/StoreMediaSettings;->enableVideoHardwareScalingCache:Lcom/discord/utilities/persister/Persister;
-
- invoke-virtual {v1}, Lcom/discord/utilities/persister/Persister;->get()Ljava/lang/Object;
-
- move-result-object v1
-
- check-cast v1, Ljava/lang/Boolean;
-
- invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
-
- move-result v1
-
- invoke-direct {p0, v1}, Lcom/discord/stores/StoreMediaSettings;->setEnableVideoHardwareScaling(Z)V
-
- iget-object v1, p0, Lcom/discord/stores/StoreMediaSettings;->audioModeCache:Lcom/discord/utilities/persister/Persister;
-
- invoke-virtual {v1}, Lcom/discord/utilities/persister/Persister;->get()Ljava/lang/Object;
-
- move-result-object v1
-
- check-cast v1, Ljava/lang/Number;
-
- invoke-virtual {v1}, Ljava/lang/Number;->intValue()I
-
- move-result v1
-
- invoke-direct {p0, v1}, Lcom/discord/stores/StoreMediaSettings;->setAudioMode(I)V
-
- iget-object v1, p0, Lcom/discord/stores/StoreMediaSettings;->audioOutputMonitor:Lcom/discord/utilities/media/AudioOutputMonitor;
-
- const-string v2, "audioOutputMonitor"
-
- if-eqz v1, :cond_1
-
- invoke-virtual {v1}, Lcom/discord/utilities/media/AudioOutputMonitor;->getOutputState()Lrx/Observable;
-
- move-result-object v1
-
- sget-object v3, Le/a/b/k;->a:Le/a/b/k;
-
- new-instance v4, Lcom/discord/stores/StoreMediaSettings$init$1;
-
- iget-object v5, p0, Lcom/discord/stores/StoreMediaSettings;->audioOutputStateSubject:Lrx/subjects/SerializedSubject;
-
- invoke-direct {v4, v5}, Lcom/discord/stores/StoreMediaSettings$init$1;->(Lrx/subjects/SerializedSubject;)V
-
- const-class v5, Lcom/discord/stores/StoreMediaSettings;
-
- const/4 v6, 0x0
-
- const/4 v7, 0x0
-
- const/4 v8, 0x0
-
- const/4 v9, 0x0
-
- const/16 v10, 0x3c
-
- invoke-static/range {v3 .. v10}, Le/a/b/k;->a(Le/a/b/k;Lkotlin/jvm/functions/Function1;Ljava/lang/Class;Lrx/functions/Action1;Lkotlin/jvm/functions/Function1;Landroid/content/Context;Lkotlin/jvm/functions/Function0;I)Lrx/Observable$c;
-
- move-result-object v3
-
- invoke-virtual {v1, v3}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
-
- iget-object v1, p0, Lcom/discord/stores/StoreMediaSettings;->audioOutputMonitor:Lcom/discord/utilities/media/AudioOutputMonitor;
-
- if-eqz v1, :cond_0
-
- invoke-virtual {v1, p1}, Lcom/discord/utilities/media/AudioOutputMonitor;->bindContext(Landroid/content/Context;)V
-
- iget-object p1, p0, Lcom/discord/stores/StoreMediaSettings;->stream:Lcom/discord/stores/StoreStream;
-
- invoke-virtual {p1}, Lcom/discord/stores/StoreStream;->getVoiceChannelSelected$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreVoiceChannelSelected;
-
- move-result-object p1
-
- invoke-virtual {p1}, Lcom/discord/stores/StoreVoiceChannelSelected;->getId()Lrx/Observable;
-
- move-result-object p1
-
- new-instance v0, Lcom/discord/stores/StoreMediaSettings$init$2;
-
- invoke-direct {v0, p0}, Lcom/discord/stores/StoreMediaSettings$init$2;->(Lcom/discord/stores/StoreMediaSettings;)V
-
- invoke-virtual {p1, v0}, Lrx/Observable;->k(Lb0/l/i;)Lrx/Observable;
-
- move-result-object p1
-
- sget-object v0, Le/a/b/k;->a:Le/a/b/k;
-
- new-instance v1, Lcom/discord/stores/StoreMediaSettings$init$3;
-
- invoke-direct {v1, p0}, Lcom/discord/stores/StoreMediaSettings$init$3;->(Lcom/discord/stores/StoreMediaSettings;)V
-
- const-class v2, Lcom/discord/stores/StoreMediaSettings;
-
- const/4 v3, 0x0
-
- const/4 v4, 0x0
-
- const/4 v5, 0x0
-
- const/4 v6, 0x0
-
- const/16 v7, 0x3c
-
- invoke-static/range {v0 .. v7}, Le/a/b/k;->a(Le/a/b/k;Lkotlin/jvm/functions/Function1;Ljava/lang/Class;Lrx/functions/Action1;Lkotlin/jvm/functions/Function1;Landroid/content/Context;Lkotlin/jvm/functions/Function0;I)Lrx/Observable$c;
-
- move-result-object v0
-
- invoke-virtual {p1, v0}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable;
-
- return-void
-
- :cond_0
- invoke-static {v2}, Lt/u/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
- throw v0
-
- :cond_1
- invoke-static {v2}, Lt/u/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
-
- throw v0
-
- :cond_2
- const-string p1, "context"
-
- invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
-
- throw v0
-.end method
-
.method public final isSelfDeafened()Lrx/Observable;
.locals 2
.annotation system Ldalvik/annotation/Signature;
@@ -1614,7 +1375,7 @@
.end method
.method public final declared-synchronized setOutputVolume(F)V
- .locals 13
+ .locals 12
monitor-enter p0
@@ -1637,15 +1398,13 @@
const/4 v8, 0x0
- const/4 v9, 0x0
+ const/16 v10, 0xff
- const/16 v11, 0x1ff
+ const/4 v11, 0x0
- const/4 v12, 0x0
+ move v9, p1
- move v10, p1
-
- invoke-static/range {v0 .. v12}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->copy$default(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/models/domain/ModelVoice$OutputMode;FILjava/lang/Object;)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+ invoke-static/range {v0 .. v11}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->copy$default(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;FILjava/lang/Object;)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
move-result-object p1
@@ -1666,7 +1425,7 @@
.end method
.method public final declared-synchronized setSelfDeafen(Z)V
- .locals 13
+ .locals 12
monitor-enter p0
@@ -1689,15 +1448,13 @@
const/4 v9, 0x0
- const/4 v10, 0x0
+ const/16 v10, 0x1fd
- const/16 v11, 0x3fd
-
- const/4 v12, 0x0
+ const/4 v11, 0x0
move v2, p1
- invoke-static/range {v0 .. v12}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->copy$default(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/models/domain/ModelVoice$OutputMode;FILjava/lang/Object;)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+ invoke-static/range {v0 .. v11}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->copy$default(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;FILjava/lang/Object;)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
move-result-object p1
@@ -1718,7 +1475,7 @@
.end method
.method public final declared-synchronized setSensitivity(F)V
- .locals 13
+ .locals 12
monitor-enter p0
@@ -1741,15 +1498,13 @@
const/4 v9, 0x0
- const/4 v10, 0x0
+ const/16 v10, 0x1bf
- const/16 v11, 0x3bf
-
- const/4 v12, 0x0
+ const/4 v11, 0x0
move v7, p1
- invoke-static/range {v0 .. v12}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->copy$default(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/models/domain/ModelVoice$OutputMode;FILjava/lang/Object;)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+ invoke-static/range {v0 .. v11}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->copy$default(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;FILjava/lang/Object;)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
move-result-object p1
@@ -1808,7 +1563,7 @@
.end method
.method public final declared-synchronized setVoiceInputMode(Lcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;)V
- .locals 14
+ .locals 13
monitor-enter p0
@@ -1835,15 +1590,13 @@
const/4 v10, 0x0
- const/4 v11, 0x0
+ const/16 v11, 0x17f
- const/16 v12, 0x37f
-
- const/4 v13, 0x0
+ const/4 v12, 0x0
move-object v9, p1
- invoke-static/range {v1 .. v13}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->copy$default(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/models/domain/ModelVoice$OutputMode;FILjava/lang/Object;)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+ invoke-static/range {v1 .. v12}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->copy$default(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;FILjava/lang/Object;)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
move-result-object p1
@@ -1876,7 +1629,7 @@
.end method
.method public final declared-synchronized toggleAutomaticGainControl()V
- .locals 13
+ .locals 12
monitor-enter p0
@@ -1915,13 +1668,11 @@
const/4 v9, 0x0
- const/4 v10, 0x0
+ const/16 v10, 0x1f7
- const/16 v11, 0x3f7
+ const/4 v11, 0x0
- const/4 v12, 0x0
-
- invoke-static/range {v0 .. v12}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->copy$default(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/models/domain/ModelVoice$OutputMode;FILjava/lang/Object;)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+ invoke-static/range {v0 .. v11}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->copy$default(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;FILjava/lang/Object;)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
move-result-object v0
@@ -1942,7 +1693,7 @@
.end method
.method public final declared-synchronized toggleAutomaticVAD()V
- .locals 13
+ .locals 12
monitor-enter p0
@@ -1981,13 +1732,11 @@
const/4 v9, 0x0
- const/4 v10, 0x0
+ const/16 v10, 0x1fb
- const/16 v11, 0x3fb
+ const/4 v11, 0x0
- const/4 v12, 0x0
-
- invoke-static/range {v0 .. v12}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->copy$default(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/models/domain/ModelVoice$OutputMode;FILjava/lang/Object;)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+ invoke-static/range {v0 .. v11}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->copy$default(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;FILjava/lang/Object;)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
move-result-object v0
@@ -2008,7 +1757,7 @@
.end method
.method public final declared-synchronized toggleEchoCancellation()V
- .locals 13
+ .locals 12
monitor-enter p0
@@ -2047,13 +1796,11 @@
const/4 v9, 0x0
- const/4 v10, 0x0
+ const/16 v10, 0x1ef
- const/16 v11, 0x3ef
+ const/4 v11, 0x0
- const/4 v12, 0x0
-
- invoke-static/range {v0 .. v12}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->copy$default(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/models/domain/ModelVoice$OutputMode;FILjava/lang/Object;)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+ invoke-static/range {v0 .. v11}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->copy$default(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;FILjava/lang/Object;)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
move-result-object v0
@@ -2108,7 +1855,7 @@
.end method
.method public final declared-synchronized toggleNoiseSuppression()V
- .locals 13
+ .locals 12
monitor-enter p0
@@ -2147,100 +1894,11 @@
const/4 v9, 0x0
- const/4 v10, 0x0
+ const/16 v10, 0x1df
- const/16 v11, 0x3df
+ const/4 v11, 0x0
- const/4 v12, 0x0
-
- invoke-static/range {v0 .. v12}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->copy$default(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/models/domain/ModelVoice$OutputMode;FILjava/lang/Object;)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
-
- move-result-object v0
-
- invoke-direct {p0, v0}, Lcom/discord/stores/StoreMediaSettings;->setVoiceConfiguration(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)V
- :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 public final declared-synchronized toggleOutputMode()V
- .locals 13
-
- monitor-enter p0
-
- :try_start_0
- iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings;->voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
-
- const/4 v1, 0x0
-
- const/4 v2, 0x0
-
- const/4 v3, 0x0
-
- const/4 v4, 0x0
-
- const/4 v5, 0x0
-
- const/4 v6, 0x0
-
- const/4 v7, 0x0
-
- const/4 v8, 0x0
-
- iget-object v9, p0, Lcom/discord/stores/StoreMediaSettings;->voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
-
- invoke-virtual {v9}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getOutputMode()Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- move-result-object v9
-
- sget-object v10, Lcom/discord/stores/StoreMediaSettings$WhenMappings;->$EnumSwitchMapping$0:[I
-
- invoke-virtual {v9}, Ljava/lang/Enum;->ordinal()I
-
- move-result v9
-
- aget v9, v10, v9
-
- const/4 v10, 0x1
-
- if-eq v9, v10, :cond_1
-
- const/4 v10, 0x2
-
- if-ne v9, v10, :cond_0
-
- sget-object v9, Lcom/discord/models/domain/ModelVoice$OutputMode;->IN_EAR:Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- goto :goto_0
-
- :cond_0
- new-instance v0, Lt/g;
-
- invoke-direct {v0}, Lt/g;->()V
-
- throw v0
-
- :cond_1
- sget-object v9, Lcom/discord/models/domain/ModelVoice$OutputMode;->SPEAKER:Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- :goto_0
- const/4 v10, 0x0
-
- const/16 v11, 0x2ff
-
- const/4 v12, 0x0
-
- invoke-static/range {v0 .. v12}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->copy$default(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/models/domain/ModelVoice$OutputMode;FILjava/lang/Object;)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+ invoke-static/range {v0 .. v11}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->copy$default(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;FILjava/lang/Object;)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
move-result-object v0
@@ -2261,7 +1919,7 @@
.end method
.method public final declared-synchronized toggleSelfDeafened()V
- .locals 13
+ .locals 12
monitor-enter p0
@@ -2300,13 +1958,11 @@
const/4 v9, 0x0
- const/4 v10, 0x0
+ const/16 v10, 0x1fd
- const/16 v11, 0x3fd
+ const/4 v11, 0x0
- const/4 v12, 0x0
-
- invoke-static/range {v0 .. v12}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->copy$default(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/models/domain/ModelVoice$OutputMode;FILjava/lang/Object;)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+ invoke-static/range {v0 .. v11}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->copy$default(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;FILjava/lang/Object;)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
move-result-object v0
@@ -2327,47 +1983,47 @@
.end method
.method public final declared-synchronized toggleSelfMuted()Z
- .locals 17
-
- move-object/from16 v1, p0
+ .locals 15
monitor-enter p0
:try_start_0
- iget-boolean v0, v1, Lcom/discord/stores/StoreMediaSettings;->forceSelfMute:Z
+ iget-boolean v0, p0, Lcom/discord/stores/StoreMediaSettings;->forceSelfMute:Z
:try_end_0
.catchall {:try_start_0 .. :try_end_0} :catchall_0
- const/4 v2, 0x0
+ const/4 v1, 0x0
if-eqz v0, :cond_0
monitor-exit p0
- return v2
+ return v1
:cond_0
:try_start_1
- iget-object v3, v1, Lcom/discord/stores/StoreMediaSettings;->voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+ iget-object v2, p0, Lcom/discord/stores/StoreMediaSettings;->voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
- iget-object v0, v1, Lcom/discord/stores/StoreMediaSettings;->voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+ iget-object v0, p0, Lcom/discord/stores/StoreMediaSettings;->voiceConfiguration:Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
invoke-virtual {v0}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->isMuted()Z
move-result v0
- const/16 v16, 0x1
+ const/4 v14, 0x1
if-nez v0, :cond_1
- const/4 v4, 0x1
+ const/4 v3, 0x1
goto :goto_0
:cond_1
- const/4 v4, 0x0
+ const/4 v3, 0x0
:goto_0
+ const/4 v4, 0x0
+
const/4 v5, 0x0
const/4 v6, 0x0
@@ -2382,25 +2038,21 @@
const/4 v11, 0x0
- const/4 v12, 0x0
+ const/16 v12, 0x1fe
const/4 v13, 0x0
- const/16 v14, 0x3fe
-
- const/4 v15, 0x0
-
- invoke-static/range {v3 .. v15}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->copy$default(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;Lcom/discord/models/domain/ModelVoice$OutputMode;FILjava/lang/Object;)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
+ invoke-static/range {v2 .. v13}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->copy$default(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZZZZZZFLcom/discord/rtcconnection/mediaengine/MediaEngineConnection$InputMode;FILjava/lang/Object;)Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;
move-result-object v0
- invoke-direct {v1, v0}, Lcom/discord/stores/StoreMediaSettings;->setVoiceConfiguration(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)V
+ invoke-direct {p0, v0}, Lcom/discord/stores/StoreMediaSettings;->setVoiceConfiguration(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;)V
:try_end_1
.catchall {:try_start_1 .. :try_end_1} :catchall_0
monitor-exit p0
- return v16
+ return v14
:catchall_0
move-exception v0
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$markUnread$2$1.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$markUnread$2$1.smali
index b29947b75d..b052d171b7 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$markUnread$2$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$markUnread$2$1.smali
@@ -266,6 +266,10 @@
sub-long/2addr v2, v6
+ const-wide v6, 0x14aa2cab000L
+
+ sub-long/2addr v2, v6
+
shl-long/2addr v2, v0
:goto_5
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$1.smali b/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$1.smali
index da9acd0d00..82e151973b 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$1.smali
@@ -73,7 +73,7 @@
if-eqz p1, :cond_0
- const v0, 0x7f120436
+ const v0, 0x7f12043f
invoke-virtual {p1, v0}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$2.smali b/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$2.smali
index 8717dd3bbf..437e4dd904 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$2.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$displayConnectionErrorNotice$2.smali
@@ -61,7 +61,7 @@
if-eqz p1, :cond_0
- const v0, 0x7f12043a
+ const v0, 0x7f120443
const/4 v1, 0x2
@@ -69,7 +69,7 @@
const/4 v2, 0x0
- const v3, 0x7f1211a0
+ const v3, 0x7f1211a8
invoke-virtual {p1, v3}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
@@ -79,7 +79,7 @@
const/4 v2, 0x1
- const v3, 0x7f1212b3
+ const v3, 0x7f1212bb
invoke-virtual {p1, v3}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/stores/StoreStream$Companion.smali b/com.discord/smali/com/discord/stores/StoreStream$Companion.smali
index 11c9e97092..ab5b856a87 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$Companion.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$Companion.smali
@@ -117,6 +117,20 @@
return-object v0
.end method
+.method public final getAudioDevices()Lcom/discord/stores/StoreAudioDevices;
+ .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;->getAudioDevices$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreAudioDevices;
+
+ move-result-object v0
+
+ return-object v0
+.end method
+
.method public final getAuditLog()Lcom/discord/stores/StoreAuditLog;
.locals 1
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 547048d9bd..4d5f37d761 100644
--- a/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream$deferredInit$1.smali
@@ -332,7 +332,7 @@
iget-object v3, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->$context:Landroid/app/Application;
- invoke-virtual {v2, v3}, Lcom/discord/stores/StoreMediaSettings;->init(Landroid/content/Context;)V
+ invoke-virtual {v2, v3}, Lcom/discord/stores/Store;->init(Landroid/content/Context;)V
iget-object v2, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
@@ -472,6 +472,14 @@
iget-object v1, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+ invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getAudioDevices$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreAudioDevices;
+
+ move-result-object v1
+
+ invoke-virtual {v1}, Lcom/discord/stores/StoreAudioDevices;->init()V
+
+ iget-object v1, p0, Lcom/discord/stores/StoreStream$deferredInit$1;->this$0:Lcom/discord/stores/StoreStream;
+
invoke-virtual {v1}, Lcom/discord/stores/StoreStream;->getAuthentication$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreAuthentication;
move-result-object v2
diff --git a/com.discord/smali/com/discord/stores/StoreStream.smali b/com.discord/smali/com/discord/stores/StoreStream.smali
index 91cb56ff30..2836a0d92d 100644
--- a/com.discord/smali/com/discord/stores/StoreStream.smali
+++ b/com.discord/smali/com/discord/stores/StoreStream.smali
@@ -32,6 +32,8 @@
.field public final applicationStreaming:Lcom/discord/stores/StoreApplicationStreaming;
+.field public final audioDevices:Lcom/discord/stores/StoreAudioDevices;
+
.field public final audioManager:Lcom/discord/stores/StoreAudioManager;
.field public final auditLog:Lcom/discord/stores/StoreAuditLog;
@@ -243,7 +245,7 @@
.end method
.method public constructor ()V
- .locals 10
+ .locals 12
invoke-direct {p0}, Ljava/lang/Object;->()V
@@ -581,31 +583,43 @@
iput-object v0, p0, Lcom/discord/stores/StoreStream;->customEmojis:Lcom/discord/stores/StoreEmojiCustom;
+ new-instance v0, Lcom/discord/stores/StoreAudioDevices;
+
+ iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+
+ const/4 v2, 0x2
+
+ const/4 v3, 0x0
+
+ invoke-direct {v0, v1, v3, v2, v3}, Lcom/discord/stores/StoreAudioDevices;->(Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/media/AudioOutputMonitor;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+ iput-object v0, p0, Lcom/discord/stores/StoreStream;->audioDevices:Lcom/discord/stores/StoreAudioDevices;
+
new-instance v0, Lcom/discord/stores/StoreVoiceChannelSelected;
iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
- iget-object v2, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+ iget-object v4, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
- invoke-direct {v0, p0, v1, v2}, Lcom/discord/stores/StoreVoiceChannelSelected;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
+ invoke-direct {v0, p0, v1, v4}, Lcom/discord/stores/StoreVoiceChannelSelected;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
iput-object v0, p0, Lcom/discord/stores/StoreStream;->voiceChannelSelected:Lcom/discord/stores/StoreVoiceChannelSelected;
new-instance v0, Lcom/discord/stores/StoreGatewayConnection;
- iget-object v5, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
-
- const/4 v6, 0x0
-
- const/4 v7, 0x4
+ iget-object v7, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
const/4 v8, 0x0
- move-object v3, v0
+ const/4 v9, 0x4
- move-object v4, p0
+ const/4 v10, 0x0
- invoke-direct/range {v3 .. v8}, Lcom/discord/stores/StoreGatewayConnection;->(Lcom/discord/stores/StoreStream;Lcom/discord/utilities/time/Clock;Lrx/Scheduler;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ move-object v5, v0
+
+ move-object v6, p0
+
+ invoke-direct/range {v5 .. v10}, Lcom/discord/stores/StoreGatewayConnection;->(Lcom/discord/stores/StoreStream;Lcom/discord/utilities/time/Clock;Lrx/Scheduler;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
iput-object v0, p0, Lcom/discord/stores/StoreStream;->gatewaySocket:Lcom/discord/stores/StoreGatewayConnection;
@@ -637,13 +651,13 @@
iget-object v1, p0, Lcom/discord/stores/StoreStream;->userRelationships:Lcom/discord/stores/StoreUserRelationships;
- iget-object v2, p0, Lcom/discord/stores/StoreStream;->permissions:Lcom/discord/stores/StorePermissions;
+ iget-object v4, p0, Lcom/discord/stores/StoreStream;->permissions:Lcom/discord/stores/StorePermissions;
- iget-object v3, p0, Lcom/discord/stores/StoreStream;->messageAck:Lcom/discord/stores/StoreMessageAck;
+ iget-object v5, p0, Lcom/discord/stores/StoreStream;->messageAck:Lcom/discord/stores/StoreMessageAck;
- iget-object v4, p0, Lcom/discord/stores/StoreStream;->guildSettings:Lcom/discord/stores/StoreUserGuildSettings;
+ iget-object v6, p0, Lcom/discord/stores/StoreStream;->guildSettings:Lcom/discord/stores/StoreUserGuildSettings;
- invoke-direct {v0, v1, v2, v3, v4}, Lcom/discord/stores/StoreMentions;->(Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreMessageAck;Lcom/discord/stores/StoreUserGuildSettings;)V
+ invoke-direct {v0, v1, v4, v5, v6}, Lcom/discord/stores/StoreMentions;->(Lcom/discord/stores/StoreUserRelationships;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreMessageAck;Lcom/discord/stores/StoreUserGuildSettings;)V
iput-object v0, p0, Lcom/discord/stores/StoreStream;->mentions:Lcom/discord/stores/StoreMentions;
@@ -657,11 +671,11 @@
iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
- iget-object v2, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+ iget-object v4, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
- iget-object v3, p0, Lcom/discord/stores/StoreStream;->analytics:Lcom/discord/stores/StoreAnalytics;
+ iget-object v5, p0, Lcom/discord/stores/StoreStream;->analytics:Lcom/discord/stores/StoreAnalytics;
- invoke-direct {v0, p0, v1, v2, v3}, Lcom/discord/stores/StoreRtcConnection;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreAnalytics;)V
+ invoke-direct {v0, p0, v1, v4, v5}, Lcom/discord/stores/StoreRtcConnection;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreAnalytics;)V
iput-object v0, p0, Lcom/discord/stores/StoreStream;->rtcConnection:Lcom/discord/stores/StoreRtcConnection;
@@ -721,13 +735,15 @@
new-instance v0, Lcom/discord/stores/StoreMediaNotification;
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
+ iget-object v1, p0, Lcom/discord/stores/StoreStream;->audioDevices:Lcom/discord/stores/StoreAudioDevices;
- iget-object v2, p0, Lcom/discord/stores/StoreStream;->voiceChannelSelected:Lcom/discord/stores/StoreVoiceChannelSelected;
+ iget-object v4, p0, Lcom/discord/stores/StoreStream;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
- iget-object v3, p0, Lcom/discord/stores/StoreStream;->rtcConnection:Lcom/discord/stores/StoreRtcConnection;
+ iget-object v5, p0, Lcom/discord/stores/StoreStream;->voiceChannelSelected:Lcom/discord/stores/StoreVoiceChannelSelected;
- invoke-direct {v0, v1, v2, v3}, Lcom/discord/stores/StoreMediaNotification;->(Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreRtcConnection;)V
+ iget-object v6, p0, Lcom/discord/stores/StoreStream;->rtcConnection:Lcom/discord/stores/StoreRtcConnection;
+
+ invoke-direct {v0, v1, v4, v5, v6}, Lcom/discord/stores/StoreMediaNotification;->(Lcom/discord/stores/StoreAudioDevices;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreVoiceChannelSelected;Lcom/discord/stores/StoreRtcConnection;)V
iput-object v0, p0, Lcom/discord/stores/StoreStream;->mediaNotification:Lcom/discord/stores/StoreMediaNotification;
@@ -763,19 +779,19 @@
iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
- new-instance v2, Lcom/discord/stores/StoreStream$lazyChannelMembersStore$1;
+ new-instance v4, Lcom/discord/stores/StoreStream$lazyChannelMembersStore$1;
- iget-object v3, p0, Lcom/discord/stores/StoreStream;->channels:Lcom/discord/stores/StoreChannels;
+ iget-object v5, p0, Lcom/discord/stores/StoreStream;->channels:Lcom/discord/stores/StoreChannels;
- invoke-direct {v2, v3}, Lcom/discord/stores/StoreStream$lazyChannelMembersStore$1;->(Lcom/discord/stores/StoreChannels;)V
+ invoke-direct {v4, v5}, Lcom/discord/stores/StoreStream$lazyChannelMembersStore$1;->(Lcom/discord/stores/StoreChannels;)V
- new-instance v3, Lcom/discord/stores/StoreStream$lazyChannelMembersStore$2;
+ new-instance v5, Lcom/discord/stores/StoreStream$lazyChannelMembersStore$2;
- iget-object v4, p0, Lcom/discord/stores/StoreStream;->guildMemberCounts:Lcom/discord/stores/StoreGuildMemberCounts;
+ iget-object v6, p0, Lcom/discord/stores/StoreStream;->guildMemberCounts:Lcom/discord/stores/StoreGuildMemberCounts;
- invoke-direct {v3, v4}, Lcom/discord/stores/StoreStream$lazyChannelMembersStore$2;->(Lcom/discord/stores/StoreGuildMemberCounts;)V
+ invoke-direct {v5, v6}, Lcom/discord/stores/StoreStream$lazyChannelMembersStore$2;->(Lcom/discord/stores/StoreGuildMemberCounts;)V
- invoke-direct {v0, p0, v1, v2, v3}, Lcom/discord/stores/StoreChannelMembersLazy;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
+ invoke-direct {v0, p0, v1, v4, v5}, Lcom/discord/stores/StoreChannelMembersLazy;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;)V
iput-object v0, p0, Lcom/discord/stores/StoreStream;->lazyChannelMembersStore:Lcom/discord/stores/StoreChannelMembersLazy;
@@ -797,11 +813,11 @@
iget-object v1, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
- iget-object v2, p0, Lcom/discord/stores/StoreStream;->notices:Lcom/discord/stores/StoreNotices;
+ iget-object v4, p0, Lcom/discord/stores/StoreStream;->notices:Lcom/discord/stores/StoreNotices;
- iget-object v3, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
+ iget-object v5, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
- invoke-direct {v0, v1, v2, v3}, Lcom/discord/stores/StoreChangeLog;->(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreNotices;Lcom/discord/stores/StoreUser;)V
+ invoke-direct {v0, v1, v4, v5}, Lcom/discord/stores/StoreChangeLog;->(Lcom/discord/utilities/time/Clock;Lcom/discord/stores/StoreNotices;Lcom/discord/stores/StoreUser;)V
iput-object v0, p0, Lcom/discord/stores/StoreStream;->changeLogStore:Lcom/discord/stores/StoreChangeLog;
@@ -809,9 +825,9 @@
iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
- iget-object v2, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+ iget-object v4, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
- invoke-direct {v0, p0, v1, v2}, Lcom/discord/stores/StoreRunningGame;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
+ invoke-direct {v0, p0, v1, v4}, Lcom/discord/stores/StoreRunningGame;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
iput-object v0, p0, Lcom/discord/stores/StoreStream;->runningGame:Lcom/discord/stores/StoreRunningGame;
@@ -865,9 +881,9 @@
iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
- iget-object v2, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+ iget-object v4, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
- invoke-direct {v0, p0, v1, v2}, Lcom/discord/stores/StoreSpotify;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
+ invoke-direct {v0, p0, v1, v4}, Lcom/discord/stores/StoreSpotify;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
iput-object v0, p0, Lcom/discord/stores/StoreStream;->spotify:Lcom/discord/stores/StoreSpotify;
@@ -875,9 +891,9 @@
iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
- iget-object v2, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
+ iget-object v4, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
- invoke-direct {v0, v1, v2}, Lcom/discord/stores/StoreMessageReactions;->(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreUser;)V
+ invoke-direct {v0, v1, v4}, Lcom/discord/stores/StoreMessageReactions;->(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreUser;)V
iput-object v0, p0, Lcom/discord/stores/StoreStream;->messageReactions:Lcom/discord/stores/StoreMessageReactions;
@@ -925,41 +941,41 @@
iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
- iget-object v2, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
+ iget-object v4, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
- iget-object v3, p0, Lcom/discord/stores/StoreStream;->voiceChannelSelected:Lcom/discord/stores/StoreVoiceChannelSelected;
+ iget-object v5, p0, Lcom/discord/stores/StoreStream;->voiceChannelSelected:Lcom/discord/stores/StoreVoiceChannelSelected;
- invoke-direct {v0, p0, v1, v2, v3}, Lcom/discord/stores/StoreApplicationStreaming;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreVoiceChannelSelected;)V
+ invoke-direct {v0, p0, v1, v4, v5}, Lcom/discord/stores/StoreApplicationStreaming;->(Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreVoiceChannelSelected;)V
iput-object v0, p0, Lcom/discord/stores/StoreStream;->applicationStreaming:Lcom/discord/stores/StoreApplicationStreaming;
new-instance v0, Lcom/discord/stores/StoreStreamRtcConnection;
- iget-object v5, p0, Lcom/discord/stores/StoreStream;->mediaEngine:Lcom/discord/stores/StoreMediaEngine;
+ iget-object v7, p0, Lcom/discord/stores/StoreStream;->mediaEngine:Lcom/discord/stores/StoreMediaEngine;
- iget-object v6, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
+ iget-object v8, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
- iget-object v8, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
+ iget-object v10, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
- iget-object v9, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+ iget-object v11, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
- move-object v4, v0
+ move-object v6, v0
- move-object v7, p0
+ move-object v9, p0
- invoke-direct/range {v4 .. v9}, Lcom/discord/stores/StoreStreamRtcConnection;->(Lcom/discord/stores/StoreMediaEngine;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
+ invoke-direct/range {v6 .. v11}, Lcom/discord/stores/StoreStreamRtcConnection;->(Lcom/discord/stores/StoreMediaEngine;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreStream;Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
iput-object v0, p0, Lcom/discord/stores/StoreStream;->streamRtcConnection:Lcom/discord/stores/StoreStreamRtcConnection;
new-instance v0, Lcom/discord/stores/StoreAudioManager;
- iget-object v1, p0, Lcom/discord/stores/StoreStream;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
+ iget-object v1, p0, Lcom/discord/stores/StoreStream;->audioDevices:Lcom/discord/stores/StoreAudioDevices;
- iget-object v2, p0, Lcom/discord/stores/StoreStream;->rtcConnection:Lcom/discord/stores/StoreRtcConnection;
+ iget-object v4, p0, Lcom/discord/stores/StoreStream;->mediaSettings:Lcom/discord/stores/StoreMediaSettings;
- iget-object v3, p0, Lcom/discord/stores/StoreStream;->streamRtcConnection:Lcom/discord/stores/StoreStreamRtcConnection;
+ iget-object v5, p0, Lcom/discord/stores/StoreStream;->rtcConnection:Lcom/discord/stores/StoreRtcConnection;
- invoke-direct {v0, v1, v2, v3}, Lcom/discord/stores/StoreAudioManager;->(Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreRtcConnection;Lcom/discord/stores/StoreStreamRtcConnection;)V
+ invoke-direct {v0, v1, v4, v5}, Lcom/discord/stores/StoreAudioManager;->(Lcom/discord/stores/StoreAudioDevices;Lcom/discord/stores/StoreMediaSettings;Lcom/discord/stores/StoreRtcConnection;)V
iput-object v0, p0, Lcom/discord/stores/StoreStream;->audioManager:Lcom/discord/stores/StoreAudioManager;
@@ -967,9 +983,9 @@
iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
- iget-object v2, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
+ iget-object v4, p0, Lcom/discord/stores/StoreStream;->clock:Lcom/discord/utilities/time/Clock;
- invoke-direct {v0, v1, v2}, Lcom/discord/stores/StoreApplicationStreamPreviews;->(Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
+ invoke-direct {v0, v1, v4}, Lcom/discord/stores/StoreApplicationStreamPreviews;->(Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/time/Clock;)V
iput-object v0, p0, Lcom/discord/stores/StoreStream;->applicationStreamPreviews:Lcom/discord/stores/StoreApplicationStreamPreviews;
@@ -977,11 +993,11 @@
iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
- iget-object v2, p0, Lcom/discord/stores/StoreStream;->guilds:Lcom/discord/stores/StoreGuilds;
+ iget-object v4, p0, Lcom/discord/stores/StoreStream;->guilds:Lcom/discord/stores/StoreGuilds;
- iget-object v3, p0, Lcom/discord/stores/StoreStream;->lurking:Lcom/discord/stores/StoreLurking;
+ iget-object v5, p0, Lcom/discord/stores/StoreStream;->lurking:Lcom/discord/stores/StoreLurking;
- invoke-direct {v0, v1, v2, v3}, Lcom/discord/stores/StoreGuildsSorted;->(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreLurking;)V
+ invoke-direct {v0, v1, v4, v5}, Lcom/discord/stores/StoreGuildsSorted;->(Lcom/discord/stores/Dispatcher;Lcom/discord/stores/StoreGuilds;Lcom/discord/stores/StoreLurking;)V
iput-object v0, p0, Lcom/discord/stores/StoreStream;->guildsSorted:Lcom/discord/stores/StoreGuildsSorted;
@@ -997,13 +1013,13 @@
iget-object v1, p0, Lcom/discord/stores/StoreStream;->customEmojis:Lcom/discord/stores/StoreEmojiCustom;
- iget-object v2, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
+ iget-object v4, p0, Lcom/discord/stores/StoreStream;->users:Lcom/discord/stores/StoreUser;
- iget-object v3, p0, Lcom/discord/stores/StoreStream;->permissions:Lcom/discord/stores/StorePermissions;
+ iget-object v5, p0, Lcom/discord/stores/StoreStream;->permissions:Lcom/discord/stores/StorePermissions;
- iget-object v4, p0, Lcom/discord/stores/StoreStream;->guildsSorted:Lcom/discord/stores/StoreGuildsSorted;
+ iget-object v6, p0, Lcom/discord/stores/StoreStream;->guildsSorted:Lcom/discord/stores/StoreGuildsSorted;
- invoke-direct {v0, v1, v2, v3, v4}, Lcom/discord/stores/StoreEmoji;->(Lcom/discord/stores/StoreEmojiCustom;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreGuildsSorted;)V
+ invoke-direct {v0, v1, v4, v5, v6}, Lcom/discord/stores/StoreEmoji;->(Lcom/discord/stores/StoreEmojiCustom;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StorePermissions;Lcom/discord/stores/StoreGuildsSorted;)V
iput-object v0, p0, Lcom/discord/stores/StoreStream;->emojis:Lcom/discord/stores/StoreEmoji;
@@ -1035,11 +1051,7 @@
iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
- const/4 v2, 0x0
-
- const/4 v3, 0x2
-
- invoke-direct {v0, v1, v2, v3, v2}, Lcom/discord/stores/StoreRtcRegion;->(Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/rest/RestAPI;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ invoke-direct {v0, v1, v3, v2, v3}, Lcom/discord/stores/StoreRtcRegion;->(Lcom/discord/stores/Dispatcher;Lcom/discord/utilities/rest/RestAPI;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
iput-object v0, p0, Lcom/discord/stores/StoreStream;->rtcRegion:Lcom/discord/stores/StoreRtcRegion;
@@ -4312,6 +4324,10 @@
.annotation runtime Lcom/discord/stores/StoreThread;
.end annotation
+ iget-object v0, p0, Lcom/discord/stores/StoreStream;->audioDevices:Lcom/discord/stores/StoreAudioDevices;
+
+ invoke-virtual {v0}, Lcom/discord/stores/StoreAudioDevices;->handleVoiceChannelSelected()V
+
iget-object v0, p0, Lcom/discord/stores/StoreStream;->rtcConnection:Lcom/discord/stores/StoreRtcConnection;
invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
@@ -5198,7 +5214,7 @@
iget-object v0, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher;
- const/16 v1, 0x28
+ const/16 v1, 0x29
new-array v1, v1, [Lcom/discord/stores/DispatchHandler;
@@ -5442,6 +5458,12 @@
aput-object v2, v1, v3
+ iget-object v2, p0, Lcom/discord/stores/StoreStream;->audioDevices:Lcom/discord/stores/StoreAudioDevices;
+
+ const/16 v3, 0x28
+
+ aput-object v2, v1, v3
+
invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->registerDispatchHandlers([Lcom/discord/stores/DispatchHandler;)V
return-void
@@ -5605,6 +5627,14 @@
return-object v0
.end method
+.method public final getAudioDevices$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreAudioDevices;
+ .locals 1
+
+ iget-object v0, p0, Lcom/discord/stores/StoreStream;->audioDevices:Lcom/discord/stores/StoreAudioDevices;
+
+ return-object v0
+.end method
+
.method public final getAuditLog$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreAuditLog;
.locals 1
@@ -6346,6 +6376,33 @@
throw p1
.end method
+.method public final handleStreamRtcConnectionStateChange(Lcom/discord/rtcconnection/RtcConnection$State;)V
+ .locals 1
+ .annotation runtime Lcom/discord/stores/StoreThread;
+ .end annotation
+
+ if-eqz p1, :cond_0
+
+ iget-object v0, p0, Lcom/discord/stores/StoreStream;->streamRtcConnection:Lcom/discord/stores/StoreStreamRtcConnection;
+
+ invoke-virtual {v0, p1}, Lcom/discord/stores/StoreStreamRtcConnection;->handleStreamRtcConnectionStateChange(Lcom/discord/rtcconnection/RtcConnection$State;)V
+
+ iget-object v0, p0, Lcom/discord/stores/StoreStream;->audioDevices:Lcom/discord/stores/StoreAudioDevices;
+
+ invoke-virtual {v0, p1}, Lcom/discord/stores/StoreAudioDevices;->handleStreamRtcConnectionStateChange(Lcom/discord/rtcconnection/RtcConnection$State;)V
+
+ return-void
+
+ :cond_0
+ const-string p1, "state"
+
+ invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+
+ const/4 p1, 0x0
+
+ throw p1
+.end method
+
.method public final handleStreamTargeted(Ljava/lang/String;)V
.locals 1
.annotation runtime Lcom/discord/stores/StoreThread;
diff --git a/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$RtcConnectionListener$onStateChange$1.smali b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$RtcConnectionListener$onStateChange$1.smali
index 746947341a..e76d142411 100644
--- a/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$RtcConnectionListener$onStateChange$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection$RtcConnectionListener$onStateChange$1.smali
@@ -66,9 +66,13 @@
iget-object v0, v0, Lcom/discord/stores/StoreStreamRtcConnection$RtcConnectionListener;->this$0:Lcom/discord/stores/StoreStreamRtcConnection;
+ invoke-static {v0}, Lcom/discord/stores/StoreStreamRtcConnection;->access$getStoreStream$p(Lcom/discord/stores/StoreStreamRtcConnection;)Lcom/discord/stores/StoreStream;
+
+ move-result-object v0
+
iget-object v1, p0, Lcom/discord/stores/StoreStreamRtcConnection$RtcConnectionListener$onStateChange$1;->$state:Lcom/discord/rtcconnection/RtcConnection$State;
- invoke-static {v0, v1}, Lcom/discord/stores/StoreStreamRtcConnection;->access$handleRtcConnectionStateChange(Lcom/discord/stores/StoreStreamRtcConnection;Lcom/discord/rtcconnection/RtcConnection$State;)V
+ invoke-virtual {v0, v1}, Lcom/discord/stores/StoreStream;->handleStreamRtcConnectionStateChange(Lcom/discord/rtcconnection/RtcConnection$State;)V
return-void
.end method
diff --git a/com.discord/smali/com/discord/stores/StoreStreamRtcConnection.smali b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection.smali
index 9a55ca057d..906f165135 100644
--- a/com.discord/smali/com/discord/stores/StoreStreamRtcConnection.smali
+++ b/com.discord/smali/com/discord/stores/StoreStreamRtcConnection.smali
@@ -188,14 +188,6 @@
return-void
.end method
-.method public static final synthetic access$handleRtcConnectionStateChange(Lcom/discord/stores/StoreStreamRtcConnection;Lcom/discord/rtcconnection/RtcConnection$State;)V
- .locals 0
-
- invoke-direct {p0, p1}, Lcom/discord/stores/StoreStreamRtcConnection;->handleRtcConnectionStateChange(Lcom/discord/rtcconnection/RtcConnection$State;)V
-
- return-void
-.end method
-
.method private final createRtcConnection(JJJLjava/lang/String;Ljava/lang/String;)Lcom/discord/rtcconnection/RtcConnection;
.locals 15
.annotation runtime Lcom/discord/stores/StoreThread;
@@ -371,61 +363,6 @@
return-void
.end method
-.method private final handleRtcConnectionStateChange(Lcom/discord/rtcconnection/RtcConnection$State;)V
- .locals 10
- .annotation runtime Lcom/discord/stores/StoreThread;
- .end annotation
-
- sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->a:Lcom/discord/rtcconnection/RtcConnection$State$f;
-
- invoke-static {p1, v0}, Lt/u/b/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
-
- move-result v0
-
- if-eqz v0, :cond_0
-
- iget-object v0, p0, Lcom/discord/stores/StoreStreamRtcConnection;->streamOwner:Ljava/lang/Long;
-
- if-eqz v0, :cond_0
-
- invoke-virtual {v0}, Ljava/lang/Number;->longValue()J
-
- move-result-wide v0
-
- iget-object v2, p0, Lcom/discord/stores/StoreStreamRtcConnection;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
-
- if-eqz v2, :cond_0
-
- const/high16 v3, 0x43960000 # 300.0f
-
- invoke-virtual {v2, v0, v1, v3}, Lcom/discord/rtcconnection/RtcConnection;->a(JF)V
-
- :cond_0
- iget-object v4, p0, Lcom/discord/stores/StoreStreamRtcConnection;->state:Lcom/discord/stores/StoreStreamRtcConnection$State;
-
- const/4 v6, 0x0
-
- const/4 v7, 0x0
-
- const/4 v8, 0x4
-
- const/4 v9, 0x0
-
- move-object v5, p1
-
- invoke-static/range {v4 .. v9}, Lcom/discord/stores/StoreStreamRtcConnection$State;->copy$default(Lcom/discord/stores/StoreStreamRtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/stores/StoreStreamRtcConnection$State;
-
- move-result-object p1
-
- iput-object p1, p0, Lcom/discord/stores/StoreStreamRtcConnection;->state:Lcom/discord/stores/StoreStreamRtcConnection$State;
-
- const/4 p1, 0x1
-
- iput-boolean p1, p0, Lcom/discord/stores/StoreStreamRtcConnection;->isDirty:Z
-
- return-void
-.end method
-
# virtual methods
.method public final getRtcConnection$app_productionDiscordExternalRelease()Lcom/discord/rtcconnection/RtcConnection;
@@ -646,6 +583,72 @@
throw v0
.end method
+.method public final handleStreamRtcConnectionStateChange(Lcom/discord/rtcconnection/RtcConnection$State;)V
+ .locals 10
+ .annotation runtime Lcom/discord/stores/StoreThread;
+ .end annotation
+
+ if-eqz p1, :cond_1
+
+ sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->a:Lcom/discord/rtcconnection/RtcConnection$State$f;
+
+ invoke-static {p1, v0}, Lt/u/b/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+ move-result v0
+
+ if-eqz v0, :cond_0
+
+ iget-object v0, p0, Lcom/discord/stores/StoreStreamRtcConnection;->streamOwner:Ljava/lang/Long;
+
+ if-eqz v0, :cond_0
+
+ invoke-virtual {v0}, Ljava/lang/Number;->longValue()J
+
+ move-result-wide v0
+
+ iget-object v2, p0, Lcom/discord/stores/StoreStreamRtcConnection;->rtcConnection:Lcom/discord/rtcconnection/RtcConnection;
+
+ if-eqz v2, :cond_0
+
+ const/high16 v3, 0x43960000 # 300.0f
+
+ invoke-virtual {v2, v0, v1, v3}, Lcom/discord/rtcconnection/RtcConnection;->a(JF)V
+
+ :cond_0
+ iget-object v4, p0, Lcom/discord/stores/StoreStreamRtcConnection;->state:Lcom/discord/stores/StoreStreamRtcConnection$State;
+
+ const/4 v6, 0x0
+
+ const/4 v7, 0x0
+
+ const/4 v8, 0x4
+
+ const/4 v9, 0x0
+
+ move-object v5, p1
+
+ invoke-static/range {v4 .. v9}, Lcom/discord/stores/StoreStreamRtcConnection$State;->copy$default(Lcom/discord/stores/StoreStreamRtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$State;Lcom/discord/rtcconnection/RtcConnection$Quality;Ljava/lang/String;ILjava/lang/Object;)Lcom/discord/stores/StoreStreamRtcConnection$State;
+
+ move-result-object p1
+
+ iput-object p1, p0, Lcom/discord/stores/StoreStreamRtcConnection;->state:Lcom/discord/stores/StoreStreamRtcConnection$State;
+
+ const/4 p1, 0x1
+
+ iput-boolean p1, p0, Lcom/discord/stores/StoreStreamRtcConnection;->isDirty:Z
+
+ return-void
+
+ :cond_1
+ const-string p1, "state"
+
+ invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+
+ const/4 p1, 0x0
+
+ throw p1
+.end method
+
.method public final handleStreamServerUpdate(Lcom/discord/models/domain/StreamServerUpdate;)V
.locals 3
.annotation runtime Lcom/discord/stores/StoreThread;
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 40dc04ac0d..7565f013b7 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, 0x7f1203ab
+ const v1, 0x7f1203b4
- const v7, 0x7f1203ab
+ const v7, 0x7f1203b4
goto :goto_0
:cond_0
- const v1, 0x7f120384
+ const v1, 0x7f12038d
- const v7, 0x7f120384
+ const v7, 0x7f12038d
: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 48fee00ef1..d8a1075278 100644
--- a/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali
@@ -903,7 +903,7 @@
invoke-direct {v5, v0, v1, p2}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(JLcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;)V
- const v6, 0x7f1203ab
+ const v6, 0x7f1203b4
move-object v1, p0
@@ -1004,7 +1004,7 @@
invoke-direct {v6, v1, v2, p2}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(JLcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;)V
- const v7, 0x7f1203ab
+ const v7, 0x7f1203b4
move-object v2, p0
@@ -1066,7 +1066,7 @@
invoke-direct/range {v5 .. v13}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(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, 0x7f121122
+ const v6, 0x7f12112a
move-object v1, p0
@@ -1120,7 +1120,7 @@
invoke-direct/range {v0 .. v8}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(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, 0x7f121122
+ const v5, 0x7f12112a
move-object v0, p0
@@ -1179,7 +1179,7 @@
invoke-direct/range {v5 .. v13}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(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, 0x7f121122
+ const v6, 0x7f12112a
move-object v1, p0
diff --git a/com.discord/smali/com/discord/stores/StoreUserSettings.smali b/com.discord/smali/com/discord/stores/StoreUserSettings.smali
index 4ce8cf34af..0cfd537451 100644
--- a/com.discord/smali/com/discord/stores/StoreUserSettings.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserSettings.smali
@@ -1567,7 +1567,7 @@
move-result-object v0
- const v1, 0x7f121274
+ const v1, 0x7f12127c
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -1722,7 +1722,7 @@
move-result-object p2
- const v0, 0x7f120b73
+ const v0, 0x7f120b7e
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -2051,7 +2051,7 @@
move-result-object v0
- const v1, 0x7f121274
+ const v1, 0x7f12127c
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -2082,7 +2082,7 @@
move-result-object v0
- const v1, 0x7f121273
+ const v1, 0x7f12127b
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
diff --git a/com.discord/smali/com/discord/utilities/SnowflakeUtils.smali b/com.discord/smali/com/discord/utilities/SnowflakeUtils.smali
index 59ae1fff1d..b444a9c652 100644
--- a/com.discord/smali/com/discord/utilities/SnowflakeUtils.smali
+++ b/com.discord/smali/com/discord/utilities/SnowflakeUtils.smali
@@ -43,13 +43,21 @@
sub-long/2addr p0, v1
+ const-wide v1, 0x14aa2cab000L
+
+ sub-long/2addr p0, v1
+
shl-long/2addr p0, v0
return-wide p0
.end method
.method public static final fromTimestamp(J)J
- .locals 1
+ .locals 2
+
+ const-wide v0, 0x14aa2cab000L
+
+ sub-long/2addr p0, v0
const/16 v0, 0x16
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
index 6bec59533d..74741f3567 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/1025"
+ const-string v4, "Discord-Android/1026"
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, 0x401
+ const/16 v2, 0x402
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -201,7 +201,7 @@
const/4 v1, 0x3
- const-string v2, "10.2.5"
+ const-string v2, "10.2.6"
const-string v3, ""
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker.smali
index 4e7135f75b..2cca71d9f4 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker.smali
@@ -477,10 +477,10 @@
throw p0
.end method
-.method public static synthetic callReportProblem$default(Lcom/discord/utilities/analytics/AnalyticsTracker;JLjava/lang/String;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/lang/Long;Ljava/lang/String;Lcom/discord/widgets/voice/feedback/FeedbackRating;Ljava/lang/Integer;Ljava/lang/String;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZIILjava/lang/Object;)V
- .locals 15
+.method public static synthetic callReportProblem$default(Lcom/discord/utilities/analytics/AnalyticsTracker;JLjava/lang/String;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/lang/Long;Ljava/lang/String;Lcom/discord/widgets/voice/feedback/FeedbackRating;Ljava/lang/Integer;Ljava/lang/String;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Lcom/discord/stores/StoreAudioDevices$OutputDevice;ZIILjava/lang/Object;)V
+ .locals 16
- and-int/lit8 v0, p14, 0x10
+ and-int/lit8 v0, p15, 0x10
if-eqz v0, :cond_0
@@ -494,7 +494,7 @@
move-object/from16 v7, p6
:goto_0
- move-object v1, p0
+ move-object/from16 v1, p0
move-wide/from16 v2, p1
@@ -514,11 +514,13 @@
move-object/from16 v12, p11
- move/from16 v13, p12
+ move-object/from16 v13, p12
move/from16 v14, p13
- invoke-virtual/range {v1 .. v14}, Lcom/discord/utilities/analytics/AnalyticsTracker;->callReportProblem(JLjava/lang/String;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/lang/Long;Ljava/lang/String;Lcom/discord/widgets/voice/feedback/FeedbackRating;Ljava/lang/Integer;Ljava/lang/String;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZI)V
+ move/from16 v15, p14
+
+ invoke-virtual/range {v1 .. v15}, Lcom/discord/utilities/analytics/AnalyticsTracker;->callReportProblem(JLjava/lang/String;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/lang/Long;Ljava/lang/String;Lcom/discord/widgets/voice/feedback/FeedbackRating;Ljava/lang/Integer;Ljava/lang/String;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Lcom/discord/stores/StoreAudioDevices$OutputDevice;ZI)V
return-void
.end method
@@ -2761,18 +2763,6 @@
invoke-interface {p2, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getOutputMode()Lcom/discord/models/domain/ModelVoice$OutputMode;
-
- move-result-object v0
-
- invoke-virtual {v0}, Lcom/discord/models/domain/ModelVoice$OutputMode;->getAnalyticsValue()Ljava/lang/String;
-
- move-result-object v0
-
- const-string v1, "audio_output_mode"
-
- invoke-interface {p2, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
-
invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;->getOutputVolume()F
move-result p1
@@ -3338,8 +3328,8 @@
throw p1
.end method
-.method public final callReportProblem(JLjava/lang/String;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/lang/Long;Ljava/lang/String;Lcom/discord/widgets/voice/feedback/FeedbackRating;Ljava/lang/Integer;Ljava/lang/String;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;ZI)V
- .locals 13
+.method public final callReportProblem(JLjava/lang/String;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/lang/Long;Ljava/lang/String;Lcom/discord/widgets/voice/feedback/FeedbackRating;Ljava/lang/Integer;Ljava/lang/String;Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Lcom/discord/stores/StoreAudioDevices$OutputDevice;ZI)V
+ .locals 14
.annotation system Ldalvik/annotation/Signature;
value = {
"(J",
@@ -3356,6 +3346,7 @@
"Ljava/lang/Integer;",
"Ljava/lang/String;",
"Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;",
+ "Lcom/discord/stores/StoreAudioDevices$OutputDevice;",
"ZI)V"
}
.end annotation
@@ -3364,17 +3355,21 @@
move-object/from16 v11, p11
- move/from16 v12, p13
+ move-object/from16 v12, p12
+
+ move/from16 v13, p14
const/4 v0, 0x0
- if-eqz p4, :cond_8
+ if-eqz p4, :cond_b
- if-eqz p5, :cond_7
+ if-eqz p5, :cond_a
- if-eqz p8, :cond_6
+ if-eqz p8, :cond_9
- if-eqz v11, :cond_5
+ if-eqz v11, :cond_8
+
+ if-eqz v12, :cond_7
const/4 v6, 0x0
@@ -3408,6 +3403,26 @@
invoke-interface {v1, v0, v2}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ instance-of v0, v12, Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;
+
+ if-eqz v0, :cond_0
+
+ const-string v0, "speaker"
+
+ goto :goto_0
+
+ :cond_0
+ instance-of v0, v12, Lcom/discord/stores/StoreAudioDevices$OutputDevice$NonSpeaker;
+
+ if-eqz v0, :cond_6
+
+ const-string v0, "in_ear"
+
+ :goto_0
+ const-string v2, "audio_output_mode"
+
+ invoke-interface {v1, v2, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+
invoke-virtual/range {p8 .. p8}, Lcom/discord/widgets/voice/feedback/FeedbackRating;->getAnalyticsValue()Ljava/lang/String;
move-result-object v0
@@ -3430,7 +3445,7 @@
invoke-direct {p0, v11, v1}, Lcom/discord/utilities/analytics/AnalyticsTracker;->toProperties(Lcom/discord/stores/StoreMediaSettings$VoiceConfiguration;Ljava/util/Map;)Ljava/util/Map;
- invoke-static/range {p12 .. p12}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+ invoke-static/range {p13 .. p13}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
move-result-object v0
@@ -3440,50 +3455,50 @@
const/4 v0, -0x1
- if-eq v12, v0, :cond_4
+ if-eq v13, v0, :cond_5
- if-eqz v12, :cond_3
+ if-eqz v13, :cond_4
const/4 v0, 0x1
- if-eq v12, v0, :cond_2
+ if-eq v13, v0, :cond_3
const/4 v0, 0x2
- if-eq v12, v0, :cond_1
+ if-eq v13, v0, :cond_2
const/4 v0, 0x3
- if-eq v12, v0, :cond_0
+ if-eq v13, v0, :cond_1
const-string v0, "invalid"
- goto :goto_0
-
- :cond_0
- const-string v0, "communication"
-
- goto :goto_0
+ goto :goto_1
:cond_1
- const-string v0, "call"
+ const-string v0, "communication"
- goto :goto_0
+ goto :goto_1
:cond_2
- const-string v0, "ringtone"
+ const-string v0, "call"
- goto :goto_0
+ goto :goto_1
:cond_3
- const-string v0, "normal"
+ const-string v0, "ringtone"
- goto :goto_0
+ goto :goto_1
:cond_4
+ const-string v0, "normal"
+
+ goto :goto_1
+
+ :cond_5
const-string v0, "current"
- :goto_0
+ :goto_1
const-string v2, "audio_mode"
invoke-interface {v1, v2, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
@@ -3500,28 +3515,42 @@
return-void
- :cond_5
- const-string v1, "voiceConfig"
-
- invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
-
- throw v0
-
:cond_6
- const-string v1, "feedbackRating"
+ new-instance v0, Lt/g;
- invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+ invoke-direct {v0}, Lt/g;->()V
throw v0
:cond_7
- const-string v1, "guildVoiceStates"
+ const-string v1, "audioOutputDevice"
invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
throw v0
:cond_8
+ const-string v1, "voiceConfig"
+
+ invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+
+ throw v0
+
+ :cond_9
+ const-string v1, "feedbackRating"
+
+ invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+
+ throw v0
+
+ :cond_a
+ const-string v1, "guildVoiceStates"
+
+ invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+
+ throw v0
+
+ :cond_b
const-string v1, "channel"
invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V
diff --git a/com.discord/smali/com/discord/utilities/app/ApplicationProvider.smali b/com.discord/smali/com/discord/utilities/app/ApplicationProvider.smali
new file mode 100644
index 0000000000..a718d7adce
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/app/ApplicationProvider.smali
@@ -0,0 +1,71 @@
+.class public final Lcom/discord/utilities/app/ApplicationProvider;
+.super Ljava/lang/Object;
+.source "ApplicationProvider.kt"
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/utilities/app/ApplicationProvider;
+
+.field public static application:Landroid/app/Application;
+
+
+# direct methods
+.method public static constructor ()V
+ .locals 1
+
+ new-instance v0, Lcom/discord/utilities/app/ApplicationProvider;
+
+ invoke-direct {v0}, Lcom/discord/utilities/app/ApplicationProvider;->()V
+
+ sput-object v0, Lcom/discord/utilities/app/ApplicationProvider;->INSTANCE:Lcom/discord/utilities/app/ApplicationProvider;
+
+ 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 get()Landroid/app/Application;
+ .locals 1
+
+ sget-object v0, Lcom/discord/utilities/app/ApplicationProvider;->application:Landroid/app/Application;
+
+ if-eqz v0, :cond_0
+
+ return-object v0
+
+ :cond_0
+ const-string v0, "application"
+
+ invoke-static {v0}, Lt/u/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V
+
+ const/4 v0, 0x0
+
+ throw v0
+.end method
+
+.method public final init(Landroid/app/Application;)V
+ .locals 0
+
+ if-eqz p1, :cond_0
+
+ sput-object p1, Lcom/discord/utilities/app/ApplicationProvider;->application:Landroid/app/Application;
+
+ return-void
+
+ :cond_0
+ const-string p1, "application"
+
+ invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+
+ const/4 p1, 0x0
+
+ throw p1
+.end method
diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali
index 49b05428fa..7df023f2d7 100644
--- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali
+++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali
@@ -1340,9 +1340,9 @@
if-eqz v0, :cond_4
- const v0, 0x7f12087a
+ const v0, 0x7f120885
- const v1, 0x7f120879
+ const v1, 0x7f120884
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
@@ -1359,9 +1359,9 @@
if-eqz v0, :cond_4
- const v0, 0x7f120878
+ const v0, 0x7f120883
- const v1, 0x7f120877
+ const v1, 0x7f120882
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
@@ -1378,9 +1378,9 @@
if-eqz v0, :cond_4
- const v0, 0x7f12087d
+ const v0, 0x7f120888
- const v1, 0x7f12087c
+ const v1, 0x7f120887
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
@@ -1397,7 +1397,7 @@
if-eqz p1, :cond_4
- const p1, 0x7f120876
+ const p1, 0x7f120881
goto/16 :goto_1
@@ -1424,7 +1424,7 @@
if-nez p1, :cond_1
- const p1, 0x7f120870
+ const p1, 0x7f12087b
goto :goto_1
@@ -1433,7 +1433,7 @@
if-ne p1, v0, :cond_2
- const p1, 0x7f120871
+ const p1, 0x7f12087c
goto :goto_1
@@ -1462,9 +1462,9 @@
if-eqz v0, :cond_4
- const v0, 0x7f12086f
+ const v0, 0x7f12087a
- const v1, 0x7f12086e
+ const v1, 0x7f120879
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
@@ -1481,7 +1481,7 @@
if-eqz p1, :cond_4
- const p1, 0x7f120875
+ const p1, 0x7f120880
goto :goto_1
@@ -1494,9 +1494,9 @@
if-eqz v0, :cond_4
- const v0, 0x7f12086b
+ const v0, 0x7f120876
- const v1, 0x7f12086a
+ const v1, 0x7f120875
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, 0x7f120882
+ const p1, 0x7f12088d
goto :goto_1
@@ -1577,9 +1577,9 @@
if-eqz v0, :cond_3
- const v0, 0x7f120886
+ const v0, 0x7f120891
- const v1, 0x7f120885
+ const v1, 0x7f120890
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
@@ -1596,7 +1596,7 @@
if-eqz p1, :cond_3
- const p1, 0x7f120882
+ const p1, 0x7f12088d
goto :goto_1
@@ -1761,7 +1761,7 @@
goto :goto_0
:cond_5
- const p1, 0x7f120cbf
+ const p1, 0x7f120cc6
invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1828,14 +1828,14 @@
if-ne p1, v5, :cond_1
- const v1, 0x7f1208ac
+ const v1, 0x7f1208b7
goto/16 :goto_0
:cond_1
if-nez p1, :cond_2
- const v1, 0x7f1208ab
+ const v1, 0x7f1208b6
goto/16 :goto_0
@@ -1864,7 +1864,7 @@
if-eqz p1, :cond_14
- const v1, 0x7f120899
+ const v1, 0x7f1208a4
goto/16 :goto_0
@@ -1877,9 +1877,9 @@
if-eqz v0, :cond_14
- const v0, 0x7f1208aa
+ const v0, 0x7f1208b5
- const v1, 0x7f1208a9
+ const v1, 0x7f1208b4
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
@@ -1896,9 +1896,9 @@
if-eqz v0, :cond_14
- const v0, 0x7f1208a3
+ const v0, 0x7f1208ae
- const v1, 0x7f1208a2
+ const v1, 0x7f1208ad
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
@@ -1936,12 +1936,12 @@
goto/16 :goto_0
:cond_4
- const v1, 0x7f12088e
+ const v1, 0x7f120899
goto/16 :goto_0
:cond_5
- const v1, 0x7f12088d
+ const v1, 0x7f120898
goto/16 :goto_0
@@ -1982,12 +1982,12 @@
goto/16 :goto_0
:cond_7
- const v1, 0x7f120897
+ const v1, 0x7f1208a2
goto/16 :goto_0
:cond_8
- const v1, 0x7f120896
+ const v1, 0x7f1208a1
goto/16 :goto_0
@@ -2007,7 +2007,7 @@
if-eqz p1, :cond_14
- const v1, 0x7f12089e
+ const v1, 0x7f1208a9
goto/16 :goto_0
@@ -2020,7 +2020,7 @@
if-eqz p1, :cond_14
- const v1, 0x7f120898
+ const v1, 0x7f1208a3
goto/16 :goto_0
@@ -2033,7 +2033,7 @@
if-eqz p1, :cond_14
- const v1, 0x7f12088b
+ const v1, 0x7f120896
goto/16 :goto_0
@@ -2077,27 +2077,27 @@
goto/16 :goto_0
:cond_a
- const v1, 0x7f1208a8
+ const v1, 0x7f1208b3
goto/16 :goto_0
:cond_b
- const v1, 0x7f1208a4
+ const v1, 0x7f1208af
goto/16 :goto_0
:cond_c
- const v1, 0x7f1208a6
+ const v1, 0x7f1208b1
goto/16 :goto_0
:cond_d
- const v1, 0x7f1208a5
+ const v1, 0x7f1208b0
goto/16 :goto_0
:cond_e
- const v1, 0x7f1208a7
+ const v1, 0x7f1208b2
goto/16 :goto_0
@@ -2117,7 +2117,7 @@
if-eqz p1, :cond_14
- const v1, 0x7f12089b
+ const v1, 0x7f1208a6
goto/16 :goto_0
@@ -2130,7 +2130,7 @@
if-eqz p1, :cond_14
- const v1, 0x7f120882
+ const v1, 0x7f12088d
goto/16 :goto_0
@@ -2143,9 +2143,9 @@
if-eqz v0, :cond_14
- const v0, 0x7f1208a0
+ const v0, 0x7f1208ab
- const v1, 0x7f12089f
+ const v1, 0x7f1208aa
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
@@ -2162,7 +2162,7 @@
if-eqz p1, :cond_14
- const v1, 0x7f120895
+ const v1, 0x7f1208a0
goto :goto_0
@@ -2175,9 +2175,9 @@
if-eqz v0, :cond_14
- const v0, 0x7f12088a
+ const v0, 0x7f120895
- const v1, 0x7f120889
+ const v1, 0x7f120894
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
@@ -2217,17 +2217,17 @@
goto :goto_0
:cond_10
- const v1, 0x7f120892
+ const v1, 0x7f12089d
goto :goto_0
:cond_11
- const v1, 0x7f120894
+ const v1, 0x7f12089f
goto :goto_0
:cond_12
- const v1, 0x7f120893
+ const v1, 0x7f12089e
goto :goto_0
@@ -2247,7 +2247,7 @@
if-eqz p1, :cond_14
- const v1, 0x7f12088c
+ const v1, 0x7f120897
:cond_14
:goto_0
@@ -2320,7 +2320,7 @@
if-eqz p1, :cond_a
- const v1, 0x7f1208b4
+ const v1, 0x7f1208bf
goto :goto_0
@@ -2354,12 +2354,12 @@
goto :goto_0
:cond_3
- const v1, 0x7f1208b2
+ const v1, 0x7f1208bd
goto :goto_0
:cond_4
- const v1, 0x7f1208b3
+ const v1, 0x7f1208be
goto :goto_0
@@ -2395,14 +2395,14 @@
if-ne p1, v4, :cond_7
- const v1, 0x7f1208b1
+ const v1, 0x7f1208bc
goto :goto_0
:cond_7
if-nez p1, :cond_8
- const v1, 0x7f1208b0
+ const v1, 0x7f1208bb
goto :goto_0
@@ -2476,14 +2476,14 @@
if-ne p1, v0, :cond_1
- const p1, 0x7f1208bf
+ const p1, 0x7f1208ca
goto/16 :goto_1
:cond_1
if-nez p1, :cond_2
- const p1, 0x7f1208be
+ const p1, 0x7f1208c9
goto/16 :goto_1
@@ -2528,12 +2528,12 @@
if-eqz p1, :cond_4
- const p1, 0x7f1208ba
+ const p1, 0x7f1208c5
goto :goto_1
:cond_4
- const p1, 0x7f1208bb
+ const p1, 0x7f1208c6
goto :goto_1
@@ -2569,12 +2569,12 @@
if-eqz p1, :cond_6
- const p1, 0x7f1208bc
+ const p1, 0x7f1208c7
goto :goto_1
:cond_6
- const p1, 0x7f1208bd
+ const p1, 0x7f1208c8
goto :goto_1
@@ -2594,7 +2594,7 @@
if-eqz p1, :cond_8
- const p1, 0x7f1208b7
+ const p1, 0x7f1208c2
goto :goto_1
@@ -2607,7 +2607,7 @@
if-eqz p1, :cond_8
- const p1, 0x7f120882
+ const p1, 0x7f12088d
goto :goto_1
@@ -2620,7 +2620,7 @@
if-eqz p1, :cond_8
- const p1, 0x7f1208b6
+ const p1, 0x7f1208c1
goto :goto_1
@@ -2992,7 +2992,7 @@
if-eqz p2, :cond_9
- const p2, 0x7f120876
+ const p2, 0x7f120881
new-array p3, v4, [Ljava/lang/Object;
@@ -3045,7 +3045,7 @@
if-eqz p2, :cond_9
- const p2, 0x7f120875
+ const p2, 0x7f120880
new-array p3, v4, [Ljava/lang/Object;
@@ -3412,14 +3412,14 @@
if-ne p1, v3, :cond_1
- const p1, 0x7f1208de
+ const p1, 0x7f1208e9
goto/16 :goto_1
:cond_1
if-nez p1, :cond_2
- const p1, 0x7f1208dd
+ const p1, 0x7f1208e8
goto/16 :goto_1
@@ -3464,12 +3464,12 @@
if-nez p1, :cond_4
- const p1, 0x7f1208da
+ const p1, 0x7f1208e5
goto/16 :goto_1
:cond_4
- const p1, 0x7f1208d8
+ const p1, 0x7f1208e3
goto/16 :goto_1
@@ -3491,7 +3491,7 @@
if-eqz p1, :cond_9
- const p1, 0x7f1208e4
+ const p1, 0x7f1208ef
goto :goto_1
@@ -3518,14 +3518,14 @@
if-ne p1, v3, :cond_6
- const p1, 0x7f1208e0
+ const p1, 0x7f1208eb
goto :goto_1
:cond_6
if-nez p1, :cond_7
- const p1, 0x7f1208df
+ const p1, 0x7f1208ea
goto :goto_1
@@ -3552,9 +3552,9 @@
if-eqz v0, :cond_9
- const v0, 0x7f1208e2
+ const v0, 0x7f1208ed
- const v1, 0x7f1208e1
+ const v1, 0x7f1208ec
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
@@ -3571,7 +3571,7 @@
if-eqz p1, :cond_9
- const p1, 0x7f1208e3
+ const p1, 0x7f1208ee
goto :goto_1
@@ -3584,7 +3584,7 @@
if-eqz p1, :cond_9
- const p1, 0x7f120882
+ const p1, 0x7f12088d
goto :goto_1
@@ -3629,127 +3629,127 @@
goto/16 :goto_0
:sswitch_0
- const p1, 0x7f120bb6
+ const p1, 0x7f120bbd
goto/16 :goto_0
:sswitch_1
- const p1, 0x7f120bc4
+ const p1, 0x7f120bcb
goto/16 :goto_0
:sswitch_2
- const p1, 0x7f120bbe
+ const p1, 0x7f120bc5
goto/16 :goto_0
:sswitch_3
- const p1, 0x7f120bba
+ const p1, 0x7f120bc1
goto/16 :goto_0
:sswitch_4
- const p1, 0x7f120397
+ const p1, 0x7f1203a0
goto/16 :goto_0
:sswitch_5
- const p1, 0x7f12133d
+ const p1, 0x7f121345
goto/16 :goto_0
:sswitch_6
- const p1, 0x7f120c2e
+ const p1, 0x7f120c35
goto/16 :goto_0
:sswitch_7
- const p1, 0x7f1204e2
+ const p1, 0x7f1204eb
goto/16 :goto_0
:sswitch_8
- const p1, 0x7f120c5f
+ const p1, 0x7f120c66
goto/16 :goto_0
:sswitch_9
- const p1, 0x7f12117f
+ const p1, 0x7f121187
goto/16 :goto_0
:sswitch_a
- const p1, 0x7f12041d
+ const p1, 0x7f120426
goto/16 :goto_0
:sswitch_b
- const p1, 0x7f121338
+ const p1, 0x7f121340
goto :goto_0
:sswitch_c
- const p1, 0x7f120bf9
+ const p1, 0x7f120c00
goto :goto_0
:sswitch_d
- const p1, 0x7f120ff1
+ const p1, 0x7f120ff9
goto :goto_0
:sswitch_e
- const p1, 0x7f120240
+ const p1, 0x7f120242
goto :goto_0
:sswitch_f
- const p1, 0x7f120576
+ const p1, 0x7f12057f
goto :goto_0
:sswitch_10
- const p1, 0x7f120bb7
+ const p1, 0x7f120bbe
goto :goto_0
:sswitch_11
- const p1, 0x7f12110e
+ const p1, 0x7f121116
goto :goto_0
:sswitch_12
- const p1, 0x7f12110c
+ const p1, 0x7f121114
goto :goto_0
:sswitch_13
- const p1, 0x7f120ff2
+ const p1, 0x7f120ffa
goto :goto_0
:sswitch_14
- const p1, 0x7f1211aa
+ const p1, 0x7f1211b2
goto :goto_0
:sswitch_15
- const p1, 0x7f120f93
+ const p1, 0x7f120f9b
goto :goto_0
:sswitch_16
- const p1, 0x7f121434
+ const p1, 0x7f12143c
goto :goto_0
:sswitch_17
- const p1, 0x7f1200af
+ const p1, 0x7f1200b1
goto :goto_0
:sswitch_18
- const p1, 0x7f120bc0
+ const p1, 0x7f120bc7
goto :goto_0
@@ -3762,32 +3762,32 @@
if-ne p1, p2, :cond_0
- const p1, 0x7f120bb2
+ const p1, 0x7f120bb9
goto :goto_0
:cond_0
- const p1, 0x7f120bb4
+ const p1, 0x7f120bbb
goto :goto_0
:sswitch_1a
- const p1, 0x7f1200b5
+ const p1, 0x7f1200b7
goto :goto_0
:sswitch_1b
- const p1, 0x7f120274
+ const p1, 0x7f120276
goto :goto_0
:cond_1
- const p1, 0x7f120b68
+ const p1, 0x7f120b73
goto :goto_0
:cond_2
- const p1, 0x7f120485
+ const p1, 0x7f12048e
:goto_0
return p1
@@ -3932,7 +3932,7 @@
if-eqz p1, :cond_7
- const p1, 0x7f1208d2
+ const p1, 0x7f1208dd
goto/16 :goto_1
@@ -3945,19 +3945,19 @@
if-eqz v0, :cond_7
- const v0, 0x7f1208cb
+ const v0, 0x7f1208d6
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
move-result-object v3
- const v0, 0x7f1208cc
+ const v0, 0x7f1208d7
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
move-result-object v4
- const v0, 0x7f1208cd
+ const v0, 0x7f1208d8
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -4002,14 +4002,14 @@
if-ne p1, v3, :cond_1
- const p1, 0x7f1208ca
+ const p1, 0x7f1208d5
goto :goto_1
:cond_1
if-nez p1, :cond_2
- const p1, 0x7f1208c9
+ const p1, 0x7f1208d4
goto :goto_1
@@ -4050,14 +4050,14 @@
if-ne p1, v3, :cond_4
- const p1, 0x7f1208c5
+ const p1, 0x7f1208d0
goto :goto_1
:cond_4
if-nez p1, :cond_5
- const p1, 0x7f1208c4
+ const p1, 0x7f1208cf
goto :goto_1
@@ -4084,7 +4084,7 @@
if-eqz p1, :cond_7
- const p1, 0x7f1208d1
+ const p1, 0x7f1208dc
goto :goto_1
@@ -4097,7 +4097,7 @@
if-eqz p1, :cond_7
- const p1, 0x7f120882
+ const p1, 0x7f12088d
goto :goto_1
@@ -4110,7 +4110,7 @@
if-eqz p1, :cond_7
- const p1, 0x7f1208cf
+ const p1, 0x7f1208da
goto :goto_1
@@ -4164,7 +4164,7 @@
if-eqz p1, :cond_1
- const p1, 0x7f1208e8
+ const p1, 0x7f1208f3
goto :goto_1
@@ -4177,9 +4177,9 @@
if-eqz v0, :cond_1
- const v0, 0x7f1208ee
+ const v0, 0x7f1208f9
- const v1, 0x7f1208ed
+ const v1, 0x7f1208f8
invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I
@@ -4196,7 +4196,7 @@
if-eqz p1, :cond_1
- const p1, 0x7f120882
+ const p1, 0x7f12088d
goto :goto_1
@@ -4209,9 +4209,9 @@
if-eqz v0, :cond_1
- const v0, 0x7f1208ea
+ const v0, 0x7f1208f5
- const v1, 0x7f1208e9
+ const v1, 0x7f1208f4
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 efcdbfd093..4bc3afecc1 100644
--- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali
+++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali
@@ -125,32 +125,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, 0x7f1208e7
+ const p1, 0x7f1208f2
goto/16 :goto_0
:pswitch_0
- const p1, 0x7f120873
+ const p1, 0x7f12087e
goto/16 :goto_0
:pswitch_1
- const p1, 0x7f120874
+ const p1, 0x7f12087f
goto/16 :goto_0
:pswitch_2
- const p1, 0x7f120872
+ const p1, 0x7f12087d
goto/16 :goto_0
:pswitch_3
- const p1, 0x7f12086d
+ const p1, 0x7f120878
goto/16 :goto_0
:pswitch_4
- const p1, 0x7f120880
+ const p1, 0x7f12088b
goto/16 :goto_0
@@ -233,17 +233,17 @@
if-eq p1, v0, :cond_4
- const p1, 0x7f12087b
+ const p1, 0x7f120886
goto/16 :goto_0
:cond_4
- const p1, 0x7f12086c
+ const p1, 0x7f120877
goto/16 :goto_0
:cond_5
- const p1, 0x7f120881
+ const p1, 0x7f12088c
goto/16 :goto_0
@@ -257,147 +257,147 @@
throw p1
:pswitch_6
- const p1, 0x7f120869
+ const p1, 0x7f120874
goto/16 :goto_0
:pswitch_7
- const p1, 0x7f1208c6
+ const p1, 0x7f1208d1
goto/16 :goto_0
:pswitch_8
- const p1, 0x7f1208c8
-
- goto/16 :goto_0
-
- :pswitch_9
- const p1, 0x7f1208d0
-
- goto/16 :goto_0
-
- :pswitch_a
const p1, 0x7f1208d3
goto/16 :goto_0
+ :pswitch_9
+ const p1, 0x7f1208db
+
+ goto/16 :goto_0
+
+ :pswitch_a
+ const p1, 0x7f1208de
+
+ goto/16 :goto_0
+
:pswitch_b
- const p1, 0x7f1208c3
+ const p1, 0x7f1208ce
goto/16 :goto_0
:pswitch_c
- const p1, 0x7f1208c2
+ const p1, 0x7f1208cd
goto/16 :goto_0
:pswitch_d
- const p1, 0x7f1208ce
+ const p1, 0x7f1208d9
goto :goto_0
:pswitch_e
- const p1, 0x7f1208c7
+ const p1, 0x7f1208d2
goto :goto_0
:pswitch_f
- const p1, 0x7f1208dc
+ const p1, 0x7f1208e7
goto :goto_0
:pswitch_10
- const p1, 0x7f1208e5
+ const p1, 0x7f1208f0
goto :goto_0
:pswitch_11
- const p1, 0x7f1208db
+ const p1, 0x7f1208e6
goto :goto_0
:pswitch_12
- const p1, 0x7f1208b9
+ const p1, 0x7f1208c4
goto :goto_0
:pswitch_13
- const p1, 0x7f1208c0
+ const p1, 0x7f1208cb
goto :goto_0
:pswitch_14
- const p1, 0x7f1208b8
+ const p1, 0x7f1208c3
goto :goto_0
:pswitch_15
- const p1, 0x7f1208ec
+ const p1, 0x7f1208f7
goto :goto_0
:pswitch_16
- const p1, 0x7f1208ef
+ const p1, 0x7f1208fa
goto :goto_0
:pswitch_17
- const p1, 0x7f1208eb
+ const p1, 0x7f1208f6
goto :goto_0
:pswitch_18
- const p1, 0x7f120884
+ const p1, 0x7f12088f
goto :goto_0
:pswitch_19
- const p1, 0x7f120887
+ const p1, 0x7f120892
goto :goto_0
:pswitch_1a
- const p1, 0x7f120883
+ const p1, 0x7f12088e
goto :goto_0
:pswitch_1b
- const p1, 0x7f1208d7
+ const p1, 0x7f1208e2
goto :goto_0
:pswitch_1c
- const p1, 0x7f1208d6
+ const p1, 0x7f1208e1
goto :goto_0
:pswitch_1d
- const p1, 0x7f1208d4
+ const p1, 0x7f1208df
goto :goto_0
:pswitch_1e
- const p1, 0x7f1208d5
+ const p1, 0x7f1208e0
goto :goto_0
:pswitch_1f
- const p1, 0x7f1208af
+ const p1, 0x7f1208ba
goto :goto_0
:pswitch_20
- const p1, 0x7f1208b5
+ const p1, 0x7f1208c0
goto :goto_0
:pswitch_21
- const p1, 0x7f1208ae
+ const p1, 0x7f1208b9
goto :goto_0
:cond_7
- const p1, 0x7f1208a1
+ const p1, 0x7f1208ac
:goto_0
return p1
@@ -1163,7 +1163,7 @@
if-gez v5, :cond_0
- const v1, 0x7f1208e6
+ const v1, 0x7f1208f1
const/4 v2, 0x2
@@ -1262,182 +1262,182 @@
goto/16 :goto_0
:pswitch_0
- const p1, 0x7f120852
+ const p1, 0x7f12085d
goto/16 :goto_0
:pswitch_1
- const p1, 0x7f120853
+ const p1, 0x7f12085e
goto/16 :goto_0
:pswitch_2
- const p1, 0x7f120851
+ const p1, 0x7f12085c
goto/16 :goto_0
:pswitch_3
- const p1, 0x7f120862
+ const p1, 0x7f12086d
goto/16 :goto_0
:pswitch_4
- const p1, 0x7f120861
+ const p1, 0x7f12086c
goto/16 :goto_0
:pswitch_5
- const p1, 0x7f12085f
+ const p1, 0x7f12086a
goto/16 :goto_0
:pswitch_6
- const p1, 0x7f120860
+ const p1, 0x7f12086b
goto/16 :goto_0
:pswitch_7
- const p1, 0x7f12084e
+ const p1, 0x7f120859
goto/16 :goto_0
:pswitch_8
- const p1, 0x7f12084f
+ const p1, 0x7f12085a
goto/16 :goto_0
:pswitch_9
- const p1, 0x7f12084d
+ const p1, 0x7f120858
goto/16 :goto_0
:pswitch_a
- const p1, 0x7f120867
+ const p1, 0x7f120872
goto/16 :goto_0
:pswitch_b
- const p1, 0x7f120868
+ const p1, 0x7f120873
goto/16 :goto_0
:pswitch_c
- const p1, 0x7f120866
+ const p1, 0x7f120871
goto/16 :goto_0
:pswitch_d
- const p1, 0x7f120855
+ const p1, 0x7f120860
goto/16 :goto_0
:pswitch_e
- const p1, 0x7f120856
+ const p1, 0x7f120861
goto :goto_0
:pswitch_f
- const p1, 0x7f120854
+ const p1, 0x7f12085f
goto :goto_0
:pswitch_10
- const p1, 0x7f120864
+ const p1, 0x7f12086f
goto :goto_0
:pswitch_11
- const p1, 0x7f120865
+ const p1, 0x7f120870
goto :goto_0
:pswitch_12
- const p1, 0x7f120863
+ const p1, 0x7f12086e
goto :goto_0
:pswitch_13
- const p1, 0x7f120846
+ const p1, 0x7f120851
goto :goto_0
:pswitch_14
- const p1, 0x7f120859
+ const p1, 0x7f120864
goto :goto_0
:pswitch_15
- const p1, 0x7f12085b
+ const p1, 0x7f120866
goto :goto_0
:pswitch_16
- const p1, 0x7f12085d
+ const p1, 0x7f120868
goto :goto_0
:pswitch_17
- const p1, 0x7f12085e
+ const p1, 0x7f120869
goto :goto_0
:pswitch_18
- const p1, 0x7f120858
+ const p1, 0x7f120863
goto :goto_0
:pswitch_19
- const p1, 0x7f120857
+ const p1, 0x7f120862
goto :goto_0
:pswitch_1a
- const p1, 0x7f12085c
+ const p1, 0x7f120867
goto :goto_0
:pswitch_1b
- const p1, 0x7f12085a
+ const p1, 0x7f120865
goto :goto_0
:pswitch_1c
- const p1, 0x7f12084a
+ const p1, 0x7f120855
goto :goto_0
:pswitch_1d
- const p1, 0x7f12084b
+ const p1, 0x7f120856
goto :goto_0
:pswitch_1e
- const p1, 0x7f120849
+ const p1, 0x7f120854
goto :goto_0
:pswitch_1f
- const p1, 0x7f120848
+ const p1, 0x7f120853
goto :goto_0
:pswitch_20
- const p1, 0x7f12084c
+ const p1, 0x7f120857
goto :goto_0
:pswitch_21
- const p1, 0x7f120847
+ const p1, 0x7f120852
goto :goto_0
:cond_0
- const p1, 0x7f120850
+ const p1, 0x7f12085b
goto :goto_0
:cond_1
- const p1, 0x7f120938
+ const p1, 0x7f120943
:goto_0
return p1
diff --git a/com.discord/smali/com/discord/utilities/auth/AuthUtils$getWebHandoffUrl$1.smali b/com.discord/smali/com/discord/utilities/auth/AuthUtils$getWebHandoffUrl$1.smali
index fd490dff24..cf8241ecd5 100644
--- a/com.discord/smali/com/discord/utilities/auth/AuthUtils$getWebHandoffUrl$1.smali
+++ b/com.discord/smali/com/discord/utilities/auth/AuthUtils$getWebHandoffUrl$1.smali
@@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/utilities/auth/AuthUtils;->getWebHandoffUrl(Landroid/net/Uri;)Lrx/Observable;
+ value = Lcom/discord/utilities/auth/AuthUtils;->getWebHandoffUrl(Landroid/net/Uri;Z)Lrx/Observable;
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
@@ -31,14 +31,18 @@
# instance fields
+.field public final synthetic $isBilling:Z
+
.field public final synthetic $redirectUrl:Landroid/net/Uri;
# direct methods
-.method public constructor (Landroid/net/Uri;)V
+.method public constructor (ZLandroid/net/Uri;)V
.locals 0
- iput-object p1, p0, Lcom/discord/utilities/auth/AuthUtils$getWebHandoffUrl$1;->$redirectUrl:Landroid/net/Uri;
+ iput-boolean p1, p0, Lcom/discord/utilities/auth/AuthUtils$getWebHandoffUrl$1;->$isBilling:Z
+
+ iput-object p2, p0, Lcom/discord/utilities/auth/AuthUtils$getWebHandoffUrl$1;->$redirectUrl:Landroid/net/Uri;
invoke-direct {p0}, Ljava/lang/Object;->()V
@@ -50,8 +54,18 @@
.method public final call(Ljava/lang/String;)Landroid/net/Uri;
.locals 4
+ iget-boolean v0, p0, Lcom/discord/utilities/auth/AuthUtils$getWebHandoffUrl$1;->$isBilling:Z
+
+ if-eqz v0, :cond_0
+
+ const-string v0, "https://discordapp.com/billing/login/handoff"
+
+ goto :goto_0
+
+ :cond_0
const-string v0, "https://discordapp.com/login/handoff"
+ :goto_0
invoke-static {v0}, Landroid/net/Uri;->parse(Ljava/lang/String;)Landroid/net/Uri;
move-result-object v0
@@ -106,11 +120,11 @@
move-result-object v1
- const/4 v2, 0x0
+ const/4 v2, 0x2
- const/4 v3, 0x2
+ const/4 v3, 0x0
- invoke-static {v0, v1, v2, v3, v2}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
+ invoke-static {v0, v1, v3, v2, v3}, Lcom/discord/utilities/logging/Logger;->d$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;ILjava/lang/Object;)V
return-object p1
.end method
diff --git a/com.discord/smali/com/discord/utilities/auth/AuthUtils.smali b/com.discord/smali/com/discord/utilities/auth/AuthUtils.smali
index 4c87629a6a..64f7fd3605 100644
--- a/com.discord/smali/com/discord/utilities/auth/AuthUtils.smali
+++ b/com.discord/smali/com/discord/utilities/auth/AuthUtils.smali
@@ -126,6 +126,23 @@
throw v0
.end method
+.method public static synthetic getWebHandoffUrl$default(Lcom/discord/utilities/auth/AuthUtils;Landroid/net/Uri;ZILjava/lang/Object;)Lrx/Observable;
+ .locals 0
+
+ and-int/lit8 p3, p3, 0x2
+
+ if-eqz p3, :cond_0
+
+ const/4 p2, 0x0
+
+ :cond_0
+ invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/auth/AuthUtils;->getWebHandoffUrl(Landroid/net/Uri;Z)Lrx/Observable;
+
+ move-result-object p0
+
+ return-object p0
+.end method
+
.method private final isValidEmail(Ljava/lang/String;)Z
.locals 3
@@ -525,8 +542,8 @@
throw v0
.end method
-.method public final getWebHandoffUrl(Landroid/net/Uri;)Lrx/Observable;
- .locals 8
+.method public final getBillingWebHandoffUrl(Landroid/net/Uri;)Lrx/Observable;
+ .locals 1
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
@@ -540,6 +557,39 @@
if-eqz p1, :cond_0
+ const/4 v0, 0x1
+
+ invoke-virtual {p0, p1, v0}, Lcom/discord/utilities/auth/AuthUtils;->getWebHandoffUrl(Landroid/net/Uri;Z)Lrx/Observable;
+
+ move-result-object p1
+
+ return-object p1
+
+ :cond_0
+ const-string p1, "redirectUrl"
+
+ invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+
+ const/4 p1, 0x0
+
+ throw p1
+.end method
+
+.method public final getWebHandoffUrl(Landroid/net/Uri;Z)Lrx/Observable;
+ .locals 8
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Landroid/net/Uri;",
+ "Z)",
+ "Lrx/Observable<",
+ "Landroid/net/Uri;",
+ ">;"
+ }
+ .end annotation
+
+ if-eqz p1, :cond_0
+
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;
@@ -566,15 +616,15 @@
new-instance v1, Lcom/discord/utilities/auth/AuthUtils$getWebHandoffUrl$1;
- invoke-direct {v1, p1}, Lcom/discord/utilities/auth/AuthUtils$getWebHandoffUrl$1;->(Landroid/net/Uri;)V
+ invoke-direct {v1, p2, p1}, Lcom/discord/utilities/auth/AuthUtils$getWebHandoffUrl$1;->(ZLandroid/net/Uri;)V
invoke-virtual {v0, v1}, Lrx/Observable;->f(Lb0/l/i;)Lrx/Observable;
move-result-object p1
- const-string v0, "StoreStream.getAuthentic\u2026 handoffUrl\n }"
+ const-string p2, "StoreStream.getAuthentic\u2026 handoffUrl\n }"
- invoke-static {p1, v0}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-static {p1, p2}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
return-object p1
diff --git a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$2.smali b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$2.smali
index 2f677b80bb..8f2181d0fe 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, 0x7f120379
+ const v1, 0x7f120382
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 d98e4ef7f6..e59f46a20a 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, 0x7f120378
+ const v1, 0x7f120381
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 3b7fe9d0ca..aad15f652b 100644
--- a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper.smali
+++ b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper.smali
@@ -128,7 +128,7 @@
:cond_1
new-instance p1, Lcom/discord/utilities/captcha/CaptchaHelper$Failure;
- const p2, 0x7f12037a
+ const p2, 0x7f120383
const-string p3, "unsupported_device"
@@ -223,19 +223,19 @@
invoke-direct {v1, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V
- const v2, 0x7f12037d
+ const v2, 0x7f120386
invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
move-result-object v1
- const v2, 0x7f12037e
+ const v2, 0x7f120387
invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
move-result-object v1
- const v2, 0x7f12037c
+ const v2, 0x7f120385
new-instance v3, Lcom/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1;
@@ -245,7 +245,7 @@
move-result-object p1
- const p2, 0x7f120370
+ const p2, 0x7f120379
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 d4d473d40e..f0084e8038 100644
--- a/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali
+++ b/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali
@@ -392,7 +392,7 @@
:cond_0
if-eqz v0, :cond_6
- const p2, 0x7f120800
+ const p2, 0x7f12080b
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -403,7 +403,7 @@
:cond_1
if-eqz v0, :cond_6
- const p2, 0x7f120a90
+ const p2, 0x7f120a9b
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -414,7 +414,7 @@
:cond_2
if-eqz v0, :cond_3
- const p2, 0x7f120519
+ const p2, 0x7f120522
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -434,7 +434,7 @@
:cond_4
if-eqz v0, :cond_5
- const p2, 0x7f120a8f
+ const p2, 0x7f120a9a
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/duration/DurationUtilsKt.smali b/com.discord/smali/com/discord/utilities/duration/DurationUtilsKt.smali
index 573094658a..da49685363 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, 0x7f1209c9
+ const p1, 0x7f1209d4
invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -50,7 +50,7 @@
if-gtz v5, :cond_1
- const v1, 0x7f1209cd
+ const v1, 0x7f1209d8
new-array v2, v4, [Ljava/lang/Object;
@@ -91,7 +91,7 @@
if-gtz v7, :cond_2
- const v5, 0x7f1209cc
+ const v5, 0x7f1209d7
new-array v6, v4, [Ljava/lang/Object;
@@ -130,7 +130,7 @@
if-gtz v7, :cond_3
- const v1, 0x7f1209cb
+ const v1, 0x7f1209d6
new-array v2, v4, [Ljava/lang/Object;
@@ -163,7 +163,7 @@
goto :goto_0
:cond_3
- const v5, 0x7f1209ca
+ const v5, 0x7f1209d5
new-array v6, v4, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/utilities/error/Error.smali b/com.discord/smali/com/discord/utilities/error/Error.smali
index 2fc2122192..362a1e39ea 100644
--- a/com.discord/smali/com/discord/utilities/error/Error.smali
+++ b/com.discord/smali/com/discord/utilities/error/Error.smali
@@ -689,7 +689,7 @@
packed-switch v0, :pswitch_data_0
- const v0, 0x7f120c76
+ const v0, 0x7f120c7d
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -702,7 +702,7 @@
return-object p1
:pswitch_0
- const v0, 0x7f120a89
+ const v0, 0x7f120a94
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -715,7 +715,7 @@
return-object p1
:pswitch_1
- const v0, 0x7f120c75
+ const v0, 0x7f120c7c
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -728,7 +728,7 @@
return-object p1
:pswitch_2
- const v0, 0x7f120c72
+ const v0, 0x7f120c79
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -741,7 +741,7 @@
return-object p1
:pswitch_3
- const v0, 0x7f121278
+ const v0, 0x7f121280
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -754,7 +754,7 @@
return-object p1
:pswitch_4
- const v0, 0x7f120c74
+ const v0, 0x7f120c7b
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -767,7 +767,7 @@
return-object p1
:pswitch_5
- const v0, 0x7f120c70
+ const v0, 0x7f120c77
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -782,7 +782,7 @@
:pswitch_6
iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response;
- const v1, 0x7f120c6d
+ const v1, 0x7f120c74
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;
@@ -797,7 +797,7 @@
:pswitch_7
iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response;
- const v1, 0x7f120c71
+ const v1, 0x7f120c78
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;
@@ -810,7 +810,7 @@
return-object p1
:pswitch_8
- const v0, 0x7f120fe4
+ const v0, 0x7f120fec
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -823,7 +823,7 @@
return-object p1
:pswitch_9
- const v0, 0x7f120c6f
+ const v0, 0x7f120c76
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -836,7 +836,7 @@
return-object p1
:pswitch_a
- const v0, 0x7f120c6e
+ const v0, 0x7f120c75
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -851,7 +851,7 @@
:pswitch_b
iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response;
- const v1, 0x7f120c73
+ const v1, 0x7f120c7a
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/fcm/NotificationData.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali
index 25421a29b9..682adf0e05 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali
@@ -1380,7 +1380,7 @@
if-eqz p2, :cond_1
- const v1, 0x7f120b12
+ const v1, 0x7f120b1d
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -1399,7 +1399,7 @@
goto :goto_0
:cond_1
- const v1, 0x7f1204e7
+ const v1, 0x7f1204f0
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -1544,7 +1544,7 @@
if-eqz v0, :cond_a
- const v0, 0x7f120d7e
+ const v0, 0x7f120d86
new-array v1, v7, [Ljava/lang/Object;
@@ -1617,7 +1617,7 @@
goto :goto_0
:cond_1
- const v0, 0x7f120d04
+ const v0, 0x7f120d0b
new-array v1, v5, [Ljava/lang/Object;
@@ -1636,7 +1636,7 @@
goto/16 :goto_2
:cond_2
- const v0, 0x7f120d02
+ const v0, 0x7f120d09
new-array v1, v5, [Ljava/lang/Object;
@@ -1684,7 +1684,7 @@
if-ne v1, v5, :cond_5
- const v0, 0x7f120d0a
+ const v0, 0x7f120d11
new-array v1, v5, [Ljava/lang/Object;
@@ -1705,7 +1705,7 @@
:cond_5
if-ne v1, v7, :cond_6
- const v0, 0x7f120d08
+ const v0, 0x7f120d0f
new-array v1, v5, [Ljava/lang/Object;
@@ -1751,7 +1751,7 @@
if-nez v0, :cond_a
- const v0, 0x7f120d00
+ const v0, 0x7f120d07
new-array v1, v5, [Ljava/lang/Object;
@@ -1778,7 +1778,7 @@
if-eqz v0, :cond_a
- const v0, 0x7f12072f
+ const v0, 0x7f12073a
new-array v1, v7, [Ljava/lang/Object;
@@ -1810,7 +1810,7 @@
goto :goto_2
:cond_8
- const v0, 0x7f120d0d
+ const v0, 0x7f120d14
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1819,7 +1819,7 @@
goto :goto_1
:cond_9
- const v0, 0x7f120cfe
+ const v0, 0x7f120d05
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -2158,7 +2158,7 @@
invoke-direct {p2, v0}, Landroidx/core/app/RemoteInput$Builder;->(Ljava/lang/String;)V
- const v0, 0x7f12110a
+ const v0, 0x7f121112
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -2206,7 +2206,7 @@
const v3, 0x7f0803a2
- const v4, 0x7f120d0e
+ const v4, 0x7f120d15
invoke-virtual {p1, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -2674,7 +2674,7 @@
const v2, 0x7f08023b
- const v3, 0x7f120bc7
+ const v3, 0x7f120bce
invoke-virtual {p1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -3081,7 +3081,7 @@
goto :goto_0
:cond_0
- const v1, 0x7f12052f
+ const v1, 0x7f120538
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -3433,7 +3433,7 @@
const v0, 0x7f080345
- const v1, 0x7f120d0b
+ const v1, 0x7f120d12
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -3506,7 +3506,7 @@
goto/16 :goto_1
:cond_0
- const v0, 0x7f120a53
+ const v0, 0x7f120a5e
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -3625,7 +3625,7 @@
if-nez v0, :cond_4
- const v0, 0x7f120d13
+ const v0, 0x7f120d1a
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -3642,7 +3642,7 @@
if-eqz v0, :cond_4
- const v0, 0x7f120730
+ const v0, 0x7f12073b
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 49c2ef6b7f..33326ee7b9 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali
@@ -710,7 +710,7 @@
invoke-direct {v0}, Landroidx/core/app/Person$Builder;->()V
- const v1, 0x7f120bed
+ const v1, 0x7f120bf4
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1116,12 +1116,12 @@
if-eqz p5, :cond_0
- const v2, 0x7f120d10
+ const v2, 0x7f120d17
goto :goto_0
:cond_0
- const v2, 0x7f120d0f
+ const v2, 0x7f120d16
:goto_0
sget-object v3, Lcom/discord/utilities/fcm/NotificationActions;->Companion:Lcom/discord/utilities/fcm/NotificationActions$Companion;
@@ -1249,7 +1249,7 @@
new-instance v0, Landroid/app/NotificationChannel;
- const v1, 0x7f120353
+ const v1, 0x7f12035c
invoke-virtual {p1, v1}, Landroid/app/Application;->getString(I)Ljava/lang/String;
@@ -1263,7 +1263,7 @@
new-instance v2, Landroid/app/NotificationChannel;
- const v4, 0x7f12143d
+ const v4, 0x7f121445
invoke-virtual {p1, v4}, Landroid/app/Application;->getString(I)Ljava/lang/String;
@@ -1277,7 +1277,7 @@
new-instance v4, Landroid/app/NotificationChannel;
- const v6, 0x7f120c10
+ const v6, 0x7f120c17
invoke-virtual {p1, v6}, Landroid/app/Application;->getString(I)Ljava/lang/String;
@@ -1289,7 +1289,7 @@
new-instance v6, Landroid/app/NotificationChannel;
- const v7, 0x7f12051a
+ const v7, 0x7f120523
invoke-virtual {p1, v7}, Landroid/app/Application;->getString(I)Ljava/lang/String;
@@ -1301,7 +1301,7 @@
new-instance v7, Landroid/app/NotificationChannel;
- const v8, 0x7f1206cb
+ const v8, 0x7f1206d4
invoke-virtual {p1, v8}, Landroid/app/Application;->getString(I)Ljava/lang/String;
@@ -1313,7 +1313,7 @@
new-instance v8, Landroid/app/NotificationChannel;
- const v9, 0x7f12070c
+ const v9, 0x7f120717
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 4e635db1c5..c75cdb00ac 100644
--- a/com.discord/smali/com/discord/utilities/games/GameDetectionService$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/games/GameDetectionService$Companion.smali
@@ -112,7 +112,7 @@
move-result-object v2
- const v3, 0x7f12052f
+ const v3, 0x7f120538
invoke-virtual {p1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -124,7 +124,7 @@
if-nez p2, :cond_0
- const p2, 0x7f12070c
+ const p2, 0x7f120717
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -133,7 +133,7 @@
goto :goto_0
:cond_0
- const v3, 0x7f120709
+ const v3, 0x7f120714
const/4 v4, 0x1
diff --git a/com.discord/smali/com/discord/utilities/images/MGImages$requestAvatarCrop$1.smali b/com.discord/smali/com/discord/utilities/images/MGImages$requestAvatarCrop$1.smali
index 6f882e6146..a67453a9da 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, 0x7f1212ec
+ const v3, 0x7f1212f4
const/4 v4, 0x1
diff --git a/com.discord/smali/com/discord/utilities/images/MGImages.smali b/com.discord/smali/com/discord/utilities/images/MGImages.smali
index 25a60c7957..2f30b7fdec 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImages.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImages.smali
@@ -392,7 +392,7 @@
const/4 v2, 0x1
- const v3, 0x7f12026a
+ const v3, 0x7f12026c
const/4 v4, 0x0
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali
index 7b10b96455..5f1e163d42 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali
@@ -380,7 +380,7 @@
if-eqz p3, :cond_0
- const p2, 0x7f121151
+ const p2, 0x7f121159
invoke-virtual {p0, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$Companion$INSTANCE$2.smali b/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$Companion$INSTANCE$2.smali
new file mode 100644
index 0000000000..1905ae4b2f
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$Companion$INSTANCE$2.smali
@@ -0,0 +1,76 @@
+.class public final Lcom/discord/utilities/media/AudioOutputMonitor$Companion$INSTANCE$2;
+.super Lt/u/b/k;
+.source "AudioOutputMonitor.kt"
+
+# interfaces
+.implements Lkotlin/jvm/functions/Function0;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+ value = Lcom/discord/utilities/media/AudioOutputMonitor;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+ value = {
+ "Lt/u/b/k;",
+ "Lkotlin/jvm/functions/Function0<",
+ "Lcom/discord/utilities/media/AudioOutputMonitor;",
+ ">;"
+ }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/utilities/media/AudioOutputMonitor$Companion$INSTANCE$2;
+
+
+# direct methods
+.method public static constructor ()V
+ .locals 1
+
+ new-instance v0, Lcom/discord/utilities/media/AudioOutputMonitor$Companion$INSTANCE$2;
+
+ invoke-direct {v0}, Lcom/discord/utilities/media/AudioOutputMonitor$Companion$INSTANCE$2;->()V
+
+ sput-object v0, Lcom/discord/utilities/media/AudioOutputMonitor$Companion$INSTANCE$2;->INSTANCE:Lcom/discord/utilities/media/AudioOutputMonitor$Companion$INSTANCE$2;
+
+ return-void
+.end method
+
+.method public constructor ()V
+ .locals 1
+
+ const/4 v0, 0x0
+
+ invoke-direct {p0, v0}, Lt/u/b/k;->(I)V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public final invoke()Lcom/discord/utilities/media/AudioOutputMonitor;
+ .locals 1
+
+ new-instance v0, Lcom/discord/utilities/media/AudioOutputMonitor;
+
+ invoke-direct {v0}, Lcom/discord/utilities/media/AudioOutputMonitor;->()V
+
+ return-object v0
+.end method
+
+.method public bridge synthetic invoke()Ljava/lang/Object;
+ .locals 1
+
+ invoke-virtual {p0}, Lcom/discord/utilities/media/AudioOutputMonitor$Companion$INSTANCE$2;->invoke()Lcom/discord/utilities/media/AudioOutputMonitor;
+
+ move-result-object v0
+
+ return-object v0
+.end method
diff --git a/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$Companion.smali b/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$Companion.smali
new file mode 100644
index 0000000000..abfc1b3c5b
--- /dev/null
+++ b/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor$Companion.smali
@@ -0,0 +1,119 @@
+.class public final Lcom/discord/utilities/media/AudioOutputMonitor$Companion;
+.super Ljava/lang/Object;
+.source "AudioOutputMonitor.kt"
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingClass;
+ value = Lcom/discord/utilities/media/AudioOutputMonitor;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x19
+ name = "Companion"
+.end annotation
+
+
+# static fields
+.field public static final synthetic $$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+
+# direct methods
+.method public static constructor ()V
+ .locals 5
+
+ const/4 v0, 0x1
+
+ new-array v0, v0, [Lkotlin/reflect/KProperty;
+
+ new-instance v1, Lt/u/b/u;
+
+ const-class v2, Lcom/discord/utilities/media/AudioOutputMonitor$Companion;
+
+ invoke-static {v2}, Lt/u/b/w;->getOrCreateKotlinClass(Ljava/lang/Class;)Lt/y/b;
+
+ move-result-object v2
+
+ const-string v3, "INSTANCE"
+
+ const-string v4, "getINSTANCE()Lcom/discord/utilities/media/AudioOutputMonitor;"
+
+ invoke-direct {v1, v2, v3, v4}, Lt/u/b/u;->(Lkotlin/reflect/KDeclarationContainer;Ljava/lang/String;Ljava/lang/String;)V
+
+ sget-object v2, Lt/u/b/w;->a:Lt/u/b/x;
+
+ invoke-virtual {v2, v1}, Lt/u/b/x;->property1(Lt/u/b/t;)Lt/y/d;
+
+ const/4 v2, 0x0
+
+ aput-object v1, v0, v2
+
+ sput-object v0, Lcom/discord/utilities/media/AudioOutputMonitor$Companion;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+ return-void
+.end method
+
+.method public constructor ()V
+ .locals 0
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+.method public synthetic constructor (Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+ .locals 0
+
+ invoke-direct {p0}, Lcom/discord/utilities/media/AudioOutputMonitor$Companion;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public final getINSTANCE()Lcom/discord/utilities/media/AudioOutputMonitor;
+ .locals 3
+
+ invoke-static {}, Lcom/discord/utilities/media/AudioOutputMonitor;->access$getINSTANCE$cp()Lkotlin/Lazy;
+
+ move-result-object v0
+
+ sget-object v1, Lcom/discord/utilities/media/AudioOutputMonitor;->Companion:Lcom/discord/utilities/media/AudioOutputMonitor$Companion;
+
+ sget-object v1, Lcom/discord/utilities/media/AudioOutputMonitor$Companion;->$$delegatedProperties:[Lkotlin/reflect/KProperty;
+
+ const/4 v2, 0x0
+
+ aget-object v1, v1, v2
+
+ invoke-interface {v0}, Lkotlin/Lazy;->getValue()Ljava/lang/Object;
+
+ move-result-object v0
+
+ check-cast v0, Lcom/discord/utilities/media/AudioOutputMonitor;
+
+ return-object v0
+.end method
+
+.method public final initialize(Landroid/app/Application;)V
+ .locals 1
+
+ if-eqz p1, :cond_0
+
+ invoke-virtual {p0}, Lcom/discord/utilities/media/AudioOutputMonitor$Companion;->getINSTANCE()Lcom/discord/utilities/media/AudioOutputMonitor;
+
+ move-result-object v0
+
+ invoke-virtual {v0, p1}, Lcom/discord/utilities/media/AudioOutputMonitor;->bindContext(Landroid/content/Context;)V
+
+ return-void
+
+ :cond_0
+ const-string p1, "application"
+
+ invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
+
+ const/4 p1, 0x0
+
+ throw p1
+.end method
diff --git a/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor.smali b/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor.smali
index 8e91d00404..bef8298d4e 100644
--- a/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor.smali
+++ b/com.discord/smali/com/discord/utilities/media/AudioOutputMonitor.smali
@@ -3,6 +3,20 @@
.source "AudioOutputMonitor.kt"
+# annotations
+.annotation system Ldalvik/annotation/MemberClasses;
+ value = {
+ Lcom/discord/utilities/media/AudioOutputMonitor$Companion;
+ }
+.end annotation
+
+
+# static fields
+.field public static final Companion:Lcom/discord/utilities/media/AudioOutputMonitor$Companion;
+
+.field public static final INSTANCE$delegate:Lkotlin/Lazy;
+
+
# instance fields
.field public final intentFilter:Landroid/content/IntentFilter;
@@ -33,6 +47,28 @@
# direct methods
+.method public static constructor ()V
+ .locals 2
+
+ new-instance v0, Lcom/discord/utilities/media/AudioOutputMonitor$Companion;
+
+ const/4 v1, 0x0
+
+ invoke-direct {v0, v1}, Lcom/discord/utilities/media/AudioOutputMonitor$Companion;->(Lkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+ sput-object v0, Lcom/discord/utilities/media/AudioOutputMonitor;->Companion:Lcom/discord/utilities/media/AudioOutputMonitor$Companion;
+
+ sget-object v0, Lcom/discord/utilities/media/AudioOutputMonitor$Companion$INSTANCE$2;->INSTANCE:Lcom/discord/utilities/media/AudioOutputMonitor$Companion$INSTANCE$2;
+
+ invoke-static {v0}, Le/k/a/b/e/p/g;->lazy(Lkotlin/jvm/functions/Function0;)Lkotlin/Lazy;
+
+ move-result-object v0
+
+ sput-object v0, Lcom/discord/utilities/media/AudioOutputMonitor;->INSTANCE$delegate:Lkotlin/Lazy;
+
+ return-void
+.end method
+
.method public constructor ()V
.locals 8
@@ -173,6 +209,14 @@
return-void
.end method
+.method public static final synthetic access$getINSTANCE$cp()Lkotlin/Lazy;
+ .locals 1
+
+ sget-object v0, Lcom/discord/utilities/media/AudioOutputMonitor;->INSTANCE$delegate:Lkotlin/Lazy;
+
+ return-object v0
+.end method
+
.method public static final synthetic access$handleBluetoothAdapterUpdate(Lcom/discord/utilities/media/AudioOutputMonitor;Landroid/content/Intent;)V
.locals 0
@@ -460,11 +504,28 @@
monitor-enter p0
:try_start_0
- invoke-static {}, Landroid/bluetooth/BluetoothAdapter;->getDefaultAdapter()Landroid/bluetooth/BluetoothAdapter;
+ const-string v0, "bluetooth"
+
+ invoke-virtual {p1, v0}, Landroid/content/Context;->getSystemService(Ljava/lang/String;)Ljava/lang/Object;
move-result-object v0
- if-eqz v0, :cond_1
+ instance-of v1, v0, Landroid/bluetooth/BluetoothManager;
+
+ if-nez v1, :cond_0
+
+ const/4 v0, 0x0
+
+ :cond_0
+ check-cast v0, Landroid/bluetooth/BluetoothManager;
+
+ if-eqz v0, :cond_3
+
+ invoke-virtual {v0}, Landroid/bluetooth/BluetoothManager;->getAdapter()Landroid/bluetooth/BluetoothAdapter;
+
+ move-result-object v0
+
+ if-eqz v0, :cond_2
new-instance v1, Lcom/discord/utilities/media/AudioOutputMonitor$handleInitialState$1;
@@ -478,13 +539,13 @@
move-result p1
- if-eqz p1, :cond_0
+ if-eqz p1, :cond_1
const/16 p1, 0xc
goto :goto_0
- :cond_0
+ :cond_1
const/16 p1, 0xa
:goto_0
@@ -496,7 +557,12 @@
return-void
- :cond_1
+ :cond_2
+ monitor-exit p0
+
+ return-void
+
+ :cond_3
monitor-exit p0
return-void
diff --git a/com.discord/smali/com/discord/utilities/media/AudioOutputState.smali b/com.discord/smali/com/discord/utilities/media/AudioOutputState.smali
index ffb46a3217..5e1ef6216c 100644
--- a/com.discord/smali/com/discord/utilities/media/AudioOutputState.smali
+++ b/com.discord/smali/com/discord/utilities/media/AudioOutputState.smali
@@ -10,6 +10,8 @@
.field public final isBluetoothScoDisconnected:Z
+.field public final isExternalAudioOutputConnected:Z
+
.field public final isHeadsetUnplugged:Z
@@ -49,6 +51,30 @@
iput-boolean p4, p0, Lcom/discord/utilities/media/AudioOutputState;->isHeadsetUnplugged:Z
+ iget-boolean p1, p0, Lcom/discord/utilities/media/AudioOutputState;->isBluetoothAdapterDisabled:Z
+
+ if-nez p1, :cond_0
+
+ iget-boolean p1, p0, Lcom/discord/utilities/media/AudioOutputState;->isBluetoothHeadsetDisconnected:Z
+
+ if-eqz p1, :cond_1
+
+ :cond_0
+ iget-boolean p1, p0, Lcom/discord/utilities/media/AudioOutputState;->isHeadsetUnplugged:Z
+
+ if-nez p1, :cond_2
+
+ :cond_1
+ const/4 p1, 0x1
+
+ goto :goto_0
+
+ :cond_2
+ const/4 p1, 0x0
+
+ :goto_0
+ iput-boolean p1, p0, Lcom/discord/utilities/media/AudioOutputState;->isExternalAudioOutputConnected:Z
+
return-void
.end method
@@ -296,6 +322,14 @@
return v0
.end method
+.method public final isExternalAudioOutputConnected()Z
+ .locals 1
+
+ iget-boolean v0, p0, Lcom/discord/utilities/media/AudioOutputState;->isExternalAudioOutputConnected:Z
+
+ return v0
+.end method
+
.method public final isHeadsetUnplugged()Z
.locals 1
diff --git a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter.smali b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter.smali
index 0d2c1118dc..574a19b5f7 100644
--- a/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter.smali
+++ b/com.discord/smali/com/discord/utilities/mg_recycler/MGRecyclerAdapter.smali
@@ -168,7 +168,7 @@
if-eqz v0, :cond_0
- const v1, 0x7f1200c2
+ const v1, 0x7f1200c4
const/4 v2, 0x1
diff --git a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali
index 2a0e1c7e0e..5274710fbc 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, 0x7f12052d
+ const v1, 0x7f120536
invoke-virtual {p1, v1, v0}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -160,7 +160,7 @@
invoke-static {v3, v0}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v0, 0x7f12052c
+ const v0, 0x7f120535
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -188,13 +188,13 @@
invoke-static {v7, p2}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const p2, 0x7f120370
+ const p2, 0x7f120379
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
move-result-object v6
- const p2, 0x7f12052a
+ const p2, 0x7f120533
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, 0x7f120fe6
+ const v0, 0x7f120fee
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -230,7 +230,7 @@
invoke-static {v1, v0}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v0, 0x7f120fe5
+ const v0, 0x7f120fed
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -284,13 +284,13 @@
move-result-object v5
- const v0, 0x7f120d61
+ const v0, 0x7f120d69
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
move-result-object v3
- const v0, 0x7f120cbe
+ const v0, 0x7f120cc5
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1.smali b/com.discord/smali/com/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1.smali
index 0ef8803568..972d166b8d 100644
--- a/com.discord/smali/com/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1.smali
+++ b/com.discord/smali/com/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1.smali
@@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/utilities/premium/PremiumUtils;->getHandOffAndOpenUrl(Lcom/discord/app/AppFragment;Landroid/net/Uri;Ljava/lang/String;)V
+ value = Lcom/discord/utilities/premium/PremiumUtils;->getHandOffAndOpenUrl(Lcom/discord/app/AppFragment;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/Long;)V
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
diff --git a/com.discord/smali/com/discord/utilities/premium/PremiumUtils.smali b/com.discord/smali/com/discord/utilities/premium/PremiumUtils.smali
index ec2f9a95f4..f59be50e68 100644
--- a/com.discord/smali/com/discord/utilities/premium/PremiumUtils.smali
+++ b/com.discord/smali/com/discord/utilities/premium/PremiumUtils.smali
@@ -36,7 +36,7 @@
return-void
.end method
-.method private final getHandOffAndOpenUrl(Lcom/discord/app/AppFragment;Landroid/net/Uri;Ljava/lang/String;)V
+.method private final getHandOffAndOpenUrl(Lcom/discord/app/AppFragment;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/Long;)V
.locals 10
new-instance v0, Ljava/lang/ref/WeakReference;
@@ -61,6 +61,23 @@
move-result-object p1
+ if-eqz p4, :cond_0
+
+ invoke-virtual {p4}, Ljava/lang/Long;->longValue()J
+
+ move-result-wide p2
+
+ invoke-static {p2, p3}, Ljava/lang/String;->valueOf(J)Ljava/lang/String;
+
+ move-result-object p2
+
+ const-string p3, "guild_id"
+
+ invoke-virtual {p1, p3, p2}, Landroid/net/Uri$Builder;->appendQueryParameter(Ljava/lang/String;Ljava/lang/String;)Landroid/net/Uri$Builder;
+
+ move-result-object p1
+
+ :cond_0
sget-object p2, Lcom/discord/utilities/auth/AuthUtils;->INSTANCE:Lcom/discord/utilities/auth/AuthUtils;
invoke-virtual {p1}, Landroid/net/Uri$Builder;->build()Landroid/net/Uri;
@@ -71,7 +88,7 @@
invoke-static {p1, p3}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-virtual {p2, p1}, Lcom/discord/utilities/auth/AuthUtils;->getWebHandoffUrl(Landroid/net/Uri;)Lrx/Observable;
+ invoke-virtual {p2, p1}, Lcom/discord/utilities/auth/AuthUtils;->getBillingWebHandoffUrl(Landroid/net/Uri;)Lrx/Observable;
move-result-object p1
@@ -79,9 +96,9 @@
const/4 p3, 0x1
- const/4 v1, 0x0
+ const/4 p4, 0x0
- invoke-static {p1, p2, p3, v1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
+ invoke-static {p1, p2, p3, p4}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable;
move-result-object p1
@@ -91,10 +108,6 @@
const-class v2, Lcom/discord/utilities/premium/PremiumUtils;
- new-instance v7, Lcom/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1;
-
- invoke-direct {v7, v0}, Lcom/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1;->(Ljava/lang/ref/WeakReference;)V
-
const/4 v3, 0x0
const/4 v4, 0x0
@@ -103,6 +116,10 @@
const/4 v6, 0x0
+ new-instance v7, Lcom/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1;
+
+ invoke-direct {v7, v0}, Lcom/discord/utilities/premium/PremiumUtils$getHandOffAndOpenUrl$1;->(Ljava/lang/ref/WeakReference;)V
+
const/16 v8, 0x1e
const/4 v9, 0x0
@@ -112,6 +129,21 @@
return-void
.end method
+.method public static synthetic getHandOffAndOpenUrl$default(Lcom/discord/utilities/premium/PremiumUtils;Lcom/discord/app/AppFragment;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/Long;ILjava/lang/Object;)V
+ .locals 0
+
+ and-int/lit8 p5, p5, 0x8
+
+ if-eqz p5, :cond_0
+
+ const/4 p4, 0x0
+
+ :cond_0
+ invoke-direct {p0, p1, p2, p3, p4}, Lcom/discord/utilities/premium/PremiumUtils;->getHandOffAndOpenUrl(Lcom/discord/app/AppFragment;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/Long;)V
+
+ return-void
+.end method
+
.method public static synthetic openWebPurchasePremium$default(Lcom/discord/utilities/premium/PremiumUtils;Lcom/discord/app/AppFragment;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Lcom/discord/utilities/analytics/Traits$Location;ZLandroid/net/Uri;ILjava/lang/Object;)V
.locals 6
@@ -402,7 +434,7 @@
if-eqz p1, :cond_0
- const v0, 0x7f1200d2
+ const v0, 0x7f1200d4
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -437,7 +469,7 @@
.end method
.method public final openWebAddPaymentSource(Lcom/discord/app/AppFragment;Landroid/net/Uri;)V
- .locals 1
+ .locals 8
const/4 v0, 0x0
@@ -445,9 +477,21 @@
if-eqz p2, :cond_0
- const-string v0, "/billing/payment-sources/create"
+ const/4 v5, 0x0
- invoke-direct {p0, p1, p2, v0}, Lcom/discord/utilities/premium/PremiumUtils;->getHandOffAndOpenUrl(Lcom/discord/app/AppFragment;Landroid/net/Uri;Ljava/lang/String;)V
+ const/16 v6, 0x8
+
+ const/4 v7, 0x0
+
+ const-string v4, "/billing/payment-sources/create"
+
+ move-object v1, p0
+
+ move-object v2, p1
+
+ move-object v3, p2
+
+ invoke-static/range {v1 .. v7}, Lcom/discord/utilities/premium/PremiumUtils;->getHandOffAndOpenUrl$default(Lcom/discord/utilities/premium/PremiumUtils;Lcom/discord/app/AppFragment;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/Long;ILjava/lang/Object;)V
return-void
@@ -467,7 +511,7 @@
.end method
.method public final openWebPurchasePremium(Lcom/discord/app/AppFragment;Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;Lcom/discord/utilities/analytics/Traits$Location;ZLandroid/net/Uri;)V
- .locals 8
+ .locals 9
const/4 v0, 0x0
@@ -535,9 +579,21 @@
invoke-virtual {p4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
- move-result-object p2
+ move-result-object v5
- invoke-direct {p0, p1, p5, p2}, Lcom/discord/utilities/premium/PremiumUtils;->getHandOffAndOpenUrl(Lcom/discord/app/AppFragment;Landroid/net/Uri;Ljava/lang/String;)V
+ const/4 v6, 0x0
+
+ const/16 v7, 0x8
+
+ const/4 v8, 0x0
+
+ move-object v2, p0
+
+ move-object v3, p1
+
+ move-object v4, p5
+
+ invoke-static/range {v2 .. v8}, Lcom/discord/utilities/premium/PremiumUtils;->getHandOffAndOpenUrl$default(Lcom/discord/utilities/premium/PremiumUtils;Lcom/discord/app/AppFragment;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/Long;ILjava/lang/Object;)V
return-void
@@ -627,16 +683,20 @@
move-result-object v1
- const-string v2, "/billing/guild-subscriptions/purchase"
+ invoke-static/range {p2 .. p3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
- move-object v3, p0
+ move-result-object v2
- invoke-direct {p0, p1, v1, v2}, Lcom/discord/utilities/premium/PremiumUtils;->getHandOffAndOpenUrl(Lcom/discord/app/AppFragment;Landroid/net/Uri;Ljava/lang/String;)V
+ const-string v3, "/billing/guild-subscriptions/purchase"
+
+ move-object v4, p0
+
+ invoke-direct {p0, p1, v1, v3, v2}, Lcom/discord/utilities/premium/PremiumUtils;->getHandOffAndOpenUrl(Lcom/discord/app/AppFragment;Landroid/net/Uri;Ljava/lang/String;Ljava/lang/Long;)V
return-void
:cond_0
- move-object v3, p0
+ move-object v4, p0
const-string v0, "planType"
@@ -645,7 +705,7 @@
throw v2
:cond_1
- move-object v3, p0
+ move-object v4, p0
const-string v0, "locationTrait"
@@ -654,7 +714,7 @@
throw v2
:cond_2
- move-object v3, p0
+ move-object v4, p0
const-string v0, "fragment"
diff --git a/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali b/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali
index ef80e15075..81de777321 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, 0x7f121357
+ const v1, 0x7f12135f
const/4 v2, 0x0
@@ -104,7 +104,7 @@
goto :goto_1
:cond_0
- const v0, 0x7f12135a
+ const v0, 0x7f121362
new-array v1, v3, [Ljava/lang/Object;
@@ -121,7 +121,7 @@
goto :goto_1
:cond_1
- const v0, 0x7f121355
+ const v0, 0x7f12135d
new-array v1, v3, [Ljava/lang/Object;
@@ -138,7 +138,7 @@
goto :goto_1
:cond_2
- const v0, 0x7f121356
+ const v0, 0x7f12135e
new-array v1, v3, [Ljava/lang/Object;
@@ -185,7 +185,7 @@
:goto_0
if-eqz p1, :cond_5
- const v0, 0x7f121358
+ const v0, 0x7f121360
new-array v3, v3, [Ljava/lang/Object;
@@ -267,7 +267,7 @@
goto :goto_2
:cond_1
- const v1, 0x7f121455
+ const v1, 0x7f12145d
new-array v3, v3, [Ljava/lang/Object;
@@ -294,7 +294,7 @@
goto :goto_2
:cond_3
- const v1, 0x7f120b95
+ const v1, 0x7f120b9c
new-array v3, v3, [Ljava/lang/Object;
@@ -311,7 +311,7 @@
goto :goto_2
:cond_4
- const v1, 0x7f1211e2
+ const v1, 0x7f1211ea
new-array v3, v3, [Ljava/lang/Object;
@@ -338,7 +338,7 @@
goto :goto_2
:cond_6
- const v1, 0x7f120e2a
+ const v1, 0x7f120e33
new-array v3, v3, [Ljava/lang/Object;
@@ -376,7 +376,7 @@
if-eqz p2, :cond_0
- const v0, 0x7f1211e2
+ const v0, 0x7f1211ea
const/4 v1, 0x1
@@ -399,7 +399,7 @@
goto :goto_0
:cond_0
- const p2, 0x7f1211e3
+ const p2, 0x7f1211eb
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -564,22 +564,22 @@
if-eq p1, v0, :cond_2
:goto_1
- const p1, 0x7f12119d
+ const p1, 0x7f1211a5
goto :goto_2
:cond_2
- const p1, 0x7f121198
+ const p1, 0x7f1211a0
goto :goto_2
:cond_3
- const p1, 0x7f12119a
+ const p1, 0x7f1211a2
goto :goto_2
:cond_4
- const p1, 0x7f12119e
+ const p1, 0x7f1211a6
: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 6df9382f2b..9021006d1b 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/1025"
+ const-string v0, "Discord-Android/1026"
return-object v0
.end method
diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages.smali b/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages.smali
index 2824c84e9a..ebee6cd8ca 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages.smali
@@ -38,7 +38,7 @@
move-result-object v1
- const v2, 0x7f12032b
+ const v2, 0x7f120334
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -60,7 +60,7 @@
move-result-object v3
- const v4, 0x7f120327
+ const v4, 0x7f120330
invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -80,7 +80,7 @@
move-result-object v3
- const v4, 0x7f120326
+ const v4, 0x7f12032f
invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -100,7 +100,7 @@
move-result-object v3
- const v4, 0x7f120328
+ const v4, 0x7f120331
invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -120,7 +120,7 @@
move-result-object v3
- const v4, 0x7f120096
+ const v4, 0x7f120098
invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
diff --git a/com.discord/smali/com/discord/utilities/rest/SendUtils.smali b/com.discord/smali/com/discord/utilities/rest/SendUtils.smali
index 59dff2d7b1..a2d0416057 100644
--- a/com.discord/smali/com/discord/utilities/rest/SendUtils.smali
+++ b/com.discord/smali/com/discord/utilities/rest/SendUtils.smali
@@ -306,17 +306,17 @@
goto :goto_0
:cond_0
- const p2, 0x7f1205c9
+ const p2, 0x7f1205d2
goto :goto_0
:cond_1
- const p2, 0x7f1205c8
+ const p2, 0x7f1205d1
goto :goto_0
:cond_2
- const p2, 0x7f1205ca
+ const p2, 0x7f1205d3
:goto_0
const v0, 0x7f0d0145
@@ -739,7 +739,7 @@
goto :goto_0
:cond_1
- const p3, 0x7f120c6d
+ const p3, 0x7f120c74
const/16 v2, 0xc
@@ -800,7 +800,7 @@
const/4 v2, 0x3
- const p3, 0x7f120f8f
+ const p3, 0x7f120f97
invoke-virtual {p1, p3}, 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 ea80c4827c..2654d68e69 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, 0x7f1210ce
+ const v0, 0x7f1210d6
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, 0x7f1210d0
+ const v0, 0x7f1210d8
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, 0x7f1210d2
+ const v0, 0x7f1210da
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, 0x7f1210cf
+ const v0, 0x7f1210d7
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, 0x7f1210ba
+ const v0, 0x7f1210c2
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, 0x7f1210b8
+ const v0, 0x7f1210c0
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, 0x7f1210b7
+ const v0, 0x7f1210bf
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, 0x7f1210bc
+ const v0, 0x7f1210c4
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, 0x7f1210b9
+ const v0, 0x7f1210c1
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, 0x7f1210bb
+ const v0, 0x7f1210c3
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 c2f8f7b945..c06fb5f58a 100644
--- a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler.smali
+++ b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler.smali
@@ -202,11 +202,11 @@
check-cast v0, Landroid/widget/TextView;
- const v5, 0x7f120526
+ const v5, 0x7f12052f
invoke-virtual {v2, v5}, Landroid/widget/TextView;->setText(I)V
- const v2, 0x7f120527
+ const v2, 0x7f120530
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, 0x7f120d61
+ const v2, 0x7f120d69
invoke-virtual {v0, v2}, Landroid/widget/TextView;->setText(I)V
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali
index e1e24e7ca6..a592b9d9c2 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali
@@ -33,14 +33,6 @@
:array_0
.array-data 4
- 0x7f121219
- 0x7f12121a
- 0x7f12121b
- 0x7f12121c
- 0x7f12121d
- 0x7f12121e
- 0x7f12121f
- 0x7f121220
0x7f121221
0x7f121222
0x7f121223
@@ -72,6 +64,14 @@
0x7f12123d
0x7f12123e
0x7f12123f
+ 0x7f121240
+ 0x7f121241
+ 0x7f121242
+ 0x7f121243
+ 0x7f121244
+ 0x7f121245
+ 0x7f121246
+ 0x7f121247
.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 090d7b8433..3a7dc4bfd4 100644
--- a/com.discord/smali/com/discord/utilities/uri/UriHandler.smali
+++ b/com.discord/smali/com/discord/utilities/uri/UriHandler.smali
@@ -1113,7 +1113,7 @@
return-void
:cond_6
- const p2, 0x7f1212f8
+ const p2, 0x7f121300
const/16 v1, 0xc
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 1e022dfd43..ea74983646 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, 0x7f120d88
+ const v1, 0x7f120d90
const/4 v2, 0x1
diff --git a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService.smali b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService.smali
index 47ad8a0a4e..b2949e8417 100644
--- a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService.smali
+++ b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService.smali
@@ -275,7 +275,7 @@
move-result-object v1
- const v3, 0x7f120d78
+ const v3, 0x7f120d80
invoke-virtual {p0, v3}, Landroid/app/Service;->getString(I)Ljava/lang/String;
@@ -285,7 +285,7 @@
move-result-object v1
- const v3, 0x7f120d89
+ const v3, 0x7f120d91
invoke-virtual {p0, v3}, Landroid/app/Service;->getString(I)Ljava/lang/String;
@@ -299,7 +299,7 @@
move-result-object v1
- const v2, 0x7f1203d6
+ const v2, 0x7f1203df
invoke-virtual {p0, v2}, Landroid/app/Service;->getString(I)Ljava/lang/String;
@@ -311,7 +311,7 @@
move-result-object p1
- const v1, 0x7f12112e
+ const v1, 0x7f121136
invoke-virtual {p0, v1}, Landroid/app/Service;->getString(I)Ljava/lang/String;
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 f1859b5f5d..2e8bb05b8a 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali
@@ -136,7 +136,7 @@
move-result-object v8
- const v9, 0x7f12052a
+ const v9, 0x7f120533
invoke-virtual {v8, v9}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -158,7 +158,7 @@
move-result-object v6
- const v7, 0x7f1212fc
+ const v7, 0x7f121304
invoke-virtual {v6, v7}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -177,7 +177,7 @@
move-result-object v6
- const v7, 0x7f120c54
+ const v7, 0x7f120c5b
invoke-virtual {v6, v7}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -200,7 +200,7 @@
move-result-object p2
- const v2, 0x7f1212f6
+ const v2, 0x7f1212fe
invoke-virtual {p2, v2}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -219,7 +219,7 @@
move-result-object p2
- const v2, 0x7f1204e1
+ const v2, 0x7f1204ea
invoke-virtual {p2, v2}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceViewUtils.smali b/com.discord/smali/com/discord/utilities/voice/VoiceViewUtils.smali
index 5ad46d290a..b666388984 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceViewUtils.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceViewUtils.smali
@@ -49,7 +49,7 @@
if-ne v0, v1, :cond_1
- const p2, 0x7f120444
+ const p2, 0x7f12044d
new-array v0, v1, [Ljava/lang/Object;
@@ -94,7 +94,7 @@
if-eqz p3, :cond_2
- const p2, 0x7f12043e
+ const p2, 0x7f120447
goto :goto_2
@@ -107,7 +107,7 @@
if-eqz p3, :cond_3
- const p2, 0x7f120441
+ const p2, 0x7f12044a
goto :goto_2
@@ -120,7 +120,7 @@
if-eqz p3, :cond_4
- const p2, 0x7f12043c
+ const p2, 0x7f120445
goto :goto_2
@@ -133,7 +133,7 @@
if-eqz p3, :cond_5
- const p2, 0x7f12043b
+ const p2, 0x7f120444
goto :goto_2
@@ -146,7 +146,7 @@
if-eqz p3, :cond_6
- const p2, 0x7f120442
+ const p2, 0x7f12044b
goto :goto_2
@@ -159,7 +159,7 @@
if-eqz p3, :cond_7
- const p2, 0x7f120446
+ const p2, 0x7f12044f
goto :goto_2
@@ -185,7 +185,7 @@
if-nez p2, :cond_a
:goto_1
- const p2, 0x7f12043f
+ const p2, 0x7f120448
:goto_2
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/views/ActiveSubscriptionView$b.smali b/com.discord/smali/com/discord/views/ActiveSubscriptionView$b.smali
index fda787449e..0a8dc9154c 100644
--- a/com.discord/smali/com/discord/views/ActiveSubscriptionView$b.smali
+++ b/com.discord/smali/com/discord/views/ActiveSubscriptionView$b.smali
@@ -169,7 +169,7 @@
iget-object v1, p0, Lcom/discord/views/ActiveSubscriptionView$b;->e:Landroid/content/Context;
- const v2, 0x7f120dd5
+ const v2, 0x7f120ddd
const/4 v3, 0x1
@@ -225,7 +225,7 @@
invoke-static {p2, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const p1, 0x7f120290
+ const p1, 0x7f120292
invoke-static {p2, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
@@ -246,7 +246,7 @@
invoke-static {p2, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const p1, 0x7f120242
+ const p1, 0x7f120244
invoke-static {p2, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/views/OAuthPermissionViews.smali b/com.discord/smali/com/discord/views/OAuthPermissionViews.smali
index 2bc1559a12..c0862ed379 100644
--- a/com.discord/smali/com/discord/views/OAuthPermissionViews.smali
+++ b/com.discord/smali/com/discord/views/OAuthPermissionViews.smali
@@ -69,7 +69,7 @@
if-eqz p1, :cond_4
- const p1, 0x7f121077
+ const p1, 0x7f12107f # 1.9415294E38f
invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -86,7 +86,7 @@
if-eqz p1, :cond_4
- const p1, 0x7f121079
+ const p1, 0x7f121081
invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -148,7 +148,7 @@
goto/16 :goto_2
:cond_1
- const p1, 0x7f121084
+ const p1, 0x7f12108c
invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -165,7 +165,7 @@
if-eqz p1, :cond_4
- const p1, 0x7f121094
+ const p1, 0x7f12109c
invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -182,7 +182,7 @@
if-eqz p1, :cond_4
- const p1, 0x7f12107d
+ const p1, 0x7f121085
invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -199,7 +199,7 @@
if-eqz p1, :cond_4
- const p1, 0x7f121088
+ const p1, 0x7f121090
invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -235,7 +235,7 @@
if-eqz p1, :cond_4
- const p1, 0x7f121095
+ const p1, 0x7f12109d
invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -252,7 +252,7 @@
if-eqz p1, :cond_4
- const p1, 0x7f12107f # 1.9415294E38f
+ const p1, 0x7f121087
invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -288,7 +288,7 @@
if-eqz p1, :cond_4
- const p1, 0x7f121073
+ const p1, 0x7f12107b
invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -305,7 +305,7 @@
if-eqz p1, :cond_4
- const p1, 0x7f12108f
+ const p1, 0x7f121097
invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -322,7 +322,7 @@
if-eqz p1, :cond_4
- const p1, 0x7f121097
+ const p1, 0x7f12109f
invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -339,7 +339,7 @@
if-eqz p1, :cond_4
- const p1, 0x7f12107b
+ const p1, 0x7f121083
invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -401,7 +401,7 @@
goto :goto_2
:cond_3
- const p1, 0x7f12108a
+ const p1, 0x7f121092
invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -418,7 +418,7 @@
if-eqz p1, :cond_4
- const p1, 0x7f12108c
+ const p1, 0x7f121094
invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -435,7 +435,7 @@
if-eqz p1, :cond_4
- const p1, 0x7f121075
+ const p1, 0x7f12107d
invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -452,7 +452,7 @@
if-eqz p1, :cond_4
- const p1, 0x7f121091
+ const p1, 0x7f121099
invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -539,7 +539,7 @@
if-eqz v0, :cond_0
- const p2, 0x7f121076
+ const p2, 0x7f12107e
goto/16 :goto_0
@@ -552,7 +552,7 @@
if-eqz v0, :cond_0
- const p2, 0x7f121078
+ const p2, 0x7f121080
goto/16 :goto_0
@@ -565,7 +565,7 @@
if-eqz v0, :cond_0
- const p2, 0x7f121083
+ const p2, 0x7f12108b
goto/16 :goto_0
@@ -578,7 +578,7 @@
if-eqz v0, :cond_0
- const p2, 0x7f121093
+ const p2, 0x7f12109b
goto/16 :goto_0
@@ -591,7 +591,7 @@
if-eqz v0, :cond_0
- const p2, 0x7f12107c
+ const p2, 0x7f121084
goto/16 :goto_0
@@ -604,7 +604,7 @@
if-eqz v0, :cond_0
- const p2, 0x7f121087
+ const p2, 0x7f12108f
goto/16 :goto_0
@@ -617,7 +617,7 @@
if-eqz v0, :cond_0
- const p2, 0x7f121085
+ const p2, 0x7f12108d
goto/16 :goto_0
@@ -630,7 +630,7 @@
if-eqz v0, :cond_0
- const p2, 0x7f121092
+ const p2, 0x7f12109a
goto/16 :goto_0
@@ -643,7 +643,7 @@
if-eqz v0, :cond_0
- const p2, 0x7f12107e
+ const p2, 0x7f121086
goto/16 :goto_0
@@ -656,7 +656,7 @@
if-eqz v0, :cond_0
- const p2, 0x7f12108d
+ const p2, 0x7f121095
goto :goto_0
@@ -669,7 +669,7 @@
if-eqz v0, :cond_0
- const p2, 0x7f121072
+ const p2, 0x7f12107a
goto :goto_0
@@ -682,7 +682,7 @@
if-eqz v0, :cond_0
- const p2, 0x7f12108e
+ const p2, 0x7f121096
goto :goto_0
@@ -695,7 +695,7 @@
if-eqz v0, :cond_0
- const p2, 0x7f121096
+ const p2, 0x7f12109e
goto :goto_0
@@ -708,7 +708,7 @@
if-eqz v0, :cond_0
- const p2, 0x7f12107a
+ const p2, 0x7f121082 # 1.94153E38f
goto :goto_0
@@ -721,7 +721,7 @@
if-eqz v0, :cond_0
- const p2, 0x7f121089
+ const p2, 0x7f121091
goto :goto_0
@@ -734,7 +734,7 @@
if-eqz v0, :cond_0
- const p2, 0x7f12108b
+ const p2, 0x7f121093
goto :goto_0
@@ -747,7 +747,7 @@
if-eqz v0, :cond_0
- const p2, 0x7f121074
+ const p2, 0x7f12107c
goto :goto_0
@@ -760,7 +760,7 @@
if-eqz v0, :cond_0
- const p2, 0x7f121090
+ const p2, 0x7f121098
:goto_0
invoke-virtual {p1, p2}, Landroid/widget/TextView;->setText(I)V
diff --git a/com.discord/smali/com/discord/views/OverlayMenuView$a.smali b/com.discord/smali/com/discord/views/OverlayMenuView$a.smali
index 33bfb16c42..671c63b4b4 100644
--- a/com.discord/smali/com/discord/views/OverlayMenuView$a.smali
+++ b/com.discord/smali/com/discord/views/OverlayMenuView$a.smali
@@ -17,42 +17,29 @@
# instance fields
.field public final a:Z
-.field public final b:Lcom/discord/utilities/media/AudioOutputState;
-
-.field public final c:Lcom/discord/models/domain/ModelVoice$OutputMode;
+.field public final b:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
# direct methods
-.method public constructor (ZLcom/discord/utilities/media/AudioOutputState;Lcom/discord/models/domain/ModelVoice$OutputMode;)V
- .locals 1
+.method public constructor (ZLcom/discord/stores/StoreAudioDevices$AudioDevicesState;)V
+ .locals 0
- const/4 v0, 0x0
-
- if-eqz p2, :cond_1
-
- if-eqz p3, :cond_0
+ if-eqz p2, :cond_0
invoke-direct {p0}, Ljava/lang/Object;->()V
iput-boolean p1, p0, Lcom/discord/views/OverlayMenuView$a;->a:Z
- iput-object p2, p0, Lcom/discord/views/OverlayMenuView$a;->b:Lcom/discord/utilities/media/AudioOutputState;
-
- iput-object p3, p0, Lcom/discord/views/OverlayMenuView$a;->c:Lcom/discord/models/domain/ModelVoice$OutputMode;
+ iput-object p2, p0, Lcom/discord/views/OverlayMenuView$a;->b:Lcom/discord/stores/StoreAudioDevices$AudioDevicesState;
return-void
:cond_0
- const-string p1, "outputMode"
+ const-string p1, "audioDevicesState"
invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
- throw v0
+ const/4 p1, 0x0
- :cond_1
- const-string p1, "audioOutputState"
-
- invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
-
- throw v0
+ throw p1
.end method
diff --git a/com.discord/smali/com/discord/views/OverlayMenuView.smali b/com.discord/smali/com/discord/views/OverlayMenuView.smali
index c0a1a6b960..f0c3cf9ae2 100644
--- a/com.discord/smali/com/discord/views/OverlayMenuView.smali
+++ b/com.discord/smali/com/discord/views/OverlayMenuView.smali
@@ -994,38 +994,28 @@
sget-object v4, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
- invoke-virtual {v4}, Lcom/discord/stores/StoreStream$Companion;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
+ invoke-virtual {v4}, Lcom/discord/stores/StoreStream$Companion;->getAudioDevices()Lcom/discord/stores/StoreAudioDevices;
move-result-object v4
- invoke-virtual {v4}, Lcom/discord/stores/StoreMediaSettings;->getAudioOutputState()Lrx/Observable;
+ invoke-virtual {v4}, Lcom/discord/stores/StoreAudioDevices;->getAudioDevicesState()Lrx/Observable;
move-result-object v4
- sget-object v5, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
+ sget-object v5, Le/a/j/u;->d:Le/a/j/u;
- invoke-virtual {v5}, Lcom/discord/stores/StoreStream$Companion;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
+ if-eqz v5, :cond_0
- move-result-object v5
+ new-instance v6, Le/a/j/w;
- invoke-virtual {v5}, Lcom/discord/stores/StoreMediaSettings;->getOutputMode()Lrx/Observable;
+ invoke-direct {v6, v5}, Le/a/j/w;->(Lkotlin/jvm/functions/Function2;)V
- move-result-object v5
-
- sget-object v6, Le/a/j/u;->d:Le/a/j/u;
-
- if-eqz v6, :cond_0
-
- new-instance v7, Le/a/j/w;
-
- invoke-direct {v7, v6}, Le/a/j/w;->(Lkotlin/jvm/functions/Function3;)V
-
- move-object v6, v7
+ move-object v5, v6
:cond_0
- check-cast v6, Lrx/functions/Func3;
+ check-cast v5, Lrx/functions/Func2;
- invoke-static {v0, v4, v5, v6}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func3;)Lrx/Observable;
+ invoke-static {v0, v4, v5}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
move-result-object v0
diff --git a/com.discord/smali/com/discord/views/StreamPreviewView.smali b/com.discord/smali/com/discord/views/StreamPreviewView.smali
index da106528ec..6beb3f05b1 100644
--- a/com.discord/smali/com/discord/views/StreamPreviewView.smali
+++ b/com.discord/smali/com/discord/views/StreamPreviewView.smali
@@ -337,7 +337,7 @@
move-result-object p1
- const v0, 0x7f1211bc
+ const v0, 0x7f1211c4
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -381,7 +381,7 @@
move-result-object p1
- const v0, 0x7f1211ba
+ const v0, 0x7f1211c2
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -415,7 +415,7 @@
if-ne p1, p2, :cond_3
- const p1, 0x7f1203a2
+ const p1, 0x7f1203ab
invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
@@ -433,7 +433,7 @@
throw p1
:cond_4
- const p1, 0x7f1212eb
+ const p1, 0x7f1212f3
invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
@@ -444,7 +444,7 @@
goto :goto_1
:cond_5
- const p1, 0x7f120b1b
+ const p1, 0x7f120b26
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/premium/AccountCreditView.smali b/com.discord/smali/com/discord/views/premium/AccountCreditView.smali
index 1e3bab8526..7ce99dd729 100644
--- a/com.discord/smali/com/discord/views/premium/AccountCreditView.smali
+++ b/com.discord/smali/com/discord/views/premium/AccountCreditView.smali
@@ -183,7 +183,7 @@
move-result-wide v4
- const v6, 0x7f120f47
+ const v6, 0x7f120f4f
const-string v7, "header"
@@ -195,7 +195,7 @@
move-result-object v4
- const v5, 0x7f120f62
+ const v5, 0x7f120f6a
invoke-virtual {v4, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -246,7 +246,7 @@
move-result-object v4
- const v5, 0x7f120f63
+ const v5, 0x7f120f6b
invoke-virtual {v4, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -334,7 +334,7 @@
move-result-object v6
- const v8, 0x7f120f49
+ const v8, 0x7f120f51
new-array v9, v2, [Ljava/lang/Object;
@@ -357,7 +357,7 @@
move-result-object v6
- const v8, 0x7f120f48
+ const v8, 0x7f120f50
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 e7b194285e..23a160d44b 100644
--- a/com.discord/smali/com/discord/views/premiumguild/PremiumGuildConfirmationView.smali
+++ b/com.discord/smali/com/discord/views/premiumguild/PremiumGuildConfirmationView.smali
@@ -690,7 +690,7 @@
move-result-object p1
- const v0, 0x7f120f09
+ const v0, 0x7f120f11
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -703,7 +703,7 @@
move-result-object p1
- const v0, 0x7f120f08
+ const v0, 0x7f120f10
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -716,7 +716,7 @@
move-result-object p1
- const v0, 0x7f120f07
+ const v0, 0x7f120f0f
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -729,7 +729,7 @@
move-result-object p1
- const v0, 0x7f120e88
+ const v0, 0x7f120e91
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 09e41d01ee..20cbabf2ce 100644
--- a/com.discord/smali/com/discord/views/premiumguild/PremiumGuildProgressView.smali
+++ b/com.discord/smali/com/discord/views/premiumguild/PremiumGuildProgressView.smali
@@ -303,7 +303,7 @@
move-result-object v1
- const v2, 0x7f120f09
+ const v2, 0x7f120f11
invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -316,7 +316,7 @@
move-result-object v1
- const v2, 0x7f120f08
+ const v2, 0x7f120f10
invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -329,7 +329,7 @@
move-result-object v1
- const v2, 0x7f120f07
+ const v2, 0x7f120f0f
invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -342,7 +342,7 @@
move-result-object v1
- const v2, 0x7f120e88
+ const v2, 0x7f120e91
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 a8933c564f..2480b68e11 100644
--- a/com.discord/smali/com/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView.smali
+++ b/com.discord/smali/com/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView.smali
@@ -219,7 +219,7 @@
aput-object v2, v0, v1
- const v2, 0x7f1202e2
+ const v2, 0x7f1202e4
invoke-static {p0, v2, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
@@ -257,7 +257,7 @@
move-result-object v2
- const v3, 0x7f12097c
+ const v3, 0x7f120987
new-array v5, p2, [Ljava/lang/Object;
@@ -293,7 +293,7 @@
invoke-static {v6, v4}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v7, 0x7f120985
+ const v7, 0x7f120990
const/4 v12, 0x2
@@ -364,7 +364,7 @@
invoke-static {v6, v4}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v0, 0x7f12098a
+ const v0, 0x7f120995
new-array v4, v12, [Ljava/lang/Object;
@@ -411,7 +411,7 @@
invoke-static {v6, v4}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v0, 0x7f120988
+ const v0, 0x7f120993
new-array p2, p2, [Ljava/lang/Object;
@@ -444,7 +444,7 @@
:cond_3
iget-object p1, p0, Lcom/discord/views/premiumguild/PremiumGuildSubscriptionUpsellView;->d:Lcom/discord/app/AppTextView;
- const v2, 0x7f120984
+ const v2, 0x7f12098f
new-array p2, p2, [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 3f5b99fb95..53487807d4 100644
--- a/com.discord/smali/com/discord/views/premiumguild/PremiumSubscriptionMarketingView.smali
+++ b/com.discord/smali/com/discord/views/premiumguild/PremiumSubscriptionMarketingView.smali
@@ -331,7 +331,7 @@
aput-object v5, v3, v6
- const v5, 0x7f12097c
+ const v5, 0x7f120987
invoke-static {p0, v5, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
@@ -341,7 +341,7 @@
iget-object v1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->e:Landroid/widget/TextView;
- const v3, 0x7f12097e
+ const v3, 0x7f120989
new-array v9, v2, [Ljava/lang/Object;
@@ -381,7 +381,7 @@
iget-object v1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->g:Landroid/widget/TextView;
- const v3, 0x7f12097d
+ const v3, 0x7f120988
new-array v5, v2, [Ljava/lang/Object;
@@ -447,7 +447,7 @@
iget-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->k:Landroid/widget/TextView;
- const p2, 0x7f120981
+ const p2, 0x7f12098c
invoke-static {p0, p2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
@@ -457,7 +457,7 @@
iget-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->l:Landroid/widget/TextView;
- const p2, 0x7f120982
+ const p2, 0x7f12098d
new-array v0, v2, [Ljava/lang/Object;
@@ -486,7 +486,7 @@
iget-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->k:Landroid/widget/TextView;
- const v0, 0x7f120980
+ const v0, 0x7f12098b
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 0f507cb844..c4884c3377 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
@@ -84,9 +84,9 @@
if-eqz v1, :cond_0
- const v1, 0x7f120c8e
+ const v1, 0x7f120c95
- const v12, 0x7f120c8e
+ const v12, 0x7f120c95
goto :goto_0
@@ -98,9 +98,9 @@
if-eqz v1, :cond_1
- const v1, 0x7f12026d
+ const v1, 0x7f12026f
- const v13, 0x7f12026d
+ const v13, 0x7f12026f
goto :goto_1
@@ -112,9 +112,9 @@
if-eqz v1, :cond_2
- const v1, 0x7f12054b
+ const v1, 0x7f120554
- const v14, 0x7f12054b
+ const v14, 0x7f120554
goto :goto_2
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthInviteInfo.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthInviteInfo.smali
index 5ac9778a9c..74856c310a 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthInviteInfo.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthInviteInfo.smali
@@ -482,7 +482,7 @@
move-result v5
- const v7, 0x7f12025b
+ const v7, 0x7f12025d
if-eqz v5, :cond_6
@@ -556,7 +556,7 @@
:cond_5
:goto_3
- const p1, 0x7f120a82
+ const p1, 0x7f120a8d
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -591,7 +591,7 @@
goto :goto_5
:cond_7
- const p1, 0x7f120a80
+ const p1, 0x7f120a8b
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
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 c531277b57..abbf697c46 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, 0x7f120db7
+ const v1, 0x7f120dbf
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 31e276dca0..199e34d04e 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, 0x7f120db4
+ const v0, 0x7f120dbc
invoke-virtual {p1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
move-result-object p1
- const v0, 0x7f120db5
+ const v0, 0x7f120dbd
invoke-virtual {p1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
@@ -65,7 +65,7 @@
sget-object v0, Lcom/discord/widgets/auth/WidgetAuthLogin$onViewBound$5$1;->INSTANCE:Lcom/discord/widgets/auth/WidgetAuthLogin$onViewBound$5$1;
- const v1, 0x7f120db6
+ const v1, 0x7f120dbe
invoke-virtual {p1, v1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setPositiveButton(ILkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
@@ -73,7 +73,7 @@
const/4 v0, 0x0
- const v1, 0x7f120370
+ const v1, 0x7f120379
const/4 v2, 0x2
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 d6d5e14730..b0457d7417 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, 0x7f120573
+ const v6, 0x7f12057c
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, 0x7f120572
+ const v7, 0x7f12057b
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, 0x7f120db9
+ const v8, 0x7f120dc1
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 c8d3ea9462..716b202585 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali
@@ -401,7 +401,7 @@
move-result-object v0
- const v1, 0x7f120573
+ const v1, 0x7f12057c
const/4 v3, 0x0
@@ -948,7 +948,7 @@
aput-object p1, v0, v1
- const p1, 0x7f120574
+ const p1, 0x7f12057d
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.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali
index e69fa37125..34847b8bb8 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali
@@ -185,7 +185,7 @@
if-ge v0, v1, :cond_0
- const p1, 0x7f1212ba
+ const p1, 0x7f1212c2
const/4 p2, 0x0
@@ -212,7 +212,7 @@
if-eqz v0, :cond_0
- const p1, 0x7f1212e0
+ const p1, 0x7f1212e8
const/4 v0, 0x0
@@ -449,7 +449,7 @@
move-result-object v9
- const v1, 0x7f1212c3
+ const v1, 0x7f1212cb
const/4 v2, 0x2
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 32ec33960a..89dcf3de46 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, 0x7f121261
+ const v0, 0x7f121269
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 349131aa63..49a00ac82e 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, 0x7f1213f9
+ const v7, 0x7f121401
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, 0x7f120573
+ const v9, 0x7f12057c
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, 0x7f120572
+ const v9, 0x7f12057b
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, 0x7f120db9
+ const v9, 0x7f120dc1
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, 0x7f120db3
+ const v8, 0x7f120dbb
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 79dee757fd..87c6ead483 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali
@@ -693,7 +693,7 @@
new-array v0, v0, [Ljava/lang/Object;
- const v1, 0x7f12125e
+ const v1, 0x7f121266
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -703,7 +703,7 @@
aput-object v1, v0, v2
- const v1, 0x7f120f98
+ const v1, 0x7f120fa0
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1276,12 +1276,12 @@
if-eqz v0, :cond_1
- const v0, 0x7f121260
+ const v0, 0x7f121268
goto :goto_1
:cond_1
- const v0, 0x7f12125f
+ const v0, 0x7f121267
:goto_1
invoke-direct {p0, v4, 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$validationManager$2$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize$validationManager$2$2.smali
index dc734bf6c2..d19e714949 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, 0x7f120d5c
+ const v4, 0x7f120d64
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 5ad5c8d616..3e78e92ffb 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2Authorize.smali
@@ -668,19 +668,19 @@
if-eqz p1, :cond_2
- const p1, 0x7f120d58
+ const p1, 0x7f120d60
goto :goto_2
:cond_2
if-eqz p1, :cond_3
- const p1, 0x7f120d59
+ const p1, 0x7f120d61
goto :goto_2
:cond_3
- const p1, 0x7f120d5f
+ const p1, 0x7f120d67
:goto_2
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -1017,7 +1017,7 @@
aput-object p1, v2, v3
- const p1, 0x7f120d5c
+ const p1, 0x7f120d64
invoke-virtual {p0, p1, v2}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -1104,7 +1104,7 @@
move-result-object v5
- const v6, 0x7f120d5a
+ const v6, 0x7f120d62
const/4 v7, 0x1
@@ -1660,7 +1660,7 @@
:catch_0
move-exception p1
- const v2, 0x7f120d5d
+ const v2, 0x7f120d65
const/4 v3, 0x1
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2.smali
index 551cb3c144..86ca7d8247 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2.smali
@@ -132,7 +132,7 @@
iget-object p1, p0, Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung$samsungCallbackHandshake$2;->this$0:Lcom/discord/widgets/auth/WidgetOauth2AuthorizeSamsung;
- const v0, 0x7f120262
+ const v0, 0x7f120264
const/4 v1, 0x0
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung.smali b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung.smali
index f763a1fa40..65b621428a 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetOauth2AuthorizeSamsung.smali
@@ -683,7 +683,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, 0x7f1205c1
+ const p1, 0x7f1205ca
const/4 p2, 0x4
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali
index 8b1cd3ea50..1aa27e9a59 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali
@@ -313,7 +313,7 @@
move-result-object v1
- const v2, 0x7f1203aa
+ const v2, 0x7f1203b3
invoke-virtual {p0, v2}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -398,25 +398,25 @@
move-result-object v4
- const p1, 0x7f120c58
+ const p1, 0x7f120c5f
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
move-result-object v5
- const p1, 0x7f121300
+ const p1, 0x7f121308
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
move-result-object v6
- const p1, 0x7f120657
+ const p1, 0x7f120660
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
move-result-object v7
- const v8, 0x7f120658
+ const v8, 0x7f120661
const/4 v9, 0x0
@@ -467,7 +467,7 @@
invoke-direct {v1, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V
- const p1, 0x7f120b84
+ const p1, 0x7f120b8b
const/4 v2, 0x1
@@ -485,7 +485,7 @@
move-result-object p1
- const v1, 0x7f120b81
+ const v1, 0x7f120b88
new-array v2, v2, [Ljava/lang/Object;
@@ -505,7 +505,7 @@
move-result-object p1
- const p3, 0x7f120b80
+ const p3, 0x7f120b87
new-instance v1, Le/a/k/a/q;
@@ -515,7 +515,7 @@
move-result-object p1
- const p2, 0x7f120370
+ const p2, 0x7f120379
sget-object p3, Le/a/k/a/m;->d:Le/a/k/a/m;
@@ -552,7 +552,7 @@
.method private handleUpdate()V
.locals 2
- const v0, 0x7f121071
+ const v0, 0x7f121079
invoke-static {p0, v0}, Le/a/b/j;->a(Landroidx/fragment/app/Fragment;I)V
@@ -762,9 +762,9 @@
.method public synthetic c()V
.locals 2
- const v0, 0x7f1203c9
+ const v0, 0x7f1203d2
- const v1, 0x7f1212ec
+ const v1, 0x7f1212f4
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.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali
index eab077c531..e3c914a82f 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali
@@ -348,11 +348,11 @@
const/4 v3, 0x1
- const v8, 0x7f120c55
+ const v8, 0x7f120c5c
if-eqz v2, :cond_0
- const v2, 0x7f120c56
+ const v2, 0x7f120c5d
new-array v9, v3, [Ljava/lang/Object;
@@ -400,7 +400,7 @@
if-eqz v9, :cond_1
- const v8, 0x7f1212fe
+ const v8, 0x7f121306
new-array v3, v3, [Ljava/lang/Object;
@@ -446,7 +446,7 @@
move-result-object v11
- const v3, 0x7f120652
+ const v3, 0x7f12065b
invoke-virtual {v0, v3}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -456,9 +456,9 @@
invoke-static {v14, v3}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v15, 0x7f120653
+ const v15, 0x7f12065c
- const v3, 0x7f120656
+ const v3, 0x7f12065f
invoke-virtual {v0, v3}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -604,7 +604,7 @@
invoke-static {p0, v1, v0, p1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const p1, 0x7f120d11
+ const p1, 0x7f120d18
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
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 61584447c4..1754b13be5 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSelector$Companion.smali
@@ -120,9 +120,9 @@
if-eqz p5, :cond_1
- const p6, 0x7f120cc4
+ const p6, 0x7f120ccb
- const v6, 0x7f120cc4
+ const v6, 0x7f120ccb
goto :goto_1
@@ -164,9 +164,9 @@
if-eqz p5, :cond_1
- const p6, 0x7f120cc4
+ const p6, 0x7f120ccb
- const v6, 0x7f120cc4
+ const v6, 0x7f120ccb
goto :goto_1
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 c159ab7ce1..5609728a37 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForRole.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForRole.smali
@@ -786,7 +786,7 @@
move-result v0
- const v1, 0x7f120373
+ const v1, 0x7f12037c
if-eqz v0, :cond_3
@@ -814,7 +814,7 @@
goto :goto_0
:cond_2
- const p2, 0x7f120371
+ const p2, 0x7f12037a
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 91c3802490..24ef11d1bd 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForUser.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForUser.smali
@@ -377,7 +377,7 @@
move-result p2
- const v0, 0x7f120372
+ const v0, 0x7f12037b
if-eqz p2, :cond_0
@@ -404,7 +404,7 @@
goto :goto_0
:cond_2
- const p2, 0x7f120371
+ const p2, 0x7f12037a
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 5c867a2d94..64fb16048f 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions.smali
@@ -128,12 +128,12 @@
if-eqz v0, :cond_0
- const v0, 0x7f120383
+ const v0, 0x7f12038c
goto :goto_0
:cond_0
- const v0, 0x7f1203aa
+ const v0, 0x7f1203b3
:goto_0
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali
index 12a5202618..ebf4e645bd 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali
@@ -147,12 +147,12 @@
if-eqz v0, :cond_0
- const v0, 0x7f120383
+ const v0, 0x7f12038c
goto :goto_0
:cond_0
- const v0, 0x7f1203aa
+ const v0, 0x7f1203b3
:goto_0
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -282,7 +282,7 @@
goto :goto_0
:cond_0
- const p1, 0x7f120da7
+ const p1, 0x7f120daf
invoke-static {p0, p1}, Le/a/b/j;->a(Landroidx/fragment/app/Fragment;I)V
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion.smali
index 77b2193266..1da77d7d82 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion.smali
@@ -149,7 +149,7 @@
:goto_1
new-instance p2, Lcom/discord/widgets/channels/WidgetChannelTopic$Model;
- const p3, 0x7f1203b2
+ const p3, 0x7f1203bb
invoke-virtual {p1, p3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali
index ae757325b2..db1137c28c 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali
@@ -106,12 +106,12 @@
if-ne v0, v1, :cond_1
- const v0, 0x7f120480
+ const v0, 0x7f120489
goto :goto_0
:cond_1
- const v0, 0x7f120481
+ const v0, 0x7f12048a
:goto_0
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -945,12 +945,12 @@
if-ne v1, v2, :cond_4
- const v1, 0x7f120f9a
+ const v1, 0x7f120fa2
goto :goto_1
:cond_4
- const v1, 0x7f120f9c
+ const v1, 0x7f120fa4
:goto_1
invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -961,12 +961,12 @@
if-ne v1, v2, :cond_5
- const v1, 0x7f120f9b
+ const v1, 0x7f120fa3
goto :goto_2
:cond_5
- const v1, 0x7f120f9d
+ const v1, 0x7f120fa5
:goto_2
invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -977,12 +977,12 @@
if-ne v1, v2, :cond_6
- const v1, 0x7f12062a
+ const v1, 0x7f120633
goto :goto_3
:cond_6
- const v1, 0x7f12062d
+ const v1, 0x7f120636
:goto_3
invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -993,12 +993,12 @@
if-ne v1, v2, :cond_7
- const v1, 0x7f120382
+ const v1, 0x7f12038b
goto :goto_4
:cond_7
- const v1, 0x7f12062b
+ const v1, 0x7f120634
: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 adddc00887..3b0911eb21 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
@@ -80,7 +80,7 @@
iget-object p1, p0, Lcom/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1;->this$0:Lcom/discord/widgets/channels/WidgetGroupInviteFriends;
- const p2, 0x7f120809
+ const p2, 0x7f120814
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 a174f15f73..3e342cca2a 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, 0x7f120809
+ const v0, 0x7f120814
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 48a24ec089..0933bdff9c 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali
@@ -594,7 +594,7 @@
if-nez p1, :cond_0
- const p1, 0x7f120800
+ const p1, 0x7f12080b
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -814,7 +814,7 @@
aput-object v2, v1, v3
- const v2, 0x7f120815
+ const v2, 0x7f120820
invoke-virtual {p0, v2, v1}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -846,7 +846,7 @@
if-lt v1, v2, :cond_0
- const p1, 0x7f120808
+ const p1, 0x7f120813
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -910,7 +910,7 @@
:cond_1
if-nez v2, :cond_2
- const p1, 0x7f120814
+ const p1, 0x7f12081f
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
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 f881b112b6..fbc86600a3 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, 0x7f120e20
+ const v0, 0x7f120e29
const/4 v1, 0x0
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 5ce1d439ec..12e4cfd769 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, 0x7f120384
+ const p1, 0x7f12038d
goto :goto_0
:cond_0
- const p1, 0x7f1203ab
+ const p1, 0x7f1203b4
: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 a334eb4677..f986e7381d 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali
@@ -847,12 +847,12 @@
if-eqz v0, :cond_2
- const v0, 0x7f1203aa
+ const v0, 0x7f1203b3
goto :goto_0
:cond_2
- const v0, 0x7f120383
+ const v0, 0x7f12038c
:goto_0
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -917,18 +917,18 @@
move-result v3
- const v5, 0x7f12062b
+ const v5, 0x7f120634
- const v6, 0x7f120382
+ const v6, 0x7f12038b
if-eqz v3, :cond_4
- const v3, 0x7f12062b
+ const v3, 0x7f120634
goto :goto_2
:cond_4
- const v3, 0x7f120382
+ const v3, 0x7f12038b
:goto_2
invoke-virtual {v0, v3}, Landroid/widget/TextView;->setText(I)V
@@ -980,7 +980,7 @@
goto :goto_3
:cond_5
- const v5, 0x7f120382
+ const v5, 0x7f12038b
:goto_3
invoke-virtual {v0, v5}, Landroid/widget/EditText;->setHint(I)V
@@ -1435,12 +1435,12 @@
if-eqz v6, :cond_0
- const v6, 0x7f1204f4
+ const v6, 0x7f1204fd
goto :goto_0
:cond_0
- const v6, 0x7f1204f3
+ const v6, 0x7f1204fc
:goto_0
invoke-virtual {v3, v6}, Landroid/widget/TextView;->setText(I)V
@@ -1461,7 +1461,7 @@
invoke-static {v4, v0}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v0, 0x7f1204f5
+ const v0, 0x7f1204fe
const/4 v3, 0x1
@@ -1955,7 +1955,7 @@
move-result-object v0
- const v1, 0x7f12069a
+ const v1, 0x7f1206a3
invoke-virtual {p0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getPrivateChannelList$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getPrivateChannelList$1.smali
index 59ad745e94..6b1cc44643 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getPrivateChannelList$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getPrivateChannelList$1.smali
@@ -324,7 +324,7 @@
const-wide/16 v7, 0x0
- const v2, 0x7f12051a
+ const v2, 0x7f120523
const/4 v4, 0x0
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 5208d35a07..9d50aaba31 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads.smali
@@ -277,9 +277,9 @@
if-eqz v0, :cond_1
- const v0, 0x7f120c7c
+ const v0, 0x7f120c83
- const v6, 0x7f120c7c
+ const v6, 0x7f120c83
goto :goto_1
@@ -291,9 +291,9 @@
if-eqz v0, :cond_2
- const v0, 0x7f120c88
+ const v0, 0x7f120c8f
- const v7, 0x7f120c88
+ const v7, 0x7f120c8f
goto :goto_2
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 f7c10d5fc9..ab6942eb34 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}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v1, 0x7f120ad7
+ const v1, 0x7f120ae2
invoke-static {v0, p1, v1}, Le/a/b/j;->a(Landroid/content/Context;Ljava/lang/CharSequence;I)V
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 b045a5b0ed..0198cdbfcb 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
@@ -372,7 +372,7 @@
add-int/lit8 p1, p1, 0x1
- const v0, 0x7f120bf4
+ const v0, 0x7f120bfb
invoke-virtual {p2, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -626,7 +626,7 @@
move-result-object v3
- const v4, 0x7f121208
+ const v4, 0x7f121210
invoke-virtual {v3, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
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 3c4b47bf71..302aa8aea8 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
@@ -183,17 +183,17 @@
if-eqz v1, :cond_3
- const v1, 0x7f120d72
+ const v1, 0x7f120d7a
if-eq p1, v1, :cond_2
- const p2, 0x7f121267
+ const p2, 0x7f12126f # 1.94163E38f
const/4 v0, 0x0
if-eq p1, p2, :cond_1
- const p2, 0x7f121446
+ const p2, 0x7f12144e
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 c3ebaf137b..1c8b82e0ce 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
@@ -120,7 +120,7 @@
.method private final getLearnMoreFormattedString(Landroid/content/Context;Ljava/lang/String;)Ljava/lang/CharSequence;
.locals 11
- const v0, 0x7f1212d0
+ const v0, 0x7f1212d8
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
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 40e24b355b..4260529085 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, 0x7f1212fc
+ const v0, 0x7f121304
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -340,7 +340,7 @@
goto :goto_0
:cond_0
- const v0, 0x7f120c56
+ const v0, 0x7f120c5d
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 68455977ba..167bbe64dd 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali
@@ -866,7 +866,7 @@
if-eqz p2, :cond_0
- const p1, 0x7f120562
+ const p1, 0x7f12056b
goto :goto_0
@@ -879,7 +879,7 @@
if-nez p2, :cond_1
- const p1, 0x7f1203aa
+ const p1, 0x7f1203b3
goto :goto_0
@@ -890,12 +890,12 @@
if-eqz p1, :cond_2
- const p1, 0x7f120561
+ const p1, 0x7f12056a
goto :goto_0
:cond_2
- const p1, 0x7f121052
+ const p1, 0x7f12105a
: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/memberlist/PrivateChannelMembersListModelProvider.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMembersListModelProvider.smali
index a6e6b6f5ac..b6994d5755 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMembersListModelProvider.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMembersListModelProvider.smali
@@ -81,7 +81,7 @@
invoke-direct {v0}, Ljava/lang/StringBuilder;->()V
- const v1, 0x7f120bf4
+ const v1, 0x7f120bfb
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
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 0d21bedc8f..9c552be2f9 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, 0x7f120f00
+ const v2, 0x7f120f08
const/4 v3, 0x1
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 8c89fd6b47..e2660d5c2a 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, 0x7f12068e
+ const v2, 0x7f120697
invoke-virtual {v1, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
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 aff7fad9e6..690521725e 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInput.smali
@@ -416,7 +416,7 @@
move-result-object v0
- const v2, 0x7f121209
+ const v2, 0x7f121211
invoke-virtual {v0, v2}, Landroid/widget/TextView;->setText(I)V
@@ -424,7 +424,7 @@
move-result-object v0
- const v2, 0x7f12120a
+ const v2, 0x7f121212
invoke-virtual {p0, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -449,7 +449,7 @@
move-result-object v0
- const v1, 0x7f120bac
+ const v1, 0x7f120bb3
invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -457,7 +457,7 @@
move-result-object v0
- const v1, 0x7f120bab
+ const v1, 0x7f120bb2
invoke-virtual {p0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordCameraFragment.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordCameraFragment.smali
index 6187ceae8a..1beb5fc8ba 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordCameraFragment.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordCameraFragment.smali
@@ -58,7 +58,7 @@
check-cast v0, Lcom/discord/app/AppTextView;
- const v1, 0x7f121255
+ const v1, 0x7f12125d
const/4 v2, 0x0
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 4f9a183d90..59d5da6b7e 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
@@ -73,7 +73,7 @@
check-cast p2, Lcom/discord/app/AppTextView;
- const v0, 0x7f121256
+ const v0, 0x7f12125e
const/4 v1, 0x0
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments.smali
index 7f002a05c4..af06961556 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments.smali
@@ -135,7 +135,7 @@
if-eqz v1, :cond_0
- const v2, 0x7f120246
+ const v2, 0x7f120248
invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -234,7 +234,7 @@
const v6, 0x7f0802ee
- const v7, 0x7f120248
+ const v7, 0x7f12024a
invoke-direct {v5, v6, v7}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$1;->(II)V
@@ -246,7 +246,7 @@
const v7, 0x7f080293
- const v8, 0x7f120247
+ const v8, 0x7f120249
invoke-direct {v6, v7, v8}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$2;->(II)V
@@ -258,7 +258,7 @@
const v7, 0x7f0801d7
- const v8, 0x7f120244
+ const v8, 0x7f120246
invoke-direct {v6, v7, v8}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$3;->(II)V
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali
index d53574b212..6e10ac6436 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali
@@ -628,7 +628,7 @@
if-eqz p2, :cond_0
- const p1, 0x7f12054a
+ const p1, 0x7f120553
invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -639,7 +639,7 @@
:cond_0
if-nez p3, :cond_1
- const p1, 0x7f120cbb
+ const p1, 0x7f120cc2
invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -652,7 +652,7 @@
move-result-object p1
- const p2, 0x7f12126a
+ const p2, 0x7f121272
invoke-virtual {p0, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -801,7 +801,7 @@
return-object p1
:cond_0
- const v0, 0x7f121429
+ const v0, 0x7f121431
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -810,7 +810,7 @@
return-object p1
:cond_1
- const v0, 0x7f121420
+ const v0, 0x7f121428
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -847,7 +847,7 @@
return-object p1
:cond_0
- const v0, 0x7f1209ae
+ const v0, 0x7f1209b9
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -856,7 +856,7 @@
return-object p1
:cond_1
- const v0, 0x7f1209ac
+ const v0, 0x7f1209b7
new-array v1, v1, [Ljava/lang/Object;
@@ -871,7 +871,7 @@
return-object p1
:cond_2
- const v0, 0x7f1209ab
+ const v0, 0x7f1209b6
new-array v1, v1, [Ljava/lang/Object;
@@ -886,7 +886,7 @@
return-object p1
:cond_3
- const v0, 0x7f1209ad
+ const v0, 0x7f1209b8
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5.smali
index 23665be61b..ff9187b8da 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5.smali
@@ -69,7 +69,7 @@
iget-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5;->$sendMessageError$2:Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2;
- const p2, 0x7f1203b1
+ const p2, 0x7f1203ba
invoke-virtual {p1, p2}, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2;->invoke(I)Z
@@ -100,7 +100,7 @@
iget-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5;->$sendMessageError$2:Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2;
- const p2, 0x7f12056b
+ const p2, 0x7f120574
invoke-virtual {p1, p2}, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2;->invoke(I)Z
@@ -128,7 +128,7 @@
:cond_2
iget-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5;->$sendMessageError$2:Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2;
- const p2, 0x7f120cbb
+ const p2, 0x7f120cc2
invoke-virtual {p1, p2}, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2;->invoke(I)Z
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderItem.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderItem.smali
index fd5b7899cb..5be17c8241 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderItem.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderItem.smali
@@ -91,57 +91,57 @@
packed-switch p1, :pswitch_data_0
- const p1, 0x7f1211a2
+ const p1, 0x7f1211aa
return p1
:pswitch_0
- const p1, 0x7f12057f
+ const p1, 0x7f120588
return p1
:pswitch_1
- const p1, 0x7f120579
+ const p1, 0x7f120582
return p1
:pswitch_2
- const p1, 0x7f12057a
+ const p1, 0x7f120583
return p1
:pswitch_3
- const p1, 0x7f120580
+ const p1, 0x7f120589
return p1
:pswitch_4
- const p1, 0x7f12057d
+ const p1, 0x7f120586
return p1
:pswitch_5
- const p1, 0x7f120581
+ const p1, 0x7f12058a
return p1
:pswitch_6
- const p1, 0x7f120578
+ const p1, 0x7f120581
return p1
:pswitch_7
- const p1, 0x7f12057b
+ const p1, 0x7f120584
return p1
:pswitch_8
- const p1, 0x7f12057c
+ const p1, 0x7f120585
return p1
:pswitch_9
- const p1, 0x7f12057e
+ const p1, 0x7f120587
return p1
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker.smali
index 38c752d695..956e6fa350 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker.smali
@@ -1117,12 +1117,12 @@
:goto_0
if-eqz v1, :cond_2
- const p1, 0x7f120f7b
+ const p1, 0x7f120f83
goto :goto_1
:cond_2
- const p1, 0x7f120f82
+ const p1, 0x7f120f8a
:goto_1
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -1133,12 +1133,12 @@
if-eqz v1, :cond_3
- const p1, 0x7f120f7c
+ const p1, 0x7f120f84
goto :goto_2
:cond_3
- const p1, 0x7f120f83
+ const p1, 0x7f120f8b
:goto_2
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -1172,7 +1172,7 @@
move-result-object p1
- const v0, 0x7f120582
+ const v0, 0x7f12058b
invoke-static {p1, v0}, Le/a/b/j;->a(Landroid/content/Context;I)V
diff --git a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion.smali b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion.smali
index 7dd5aeff14..e032d4559b 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion.smali
@@ -123,16 +123,34 @@
move-object/from16 v2, p6
- invoke-direct {p0, v1, v2}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;->isGameInstalled(Lcom/discord/models/domain/ModelApplication;Ljava/util/List;)Z
+ invoke-direct {p0, v1, v2}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;->isGameInstalled(Lcom/discord/models/domain/ModelApplication;Ljava/util/List;)Ljava/lang/Boolean;
- move-result v11
+ move-result-object v1
+ if-eqz v1, :cond_1
+
+ invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
+
+ move-result v1
+
+ move v11, v1
+
+ goto :goto_1
+
+ :cond_1
+ const/4 v1, 0x1
+
+ const/4 v11, 0x1
+
+ :goto_1
new-instance v12, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
move-object v1, v12
move-object v2, p2
+ move-object/from16 v9, p4
+
invoke-direct/range {v1 .. v11}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->(Lcom/discord/models/domain/ModelUser;JJLcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/models/domain/activity/ModelActivity;Ljava/util/List;Z)V
return-object v12
@@ -165,7 +183,7 @@
move-object/from16 v7, p7
- if-eqz v7, :cond_0
+ if-eqz v7, :cond_1
new-instance v12, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;
@@ -183,10 +201,26 @@
move-object/from16 v1, p8
- invoke-direct {p0, v7, v1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;->isGameInstalled(Lcom/discord/models/domain/ModelApplication;Ljava/util/List;)Z
+ invoke-direct {p0, v7, v1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model$Companion;->isGameInstalled(Lcom/discord/models/domain/ModelApplication;Ljava/util/List;)Ljava/lang/Boolean;
- move-result v11
+ move-result-object v1
+ if-eqz v1, :cond_0
+
+ invoke-virtual {v1}, Ljava/lang/Boolean;->booleanValue()Z
+
+ move-result v1
+
+ move v11, v1
+
+ goto :goto_0
+
+ :cond_0
+ const/4 v1, 0x1
+
+ const/4 v11, 0x1
+
+ :goto_0
move-object v1, v12
move-object v2, p1
@@ -197,11 +231,13 @@
move-object/from16 v8, p4
+ move-object/from16 v9, p5
+
invoke-direct/range {v1 .. v11}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->(Lcom/discord/models/domain/ModelUser;JJLcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/ModelMessage$Activity;Lcom/discord/models/domain/activity/ModelActivity;Ljava/util/List;Z)V
return-object v12
- :cond_0
+ :cond_1
const/4 v1, 0x0
return-object v1
@@ -350,7 +386,7 @@
return-object v0
.end method
-.method private final isGameInstalled(Lcom/discord/models/domain/ModelApplication;Ljava/util/List;)Z
+.method private final isGameInstalled(Lcom/discord/models/domain/ModelApplication;Ljava/util/List;)Ljava/lang/Boolean;
.locals 3
.annotation system Ldalvik/annotation/Signature;
value = {
@@ -359,7 +395,8 @@
"Ljava/util/List<",
"+",
"Landroid/content/pm/PackageInfo;",
- ">;)Z"
+ ">;)",
+ "Ljava/lang/Boolean;"
}
.end annotation
@@ -367,6 +404,17 @@
move-result-object p1
+ invoke-interface {p1}, Ljava/util/List;->isEmpty()Z
+
+ move-result v0
+
+ if-eqz v0, :cond_0
+
+ const/4 p1, 0x0
+
+ goto :goto_1
+
+ :cond_0
invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z
move-result v0
@@ -377,31 +425,31 @@
const/4 v2, 0x0
- if-eqz v0, :cond_2
+ if-eqz v0, :cond_4
instance-of v0, p2, Ljava/util/Collection;
- if-eqz v0, :cond_0
+ if-eqz v0, :cond_1
invoke-interface {p2}, Ljava/util/Collection;->isEmpty()Z
move-result v0
- if-eqz v0, :cond_0
+ if-eqz v0, :cond_1
goto :goto_0
- :cond_0
+ :cond_1
invoke-interface {p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
move-result-object p2
- :cond_1
+ :cond_2
invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z
move-result v0
- if-eqz v0, :cond_2
+ if-eqz v0, :cond_3
invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
@@ -415,13 +463,25 @@
move-result v0
- if-eqz v0, :cond_1
+ if-eqz v0, :cond_2
const/4 v2, 0x1
- :cond_2
+ :cond_3
:goto_0
- return v2
+ invoke-static {v2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+ move-result-object p1
+
+ goto :goto_1
+
+ :cond_4
+ invoke-static {v2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+ move-result-object p1
+
+ :goto_1
+ return-object p1
.end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model.smali b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model.smali
index 68a6c73d6e..5b0a711664 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite$Model.smali
@@ -45,7 +45,7 @@
.end annotation
.end field
-.field public final isGameInstalled:Z
+.field public final isGameAppJoinable:Z
.field public final isInParty:Z
@@ -123,7 +123,7 @@
iput-object p9, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->users:Ljava/util/List;
- iput-boolean p10, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isGameInstalled:Z
+ iput-boolean p10, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isGameAppJoinable:Z
iget-object p1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->users:Ljava/util/List;
@@ -392,7 +392,7 @@
if-eqz v1, :cond_7
- iget-boolean v1, v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isGameInstalled:Z
+ iget-boolean v1, v0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isGameAppJoinable:Z
goto :goto_7
@@ -508,7 +508,7 @@
.method public final component8()Z
.locals 1
- iget-boolean v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isGameInstalled:Z
+ iget-boolean v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isGameAppJoinable:Z
return v0
.end method
@@ -670,9 +670,9 @@
if-eqz v0, :cond_0
- iget-boolean v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isGameInstalled:Z
+ iget-boolean v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isGameAppJoinable:Z
- iget-boolean p1, p1, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isGameInstalled:Z
+ iget-boolean p1, p1, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isGameAppJoinable:Z
if-ne v0, p1, :cond_0
@@ -886,7 +886,7 @@
mul-int/lit8 v0, v0, 0x1f
- iget-boolean v1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isGameInstalled:Z
+ iget-boolean v1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isGameAppJoinable:Z
if-eqz v1, :cond_5
@@ -950,10 +950,10 @@
return p1
.end method
-.method public final isGameInstalled()Z
+.method public final isGameAppJoinable()Z
.locals 1
- iget-boolean v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isGameInstalled:Z
+ iget-boolean v0, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isGameAppJoinable:Z
return v0
.end method
@@ -1035,11 +1035,11 @@
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
- const-string v1, ", isGameInstalled="
+ const-string v1, ", isGameAppJoinable="
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
- iget-boolean v1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isGameInstalled:Z
+ iget-boolean v1, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isGameAppJoinable:Z
const-string v2, ")"
diff --git a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite.smali b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite.smali
index 73bf711b8b..570dbfb951 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite.smali
@@ -1086,7 +1086,7 @@
if-eqz p2, :cond_0
- const v2, 0x7f120ab3
+ const v2, 0x7f120abe
goto :goto_0
@@ -1101,12 +1101,12 @@
if-eq v2, v1, :cond_1
- const v2, 0x7f120ab7
+ const v2, 0x7f120ac2
goto :goto_0
:cond_1
- const v2, 0x7f120ab9
+ const v2, 0x7f120ac4
:goto_0
invoke-virtual {v0, v2}, Landroid/widget/TextView;->setText(I)V
@@ -1250,7 +1250,7 @@
invoke-virtual {v3, v1}, Landroid/view/View;->setVisibility(I)V
- const v3, 0x7f120b10
+ const v3, 0x7f120b1b
if-nez p2, :cond_7
@@ -1265,7 +1265,7 @@
goto/16 :goto_2
:cond_1
- invoke-virtual {p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isGameInstalled()Z
+ invoke-virtual {p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->isGameAppJoinable()Z
move-result p2
@@ -1306,7 +1306,7 @@
if-eqz p3, :cond_3
- const v3, 0x7f120ab1
+ const v3, 0x7f120abc
goto :goto_1
@@ -1317,7 +1317,7 @@
if-eqz p3, :cond_4
- const v3, 0x7f120abc
+ const v3, 0x7f120ac7
:cond_4
:goto_1
@@ -1352,7 +1352,7 @@
iget-object p2, p0, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite;->actionBtn:Lcom/google/android/material/button/MaterialButton;
- const p3, 0x7f121342
+ const p3, 0x7f12134a
invoke-virtual {p2, p3}, Landroid/widget/Button;->setText(I)V
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali
index 400282642c..3a933fa7e0 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali
@@ -47,7 +47,7 @@
if-eqz p0, :cond_0
- const v0, 0x7f120554
+ const v0, 0x7f12055d
const/4 v1, 0x1
@@ -102,7 +102,7 @@
check-cast p0, Landroid/content/Context;
- const v0, 0x7f120553
+ const v0, 0x7f12055c
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -288,7 +288,7 @@
move-result-object p1
- const p2, 0x7f121386
+ const p2, 0x7f12138e
const/4 v0, 0x0
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked.smali
index d5f819d65f..53c26dc755 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked.smali
@@ -148,7 +148,7 @@
aput-object p2, v2, v3
- const p2, 0x7f120321
+ const p2, 0x7f12032a
invoke-virtual {p1, p2, v2}, Landroid/content/res/Resources;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali
index 40e0338d9a..bbb70fa831 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali
@@ -351,7 +351,7 @@
goto :goto_0
:cond_0
- const p2, 0x7f121245
+ const p2, 0x7f12124d
new-array p3, v2, [Ljava/lang/Object;
@@ -365,7 +365,7 @@
:cond_1
:goto_0
- const p2, 0x7f121249
+ const p2, 0x7f121251
new-array p3, v0, [Ljava/lang/Object;
@@ -400,7 +400,7 @@
if-ne p2, p3, :cond_4
- const p2, 0x7f121213
+ const p2, 0x7f12121b
new-array p3, v0, [Ljava/lang/Object;
@@ -415,7 +415,7 @@
goto :goto_3
:cond_4
- const p2, 0x7f121211
+ const p2, 0x7f121219
new-array p3, v0, [Ljava/lang/Object;
@@ -431,7 +431,7 @@
:cond_5
:goto_2
- const p2, 0x7f121212
+ const p2, 0x7f12121a
new-array p3, v2, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali
index b50c1ff87d..d1b87e0a85 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali
@@ -577,7 +577,7 @@
if-eqz p1, :cond_2
- const p1, 0x7f1207c5
+ const p1, 0x7f1207d0
invoke-virtual {v0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -586,7 +586,7 @@
goto :goto_2
:cond_2
- const p1, 0x7f1207c4
+ const p1, 0x7f1207cf
invoke-virtual {v0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -599,7 +599,7 @@
move-result-object p1
- const v2, 0x7f1207c1
+ const v2, 0x7f1207cc
invoke-virtual {p1, v2}, Landroid/widget/TextView;->setText(I)V
@@ -697,7 +697,7 @@
move-result-object v1
- const v2, 0x7f1207c6
+ const v2, 0x7f1207d1
invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(I)V
@@ -1104,7 +1104,7 @@
if-eqz v4, :cond_8
- const v4, 0x7f1207c9
+ const v4, 0x7f1207d4
invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1113,7 +1113,7 @@
goto :goto_7
:cond_8
- const v4, 0x7f1207c8
+ const v4, 0x7f1207d3
invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1250,7 +1250,7 @@
aput-object v4, v13, v6
- const v4, 0x7f1207bc
+ const v4, 0x7f1207c7
invoke-virtual {v2, v4, v13}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -1387,7 +1387,7 @@
if-nez v3, :cond_f
- const v3, 0x7f120773
+ const v3, 0x7f12077e
invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1416,7 +1416,7 @@
:cond_f
if-eqz v7, :cond_10
- const v3, 0x7f1207a4
+ const v3, 0x7f1207af
invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1427,7 +1427,7 @@
:cond_10
if-eqz v9, :cond_11
- const v3, 0x7f120781
+ const v3, 0x7f12078c
invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1442,7 +1442,7 @@
if-eqz v3, :cond_12
- const v3, 0x7f120772
+ const v3, 0x7f12077d
const/4 v8, 0x1
@@ -1477,7 +1477,7 @@
:cond_12
if-eqz v8, :cond_13
- const v3, 0x7f120771
+ const v3, 0x7f12077c
invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1539,11 +1539,11 @@
move-result-object v3
- const v4, 0x7f1207b8
+ const v4, 0x7f1207c3
if-eqz v9, :cond_16
- const v4, 0x7f1207b7
+ const v4, 0x7f1207c2
goto :goto_e
@@ -1554,7 +1554,7 @@
if-eqz v5, :cond_17
- const v4, 0x7f1207b9
+ const v4, 0x7f1207c4
goto :goto_e
@@ -1570,7 +1570,7 @@
if-eqz v5, :cond_19
- const v4, 0x7f1207ba
+ const v4, 0x7f1207c5
:cond_19
:goto_e
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali
index cccdb58051..5b589d6bfb 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali
@@ -298,7 +298,7 @@
move-result-object v3
- const v6, 0x7f121471
+ const v6, 0x7f121479
new-array v7, v4, [Ljava/lang/Object;
@@ -315,7 +315,7 @@
move-result-object v3
- const v6, 0x7f121476
+ const v6, 0x7f12147e
new-array v7, v4, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali
index 1475a8bfcf..dc980ca029 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali
@@ -578,7 +578,7 @@
if-eqz v2, :cond_2
- const v4, 0x7f120aa8
+ const v4, 0x7f120ab3
invoke-virtual {v0, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -587,7 +587,7 @@
goto :goto_2
:cond_2
- const v4, 0x7f120aa2
+ const v4, 0x7f120aad
invoke-virtual {v0, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -600,7 +600,7 @@
move-result-object v3
- const v4, 0x7f120a96
+ const v4, 0x7f120aa1
invoke-virtual {v3, v4}, Landroid/widget/TextView;->setText(I)V
@@ -656,7 +656,7 @@
:goto_3
if-eqz v3, :cond_4
- const v3, 0x7f120a6a
+ const v3, 0x7f120a75
const/4 v6, 0x1
@@ -695,7 +695,7 @@
:goto_4
if-nez v3, :cond_6
- const v3, 0x7f120a69
+ const v3, 0x7f120a74
invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -706,7 +706,7 @@
:cond_6
if-eqz v2, :cond_7
- const v3, 0x7f120a97
+ const v3, 0x7f120aa2
invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -754,7 +754,7 @@
if-eqz v2, :cond_8
- const v3, 0x7f120485
+ const v3, 0x7f12048e
invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -763,7 +763,7 @@
goto :goto_6
:cond_8
- const v3, 0x7f120bf8
+ const v3, 0x7f120bff
invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -826,7 +826,7 @@
move-result-object v1
- const v2, 0x7f120a7d
+ const v2, 0x7f120a88
invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(I)V
@@ -1034,7 +1034,7 @@
if-eqz v2, :cond_4
- const v2, 0x7f120aa7
+ const v2, 0x7f120ab2
invoke-virtual {v7, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1045,7 +1045,7 @@
:cond_4
if-eqz v2, :cond_5
- const v2, 0x7f120aa6
+ const v2, 0x7f120ab1
invoke-virtual {v7, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1058,7 +1058,7 @@
if-nez v2, :cond_6
- const v2, 0x7f120aa1
+ const v2, 0x7f120aac
invoke-virtual {v7, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1075,7 +1075,7 @@
if-eqz v2, :cond_8
- const v2, 0x7f120a81
+ const v2, 0x7f120a8c
new-array v3, v8, [Ljava/lang/Object;
@@ -1104,7 +1104,7 @@
goto :goto_5
:cond_8
- const v2, 0x7f120aa0
+ const v2, 0x7f120aab
invoke-virtual {v7, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1345,7 +1345,7 @@
move-result-object v2
- const v12, 0x7f120a74
+ const v12, 0x7f120a7f
new-array v13, v8, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali
index 0e66e08dfa..02027b0d6e 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali
@@ -393,7 +393,7 @@
aput-object v5, v4, v6
- const v5, 0x7f120ab8
+ const v5, 0x7f120ac3
invoke-virtual {v2, v5, v4}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -519,7 +519,7 @@
move-result-object v5
- const v7, 0x7f121364
+ const v7, 0x7f12136c
new-array v3, v3, [Ljava/lang/Object;
@@ -667,7 +667,7 @@
goto :goto_0
:cond_0
- const p2, 0x7f120636
+ const p2, 0x7f12063f
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage.smali
index f0ab8fbc65..05958837a0 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage.smali
@@ -357,12 +357,12 @@
if-eqz p1, :cond_2
- const p1, 0x7f12120c
+ const p1, 0x7f121214
goto :goto_2
:cond_2
- const p1, 0x7f12032d
+ const p1, 0x7f120336
:goto_2
invoke-virtual {v0, p1}, Landroid/widget/TextView;->setText(I)V
@@ -761,7 +761,7 @@
move-result-object v3
- const v4, 0x7f12117e
+ const v4, 0x7f121186
invoke-virtual {v3, v4}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages.smali
index 529503a61c..6747fecd2d 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages.smali
@@ -187,7 +187,7 @@
move-result-object v0
- const v1, 0x7f120c7e
+ const v1, 0x7f120c85
invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemPrivateChannelStart.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemPrivateChannelStart.smali
index 0cbd85b402..d9e19d9775 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemPrivateChannelStart.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemPrivateChannelStart.smali
@@ -202,7 +202,7 @@
const/4 v0, 0x1
- const v1, 0x7f120286
+ const v1, 0x7f120288
if-eq p1, v0, :cond_1
@@ -213,7 +213,7 @@
goto :goto_0
:cond_0
- const v1, 0x7f120287
+ const v1, 0x7f120289
:cond_1
:goto_0
@@ -270,7 +270,7 @@
move-result-object v1
- const v3, 0x7f121302
+ const v3, 0x7f12130a
invoke-virtual {v1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -333,7 +333,7 @@
move-result-object v0
- const v1, 0x7f12120b
+ const v1, 0x7f121213
invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemStart.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemStart.smali
index 352c43727d..ba5ac74220 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemStart.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemStart.smali
@@ -90,22 +90,22 @@
if-eqz p2, :cond_0
- const p1, 0x7f120282
+ const p1, 0x7f120284
goto :goto_0
:cond_0
- const p1, 0x7f120283
+ const p1, 0x7f120285
goto :goto_0
:cond_1
- const p1, 0x7f120287
+ const p1, 0x7f120289
goto :goto_0
:cond_2
- const p1, 0x7f120286
+ const p1, 0x7f120288
:goto_0
return p1
@@ -193,7 +193,7 @@
move-result-object p1
- const v0, 0x7f121302
+ const v0, 0x7f12130a
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1.smali
index 20c5816f8b..48c7cffa22 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1.smali
@@ -91,7 +91,7 @@
const/4 v1, 0x3
- const v2, 0x7f121241
+ const v2, 0x7f121249
const/4 v3, 0x2
@@ -107,7 +107,7 @@
goto/16 :goto_1
:pswitch_1
- const v0, 0x7f121214
+ const v0, 0x7f12121c
new-array v1, v3, [Ljava/lang/Object;
@@ -140,7 +140,7 @@
aput-object v1, v0, v4
- const v1, 0x7f120f09
+ const v1, 0x7f120f11
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -165,7 +165,7 @@
aput-object v1, v0, v4
- const v1, 0x7f120f08
+ const v1, 0x7f120f10
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -190,7 +190,7 @@
aput-object v1, v0, v4
- const v1, 0x7f120f07
+ const v1, 0x7f120f0f
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -205,7 +205,7 @@
goto/16 :goto_1
:pswitch_5
- const v0, 0x7f121240
+ const v0, 0x7f121248
new-array v1, v4, [Ljava/lang/Object;
@@ -245,7 +245,7 @@
goto/16 :goto_1
:pswitch_7
- const v0, 0x7f12124d
+ const v0, 0x7f121255
new-array v1, v4, [Ljava/lang/Object;
@@ -260,7 +260,7 @@
goto/16 :goto_1
:pswitch_8
- const v0, 0x7f121216
+ const v0, 0x7f12121e
new-array v1, v4, [Ljava/lang/Object;
@@ -275,7 +275,7 @@
goto :goto_1
:pswitch_9
- const v0, 0x7f121217
+ const v0, 0x7f12121f
new-array v1, v3, [Ljava/lang/Object;
@@ -327,7 +327,7 @@
if-nez v0, :cond_1
- const v0, 0x7f121253
+ const v0, 0x7f12125b
new-array v1, v4, [Ljava/lang/Object;
@@ -343,7 +343,7 @@
:cond_1
:goto_0
- const v0, 0x7f121252
+ const v0, 0x7f12125a
new-array v1, v3, [Ljava/lang/Object;
@@ -362,7 +362,7 @@
goto :goto_1
:pswitch_b
- const v0, 0x7f121251
+ const v0, 0x7f121259
new-array v1, v3, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress.smali
index fbc2965d07..fa10ff569e 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress.smali
@@ -619,7 +619,7 @@
if-eqz v0, :cond_0
- const p2, 0x7f12132e
+ const p2, 0x7f121336
invoke-static {p1, p2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1$1.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1$1.smali
index 6cbc93db83..8697068afc 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1$1.smali
@@ -71,12 +71,12 @@
if-eqz p1, :cond_0
- const p1, 0x7f120c0f
+ const p1, 0x7f120c16
goto :goto_0
:cond_0
- const p1, 0x7f120c06
+ const p1, 0x7f120c0d
:goto_0
iget-object v0, p0, Lcom/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1$1;->this$0:Lcom/discord/widgets/chat/list/actions/MessageActionDialogs$showPinMessageConfirmation$1;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs.smali
index 88e3518feb..cf7dfdeef7 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/MessageActionDialogs.smali
@@ -62,13 +62,13 @@
sget-object v4, Lcom/discord/widgets/notice/WidgetNoticeDialog;->Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
- const v3, 0x7f1204f7
+ const v3, 0x7f120500
invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
move-result-object v6
- const v3, 0x7f1204f8
+ const v3, 0x7f120501
invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -78,13 +78,13 @@
invoke-static {v7, v3}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v3, 0x7f1204ec
+ const v3, 0x7f1204f5
invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
move-result-object v8
- const v3, 0x7f120370
+ const v3, 0x7f120379
invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -202,12 +202,12 @@
if-eqz v2, :cond_0
- const v0, 0x7f12130a
+ const v0, 0x7f121312
goto :goto_0
:cond_0
- const v0, 0x7f120e16
+ const v0, 0x7f120e1f
:goto_0
invoke-virtual {v4, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -216,12 +216,12 @@
if-eqz v2, :cond_1
- const v0, 0x7f121306
+ const v0, 0x7f12130e
goto :goto_1
:cond_1
- const v0, 0x7f120e14
+ const v0, 0x7f120e1d
:goto_1
invoke-virtual {v4, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -234,19 +234,19 @@
if-eqz v2, :cond_2
- const v0, 0x7f121303
+ const v0, 0x7f12130b
goto :goto_2
:cond_2
- const v0, 0x7f120e10
+ const v0, 0x7f120e19
:goto_2
invoke-virtual {v4, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
move-result-object v9
- const v0, 0x7f120370
+ const v0, 0x7f120379
invoke-virtual {v4, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$9.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$9.smali
index 57fac30e33..1dbcde81b2 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$9.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$9.smali
@@ -89,7 +89,7 @@
iget-object v1, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$9;->this$0:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;
- const v2, 0x7f121155
+ const v2, 0x7f12115d
invoke-virtual {v1, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions.smali
index ea4f838cbc..d862cb45d2 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions.smali
@@ -1160,12 +1160,12 @@
if-eqz v6, :cond_6
- const v6, 0x7f121303
+ const v6, 0x7f12130b
goto :goto_4
:cond_6
- const v6, 0x7f120e10
+ const v6, 0x7f120e19
:goto_4
invoke-virtual {v0, v6}, Landroid/widget/TextView;->setText(I)V
@@ -1870,13 +1870,13 @@
invoke-static {v2, v3}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v3, 0x7f12100c
+ const v3, 0x7f121014
invoke-virtual {v0, v3}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
move-result-object v3
- const v4, 0x7f12100b
+ const v4, 0x7f121013
invoke-virtual {v0, v4}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -1886,13 +1886,13 @@
invoke-static {v4, v5}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v5, 0x7f1214a5
+ const v5, 0x7f1214ad
invoke-virtual {v0, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
move-result-object v5
- const v6, 0x7f120cbd
+ const v6, 0x7f120cc4
invoke-virtual {v0, v6}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions.smali
index 30582ef586..cf6b710d85 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions.smali
@@ -288,7 +288,7 @@
invoke-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const p1, 0x7f120fef
+ const p1, 0x7f120ff7
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$TypingIndicatorViewHolder.smali b/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$TypingIndicatorViewHolder.smali
index 930b437932..ef158c4b01 100644
--- a/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$TypingIndicatorViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/chat/overlay/WidgetChatOverlay$TypingIndicatorViewHolder.smali
@@ -241,7 +241,7 @@
move-result-object p1
- const p2, 0x7f1203b1
+ const p2, 0x7f1203ba
invoke-virtual {p1, p2}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -295,7 +295,7 @@
if-eq v0, v5, :cond_0
- const p2, 0x7f121150
+ const p2, 0x7f121158
invoke-virtual {p1, p2}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -308,7 +308,7 @@
goto/16 :goto_0
:cond_0
- const v0, 0x7f121277
+ const v0, 0x7f12127f
invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -353,7 +353,7 @@
goto :goto_0
:cond_1
- const v0, 0x7f1212e4
+ const v0, 0x7f1212ec
invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -392,7 +392,7 @@
goto :goto_0
:cond_2
- const v0, 0x7f120d62
+ const v0, 0x7f120d6a
invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model.smali b/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model.smali
index a2b7918de9..b52d95145c 100644
--- a/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model.smali
+++ b/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model.smali
@@ -324,12 +324,12 @@
if-eqz v1, :cond_3
- const v1, 0x7f120cb5
+ const v1, 0x7f120cbc
goto :goto_1
:cond_3
- const v1, 0x7f120cb4
+ const v1, 0x7f120cbb
:goto_1
invoke-virtual {p0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.smali b/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.smali
index 495452fc86..93173a9075 100644
--- a/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.smali
+++ b/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.smali
@@ -184,7 +184,7 @@
invoke-virtual {p0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar;
- const p1, 0x7f120e1a
+ const p1, 0x7f120e23
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging.smali
index a646217b86..b9640cd6f8 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging.smali
@@ -244,7 +244,7 @@
invoke-static {p0, p1, v0, v1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const p1, 0x7f1204e6
+ const p1, 0x7f1204ef
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
index 93d58effd2..bba913759e 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
@@ -397,7 +397,7 @@
move-result-object p1
- const v1, 0x7f12047c
+ const v1, 0x7f120485
const/4 v2, 0x1
@@ -427,13 +427,13 @@
move-result-object v1
- const v3, 0x7f12047b
+ const v3, 0x7f120484
new-array v5, v2, [Ljava/lang/Object;
if-eqz p1, :cond_0
- const v6, 0x7f1211a2
+ const v6, 0x7f1211aa
invoke-virtual {p0, v6}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -463,7 +463,7 @@
move-result-object v1
- const v3, 0x7f12047d
+ const v3, 0x7f120486
new-array v5, v2, [Ljava/lang/Object;
@@ -488,11 +488,11 @@
move-result-object p1
- const v0, 0x7f120476
+ const v0, 0x7f12047f
new-array v1, v2, [Ljava/lang/Object;
- const-string v3, "10.2.5"
+ const-string v3, "10.2.6"
aput-object v3, v1, v4
@@ -506,7 +506,7 @@
move-result-object p1
- const v0, 0x7f120479
+ const v0, 0x7f120482
new-array v1, v2, [Ljava/lang/Object;
@@ -528,7 +528,7 @@
move-result-object p1
- const v0, 0x7f120478
+ const v0, 0x7f120481
new-array v1, v2, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$handleEvent$1.smali b/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$handleEvent$1.smali
index 59ec7e44ed..beba4d4103 100644
--- a/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$handleEvent$1.smali
+++ b/com.discord/smali/com/discord/widgets/feedback/WidgetFeedbackSheet$handleEvent$1.smali
@@ -77,7 +77,7 @@
iget-object p1, p0, Lcom/discord/widgets/feedback/WidgetFeedbackSheet$handleEvent$1;->this$0:Lcom/discord/widgets/feedback/WidgetFeedbackSheet;
- const v0, 0x7f120354
+ const v0, 0x7f12035d
const/4 v1, 0x0
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$sendFriendRequest$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$sendFriendRequest$1.smali
index 65f061c28c..7f084644d9 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$sendFriendRequest$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$sendFriendRequest$1.smali
@@ -81,7 +81,7 @@
aput-object v2, v1, v3
- const v2, 0x7f120091
+ const v2, 0x7f120093
invoke-virtual {v0, v2, v1}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$sendFriendRequest$2.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$sendFriendRequest$2.smali
index 97f8fa9ef4..22133d4127 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$sendFriendRequest$2.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd$sendFriendRequest$2.smali
@@ -83,7 +83,7 @@
iget-object v0, p0, Lcom/discord/widgets/friends/WidgetFriendsAdd$sendFriendRequest$2;->this$0:Lcom/discord/widgets/friends/WidgetFriendsAdd;
- const v1, 0x7f120096
+ const v1, 0x7f120098
invoke-virtual {v0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali
index 57f8ce1951..a43e0ebb1d 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali
@@ -262,7 +262,7 @@
move-result-object v1
- const v2, 0x7f120098
+ const v2, 0x7f12009a
const/4 v3, 0x1
@@ -439,7 +439,7 @@
invoke-static {p0, v1, v0, p1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const p1, 0x7f1206e1
+ const p1, 0x7f1206ec
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder.smali
index 40492e9ede..c4bedbed0a 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder.smali
@@ -430,7 +430,7 @@
move-result-object p1
- const p2, 0x7f120099
+ const p2, 0x7f12009b
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -449,7 +449,7 @@
move-result-object p1
- const p2, 0x7f120ad2
+ const p2, 0x7f120add
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -468,7 +468,7 @@
move-result-object p1
- const p2, 0x7f120bed
+ const p2, 0x7f120bf4
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$2$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$2$1.smali
index 8383c28d79..4ba782bedb 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby$onViewBound$2$1.smali
@@ -85,7 +85,7 @@
if-eqz v0, :cond_0
- const v2, 0x7f120091
+ const v2, 0x7f120093
const/4 v3, 0x1
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby.smali
index 6290ff9e0d..a8613a42e8 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsFindNearby.smali
@@ -470,7 +470,7 @@
move-result-object p1
- const v0, 0x7f1200a2
+ const v0, 0x7f1200a4
invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -556,7 +556,7 @@
move-result-object p1
- const v0, 0x7f1200a4
+ const v0, 0x7f1200a6
invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -707,7 +707,7 @@
if-eqz p1, :cond_4
- const v0, 0x7f12009c
+ const v0, 0x7f12009e
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -736,7 +736,7 @@
if-eqz p1, :cond_4
- const v0, 0x7f1200a5
+ const v0, 0x7f1200a7
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -752,7 +752,7 @@
if-eqz p1, :cond_4
- const v0, 0x7f1200a1
+ const v0, 0x7f1200a3
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$5$1.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$5$1.smali
index 7aefab4c94..b19b571e7f 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$5$1.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$configure$5$1.smali
@@ -81,7 +81,7 @@
aput-object v1, v0, v2
- const v1, 0x7f120091
+ const v1, 0x7f120093
invoke-virtual {p1, v1, v0}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali
index c57b19a074..e2dead40b2 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali
@@ -92,7 +92,7 @@
invoke-direct {v1, p0, p1, v0, p2}, Lcom/discord/widgets/friends/WidgetFriendsList$addTab$1;->(Lcom/discord/widgets/friends/WidgetFriendsList;Lcom/google/android/material/tabs/TabLayout;Lcom/google/android/material/tabs/TabLayout$Tab;I)V
- const v2, 0x7f1206e4
+ const v2, 0x7f1206ef
if-eq p2, v2, :cond_0
@@ -143,19 +143,19 @@
invoke-static {p1, v0, v2, v3, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
- const v0, 0x7f1206e2
+ const v0, 0x7f1206ed
invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V
- const v0, 0x7f1206e3
+ const v0, 0x7f1206ee
invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V
- const v0, 0x7f1206e4
+ const v0, 0x7f1206ef
invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V
- const v0, 0x7f120320
+ const v0, 0x7f120329
invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser.smali
index 386291ecce..99cef5e61e 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser.smali
@@ -717,7 +717,7 @@
move-result-object v1
- const v3, 0x7f120d76
+ const v3, 0x7f120d7e
invoke-virtual {v1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -740,7 +740,7 @@
move-result-object v1
- const v3, 0x7f120a57
+ const v3, 0x7f120a62
invoke-virtual {v1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet.smali
index 5cd727a7a2..8fab1b6604 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet.smali
@@ -882,12 +882,12 @@
if-eqz v1, :cond_2
- const v1, 0x7f12115f
+ const v1, 0x7f121167
goto :goto_2
:cond_2
- const v1, 0x7f1209c0
+ const v1, 0x7f1209cb
:goto_2
invoke-virtual {p0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate$onViewBound$1$1.smali b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate$onViewBound$1$1.smali
index 71c867dda9..c6425a1db3 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate$onViewBound$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate$onViewBound$1$1.smali
@@ -41,9 +41,9 @@
iget-object v0, v0, Lcom/discord/widgets/guilds/create/WidgetGuildCreate$onViewBound$1;->this$0:Lcom/discord/widgets/guilds/create/WidgetGuildCreate;
- const v1, 0x7f1203c9
+ const v1, 0x7f1203d2
- const v2, 0x7f1212ec
+ const v2, 0x7f1212f4
invoke-static {v0, v1, v2}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate.smali b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate.smali
index 6f371dd651..07ff8e9e93 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate.smali
@@ -485,7 +485,7 @@
aput-object v2, v0, v1
- const v1, 0x7f120490
+ const v1, 0x7f120499
invoke-virtual {p0, v1, v0}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -851,7 +851,7 @@
invoke-super {p0}, Lcom/discord/app/AppFragment;->onViewBoundOrOnResume()V
- const v0, 0x7f12048a
+ const v0, 0x7f120493
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -865,7 +865,7 @@
invoke-virtual {p0, v2, v1, v0}, Lcom/discord/app/AppFragment;->setActionBarOptionsMenu(ILrx/functions/Action2;Lrx/functions/Action1;)Landroidx/appcompat/widget/Toolbar;
- const v0, 0x7f12048d
+ const v0, 0x7f120496
invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.smali b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.smali
index c164527014..2feb42b719 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreateViewModel.smali
@@ -311,7 +311,7 @@
new-instance v0, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Event$ShowToast;
- const v1, 0x7f12111c
+ const v1, 0x7f121124
invoke-direct {v0, v1}, Lcom/discord/widgets/guilds/create/WidgetGuildCreateViewModel$Event$ShowToast;->(I)V
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/GuildInviteUiHelperKt.smali b/com.discord/smali/com/discord/widgets/guilds/invite/GuildInviteUiHelperKt.smali
index fbdd3b9368..48b654369b 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/GuildInviteUiHelperKt.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/GuildInviteUiHelperKt.smali
@@ -41,7 +41,7 @@
move-result-object p1
- const p2, 0x7f120ad7
+ const p2, 0x7f120ae2
invoke-static {p0, p1, p2}, Le/a/b/j;->a(Landroid/content/Context;Ljava/lang/CharSequence;I)V
@@ -109,7 +109,7 @@
move-result-object v0
- const v1, 0x7f121282
+ const v1, 0x7f12128a
invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.smali b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.smali
index fbb7e533a0..d788863078 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.smali
@@ -1004,7 +1004,7 @@
goto :goto_0
:cond_5
- const p1, 0x7f120cbf
+ const p1, 0x7f120cc6
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/widgets/guilds/invite/WidgetGuildInviteShare.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.smali
index 9286771d30..ef4116b7af 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.smali
@@ -1480,7 +1480,7 @@
invoke-virtual {p0, v5, v4}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled(ZLjava/lang/Integer;)Landroidx/appcompat/widget/Toolbar;
- const v4, 0x7f120ae5
+ const v4, 0x7f120af0
invoke-virtual {p0, v4}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.smali
index a929879114..573188f3e0 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareEmptySuggestions.smali
@@ -485,7 +485,7 @@
aput-object p2, v1, v2
- const p1, 0x7f120aea
+ const p1, 0x7f120af5
invoke-virtual {v0, p1, v1}, Landroid/content/res/Resources;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -652,7 +652,7 @@
move-result-object v0
- const v1, 0x7f120bec
+ const v1, 0x7f120bf3
invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -714,7 +714,7 @@
const/4 v6, 0x2
- const v7, 0x7f120aea
+ const v7, 0x7f120af5
if-eq p1, v1, :cond_5
@@ -888,7 +888,7 @@
move-result-object v1
- const v2, 0x7f120be8
+ const v2, 0x7f120bef
invoke-virtual {v1, v2}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -1051,7 +1051,7 @@
invoke-virtual {p0, v4, v3}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled(ZLjava/lang/Integer;)Landroidx/appcompat/widget/Toolbar;
- const v3, 0x7f120ae5
+ const v3, 0x7f120af0
invoke-virtual {p0, v3}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo.smali
index 46354823d5..da5a8e133e 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo.smali
@@ -1103,7 +1103,7 @@
if-nez p1, :cond_0
- const p1, 0x7f120a80
+ const p1, 0x7f120a8b
invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
@@ -1116,7 +1116,7 @@
goto :goto_0
:cond_0
- const v0, 0x7f12025b
+ const v0, 0x7f12025d
const/4 v1, 0x1
@@ -1143,7 +1143,7 @@
if-eqz p2, :cond_0
- const p2, 0x7f12025b
+ const p2, 0x7f12025d
const/4 v0, 0x1
@@ -1164,7 +1164,7 @@
goto :goto_0
:cond_0
- const p1, 0x7f120a82
+ const p1, 0x7f120a8d
invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
@@ -1239,7 +1239,7 @@
aput-object p1, v1, v5
- const p1, 0x7f120a75
+ const p1, 0x7f120a80
invoke-static {p0, p1, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
@@ -1277,7 +1277,7 @@
aput-object p1, v0, v1
- const p1, 0x7f120a74
+ const p1, 0x7f120a7f
invoke-static {p0, p1, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
@@ -1543,7 +1543,7 @@
move-result-object v0
- const v1, 0x7f120a6d
+ const v1, 0x7f120a78
invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -1551,7 +1551,7 @@
move-result-object v0
- const v1, 0x7f120a94
+ const v1, 0x7f120a9f
invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
diff --git a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton.smali b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton.smali
index 131bbde1f7..939a68f82c 100644
--- a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton.smali
@@ -40,7 +40,7 @@
invoke-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const v0, 0x7f120b15
+ const v0, 0x7f120b20
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder.smali b/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder.smali
index facc0bb0b5..d0ec548669 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder.smali
@@ -68,7 +68,7 @@
move-result-object v2
- const v3, 0x7f120c02
+ const v3, 0x7f120c09
new-array v1, v1, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector.smali
index dde0ac09ef..70fffae8b0 100644
--- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildSelector.smali
@@ -495,7 +495,7 @@
move-result-object p1
- const v1, 0x7f120eb6
+ const v1, 0x7f120ebf
invoke-virtual {p0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.smali
index e0f92602bd..2ed5a81aec 100644
--- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.smali
@@ -944,7 +944,7 @@
move-result-object v4
- const v6, 0x7f120a74
+ const v6, 0x7f120a7f
const/4 v7, 0x1
@@ -1044,7 +1044,7 @@
move-result-object v2
- const v3, 0x7f120a75
+ const v3, 0x7f120a80
new-array v6, v7, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMain$showSurvey$1.smali b/com.discord/smali/com/discord/widgets/main/WidgetMain$showSurvey$1.smali
index 0a449b38a8..6a9ee3d4a4 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMain$showSurvey$1.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMain$showSurvey$1.smali
@@ -89,7 +89,7 @@
move-result-object v3
- const v4, 0x7f120cf8
+ const v4, 0x7f120cff
invoke-virtual {p1, v4}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager.smali
index 14c44aabb4..609453d254 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager.smali
@@ -180,7 +180,7 @@
:cond_6
new-instance v0, Lcom/discord/widgets/main/WidgetMainHeaderManager$HeaderData;
- const p1, 0x7f1203b7
+ const p1, 0x7f1203c0
invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -193,7 +193,7 @@
:cond_7
new-instance v0, Lcom/discord/widgets/main/WidgetMainHeaderManager$HeaderData;
- const p1, 0x7f1206cb
+ const p1, 0x7f1206d4
invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNoChannels.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNoChannels.smali
index 612296e8d6..8fd8e0d7d0 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNoChannels.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNoChannels.smali
@@ -113,7 +113,7 @@
move-result-object v0
- const v1, 0x7f1203b7
+ const v1, 0x7f1203c0
invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -130,7 +130,7 @@
move-result-object v0
- const v1, 0x7f1203b6
+ const v1, 0x7f1203bf
invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$Companion.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$Companion.smali
index a9d7f26f42..a017c45eb8 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog$Companion.smali
@@ -80,7 +80,7 @@
goto :goto_0
:cond_0
- const p2, 0x7f120cfa
+ const p2, 0x7f120d01
invoke-virtual {v0, p2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog.smali
index 79d9274c4e..c33ac868e3 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog.smali
@@ -377,7 +377,7 @@
move-result-object v2
- const v3, 0x7f120cf9
+ const v3, 0x7f120d00
invoke-virtual {p0, v3}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -395,7 +395,7 @@
move-result-object v1
- const v2, 0x7f120cbe
+ const v2, 0x7f120cc5
invoke-virtual {p0, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -417,7 +417,7 @@
move-result-object v1
- const v2, 0x7f120d61
+ const v2, 0x7f120d69
invoke-virtual {p0, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$1.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$1.smali
index 35eaaeffb8..fdfa45ade4 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$1.smali
@@ -81,7 +81,7 @@
iget-object v0, v0, Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/media/WidgetMedia;
- const v1, 0x7f120554
+ const v1, 0x7f12055d
const/4 v2, 0x1
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$2.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$2.smali
index a44a0329f8..2b975080ef 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$2.smali
@@ -81,7 +81,7 @@
iget-object p1, p1, Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/media/WidgetMedia;
- const v0, 0x7f120553
+ const v0, 0x7f12055c
invoke-virtual {p1, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali
index cf9f688bac..882eb323f2 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali
@@ -468,7 +468,7 @@
invoke-static {p0, v2, v5, v4, v5}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const v4, 0x7f121437
+ const v4, 0x7f12143f
invoke-virtual {p0, v4}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetQRScanner.smali b/com.discord/smali/com/discord/widgets/media/WidgetQRScanner.smali
index 60411ad0fb..caea15fb58 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetQRScanner.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetQRScanner.smali
@@ -306,7 +306,7 @@
goto :goto_1
:cond_4
- const p1, 0x7f120fc0
+ const p1, 0x7f120fc8
const/4 v0, 0x0
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion.smali
index 7a295ea511..40219a04ad 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion.smali
@@ -493,13 +493,13 @@
move-result-object v14
- const v1, 0x7f120412
+ const v1, 0x7f12041b
invoke-virtual {v0, v1}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
move-result-object v9
- const v1, 0x7f120370
+ const v1, 0x7f120379
invoke-virtual {v0, v1}, Landroid/app/Activity;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.smali
index 1186db3995..4567eddaf3 100644
--- a/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.smali
+++ b/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.smali
@@ -77,12 +77,12 @@
if-eqz p1, :cond_0
- const p1, 0x7f120d51
+ const p1, 0x7f120d59
goto :goto_0
:cond_0
- const p1, 0x7f120b10
+ const p1, 0x7f120b1b
:goto_0
invoke-virtual {v0, p1}, Landroid/widget/Button;->setText(I)V
diff --git a/com.discord/smali/com/discord/widgets/search/WidgetSearch$Model.smali b/com.discord/smali/com/discord/widgets/search/WidgetSearch$Model.smali
index 0685c3e29f..b56b98c237 100644
--- a/com.discord/smali/com/discord/widgets/search/WidgetSearch$Model.smali
+++ b/com.discord/smali/com/discord/widgets/search/WidgetSearch$Model.smali
@@ -63,7 +63,7 @@
goto :goto_0
:cond_0
- const p1, 0x7f1210e2
+ const p1, 0x7f1210ea
new-array v2, v2, [Ljava/lang/Object;
@@ -76,7 +76,7 @@
return-object p0
:cond_1
- const p1, 0x7f1210c7
+ const p1, 0x7f1210cf
new-array v2, v2, [Ljava/lang/Object;
@@ -106,7 +106,7 @@
aput-object p1, v0, v1
- const p1, 0x7f1210e2
+ const p1, 0x7f1210ea
invoke-virtual {p0, p1, v0}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterViewHolder.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterViewHolder.smali
index df781b4c42..198bb44df6 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterViewHolder.smali
@@ -113,27 +113,27 @@
if-eq p1, v0, :cond_0
- const p1, 0x7f121052
+ const p1, 0x7f12105a
return p1
:cond_0
- const p1, 0x7f1210bd
+ const p1, 0x7f1210c5
return p1
:cond_1
- const p1, 0x7f1210b6
+ const p1, 0x7f1210be
return p1
:cond_2
- const p1, 0x7f1210bf
+ const p1, 0x7f1210c7
return p1
:cond_3
- const p1, 0x7f1210b5
+ const p1, 0x7f1210bd
return p1
.end method
@@ -161,27 +161,27 @@
if-eq p1, v0, :cond_0
- const p1, 0x7f121052
+ const p1, 0x7f12105a
return p1
:cond_0
- const p1, 0x7f1210d0
+ const p1, 0x7f1210d8
return p1
:cond_1
- const p1, 0x7f1210cf
+ const p1, 0x7f1210d7
return p1
:cond_2
- const p1, 0x7f1210d2
+ const p1, 0x7f1210da
return p1
:cond_3
- const p1, 0x7f1210ce
+ const p1, 0x7f1210d6
return p1
.end method
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderViewHolder.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderViewHolder.smali
index fc057d160a..8a9c9a8f0e 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderViewHolder.smali
@@ -79,7 +79,7 @@
if-ne v0, v1, :cond_0
- const p1, 0x7f1210d7
+ const p1, 0x7f1210df
return p1
@@ -105,27 +105,27 @@
throw v0
:cond_1
- const p1, 0x7f1210d8
+ const p1, 0x7f1210e0
return p1
:cond_2
- const p1, 0x7f1210db
+ const p1, 0x7f1210e3
return p1
:cond_3
- const p1, 0x7f1210da
+ const p1, 0x7f1210e2
return p1
:cond_4
- const p1, 0x7f1210de
+ const p1, 0x7f1210e6
return p1
:cond_5
- const p1, 0x7f1210df
+ const p1, 0x7f1210e7
return p1
.end method
diff --git a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$CategoryOverridesViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$CategoryOverridesViewHolder.smali
index e51ece7a90..e6cb0648a3 100644
--- a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$CategoryOverridesViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$CategoryOverridesViewHolder.smali
@@ -121,7 +121,7 @@
if-eqz v0, :cond_0
- const p1, 0x7f120670
+ const p1, 0x7f120679
goto :goto_0
diff --git a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder.smali
index 2ae4edd0bc..61a5e976a7 100644
--- a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder.smali
@@ -154,7 +154,7 @@
if-eqz v0, :cond_1
- const p1, 0x7f120670
+ const p1, 0x7f120679
goto :goto_0
diff --git a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder.smali
index 0401ac5d5e..ead59f7cc3 100644
--- a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder.smali
@@ -96,7 +96,7 @@
if-ne p1, v0, :cond_0
- const p1, 0x7f120618
+ const p1, 0x7f120621
goto :goto_0
@@ -105,7 +105,7 @@
if-ne p1, v0, :cond_1
- const p1, 0x7f120678
+ const p1, 0x7f120681
goto :goto_0
@@ -114,7 +114,7 @@
if-ne p1, v0, :cond_2
- const p1, 0x7f120673
+ const p1, 0x7f12067c
goto :goto_0
diff --git a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem.smali b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem.smali
index 30772134c3..7c4cdc9666 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem.smali
@@ -175,7 +175,7 @@
move-result-object p1
- const v1, 0x7f1212f3
+ const v1, 0x7f1212fb
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali
index c27466c207..9a26abbed8 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali
@@ -499,7 +499,7 @@
invoke-static {v0, v4, v3, v2, v3}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const v2, 0x7f120d11
+ const v2, 0x7f120d18
invoke-virtual {v0, v2}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -553,7 +553,7 @@
move-result-object v7
- const v2, 0x7f12066e
+ const v2, 0x7f120677
const/4 v11, 0x1
@@ -577,7 +577,7 @@
invoke-static {v8, v2}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v5, 0x7f1206a8
+ const v5, 0x7f1206b1
new-array v9, v11, [Ljava/lang/Object;
@@ -597,7 +597,7 @@
invoke-static {v9, v2}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v2, 0x7f12066a
+ const v2, 0x7f120673
invoke-virtual {v0, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -607,9 +607,9 @@
invoke-static {v10, v2}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v2, 0x7f12066b
+ const v2, 0x7f120674
- const v5, 0x7f12066f
+ const v5, 0x7f120678
invoke-virtual {v0, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -669,7 +669,7 @@
move-result-object v2
- const v5, 0x7f12069e
+ const v5, 0x7f1206a7
invoke-virtual {v0, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -729,7 +729,7 @@
move-result-object v2
- const v3, 0x7f120678
+ const v3, 0x7f120681
invoke-virtual {v0, v3}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali
index 2cca2822cf..1a00b1095a 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali
@@ -232,11 +232,11 @@
invoke-static {p0, v1, v0, p1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const p1, 0x7f120d0c
+ const p1, 0x7f120d13
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
- const p1, 0x7f1210fa
+ const p1, 0x7f121102
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
@@ -244,7 +244,7 @@
move-result-object p1
- const v2, 0x7f1210b0
+ const v2, 0x7f1210b8
invoke-virtual {p1, v2}, Landroid/widget/EditText;->setHint(I)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali
index 4d61a02507..a8578e6ac8 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali
@@ -1716,7 +1716,7 @@
invoke-static {p0, p1, v0, v1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const p1, 0x7f121121
+ const p1, 0x7f121129
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali
index 100d08b0a1..d9e855d926 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali
@@ -207,7 +207,7 @@
.method private final configureToolbar(Ljava/lang/String;)V
.locals 1
- const v0, 0x7f12027b
+ const v0, 0x7f12027d
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -441,7 +441,7 @@
aput-object v4, v3, v5
- const v4, 0x7f1212ef
+ const v4, 0x7f1212f7
invoke-virtual {v1, v4, v3}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -467,7 +467,7 @@
aput-object v3, v2, v5
- const v3, 0x7f1212ee
+ const v3, 0x7f1212f6
invoke-virtual {v1, v3, v2}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -483,7 +483,7 @@
const/4 v1, 0x0
- const v2, 0x7f120370
+ const v2, 0x7f120379
const/4 v3, 0x2
@@ -495,7 +495,7 @@
invoke-direct {v1, p0, p1, p2, p3}, Lcom/discord/widgets/servers/WidgetServerSettingsBans$showConfirmUnbanDialog$1;->(Lcom/discord/widgets/servers/WidgetServerSettingsBans;JLcom/discord/models/domain/ModelUser;)V
- const p1, 0x7f1212ed
+ const p1, 0x7f1212f5
invoke-virtual {v0, p1, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setPositiveButton(ILkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali
index 9625abe2cc..7b2c714580 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali
@@ -97,12 +97,12 @@
if-nez p2, :cond_0
- const v0, 0x7f1203b5
+ const v0, 0x7f1203be
goto :goto_0
:cond_0
- const v0, 0x7f12116a
+ const v0, 0x7f121172
:goto_0
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -525,7 +525,7 @@
.method public synthetic a(Ljava/lang/Void;)V
.locals 0
- const p1, 0x7f1203a7
+ const p1, 0x7f1203b0
invoke-static {p0, p1}, Le/a/b/j;->a(Landroidx/fragment/app/Fragment;I)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.smali
index 73281a2b0d..7d82e90ff6 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.smali
@@ -158,7 +158,7 @@
goto/16 :goto_4
:cond_0
- const v0, 0x7f120a84
+ const v0, 0x7f120a8f
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali
index 0c5a0362d5..0abe53f9e6 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali
@@ -255,7 +255,7 @@
if-eqz v6, :cond_2
- const v6, 0x7f120b6d
+ const v6, 0x7f120b78
new-array v7, v2, [Ljava/lang/Object;
@@ -298,7 +298,7 @@
if-eqz v6, :cond_4
- const v6, 0x7f12027a
+ const v6, 0x7f12027c
new-array v2, v2, [Ljava/lang/Object;
@@ -438,7 +438,7 @@
if-nez v0, :cond_0
- const v0, 0x7f120c90
+ const v0, 0x7f120c97
const/4 v1, 0x1
@@ -455,7 +455,7 @@
goto :goto_0
:cond_0
- const p1, 0x7f120c91
+ const p1, 0x7f120c98
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -494,7 +494,7 @@
aput-object p1, v1, v2
- const p1, 0x7f120833
+ const p1, 0x7f12083e
invoke-virtual {p0, p1, v1}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem.smali
index 69b7792152..f231302240 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem.smali
@@ -219,7 +219,7 @@
move-result-object p1
- const p2, 0x7f120bc6
+ const p2, 0x7f120bcd
invoke-virtual {p1, p2}, Lcom/discord/views/CheckedSetting;->a(I)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali
index 50cb6a7d9d..f55c206e58 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali
@@ -313,7 +313,7 @@
if-eqz p2, :cond_0
- const p1, 0x7f120637
+ const p1, 0x7f120640
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -349,7 +349,7 @@
return-object p1
:cond_1
- const p1, 0x7f1212d1
+ const p1, 0x7f1212d9
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -358,7 +358,7 @@
return-object p1
:cond_2
- const p1, 0x7f1209ba
+ const p1, 0x7f1209c5
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -367,7 +367,7 @@
return-object p1
:cond_3
- const p1, 0x7f1209b9
+ const p1, 0x7f1209c4
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -376,7 +376,7 @@
return-object p1
:cond_4
- const p1, 0x7f1209b7
+ const p1, 0x7f1209c2
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -780,7 +780,7 @@
invoke-virtual {p0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar;
- const v2, 0x7f12068a
+ const v2, 0x7f120693
invoke-virtual {p0, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -1156,7 +1156,7 @@
const/4 v6, 0x4
- const v7, 0x7f1209bb
+ const v7, 0x7f1209c6
if-eq v5, v6, :cond_2
@@ -1219,7 +1219,7 @@
:cond_4
if-nez v4, :cond_5
- const v2, 0x7f1209b8
+ const v2, 0x7f1209c3
invoke-virtual {v1, v2}, Lcom/discord/views/CheckedSetting;->a(I)V
@@ -1502,7 +1502,7 @@
goto :goto_0
:cond_0
- const p1, 0x7f120688
+ const p1, 0x7f120691
invoke-static {p0, p1}, Le/a/b/j;->a(Landroidx/fragment/app/Fragment;I)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiHeaderViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiHeaderViewHolder.smali
index c50d5a6795..325635187a 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiHeaderViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiHeaderViewHolder.smali
@@ -196,7 +196,7 @@
move-result-object v0
- const v1, 0x7f120934
+ const v1, 0x7f12093f
const/4 v2, 0x2
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiSectionViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiSectionViewHolder.smali
index 7df9c38a45..746c2a7c80 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiSectionViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiSectionViewHolder.smali
@@ -174,7 +174,7 @@
move-result-object v0
- const v1, 0x7f120587
+ const v1, 0x7f120590
new-array v2, v3, [Ljava/lang/Object;
@@ -192,7 +192,7 @@
move-result-object v1
- const v2, 0x7f120586
+ const v2, 0x7f12058f
const/4 v4, 0x2
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion.smali
index fbf9a93d0b..219b61ff5c 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion.smali
@@ -297,7 +297,7 @@
move-result v5
- const v6, 0x7f120577
+ const v6, 0x7f120580
invoke-direct {v4, v0, v5, v6}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiSection;->(III)V
@@ -307,7 +307,7 @@
move-result v6
- const v7, 0x7f1200c5
+ const v7, 0x7f1200c7
invoke-direct {v5, v0, v6, v7}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiSection;->(III)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$showMediaPicker$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$showMediaPicker$1.smali
index 41a058e9d2..0c4b2a86cb 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$showMediaPicker$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$showMediaPicker$1.smali
@@ -39,9 +39,9 @@
iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$showMediaPicker$1;->this$0:Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;
- const v1, 0x7f1203c9
+ const v1, 0x7f1203d2
- const v2, 0x7f1212ec
+ const v2, 0x7f1212f4
invoke-static {v0, v1, v2}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis.smali
index dddeae583f..34b8aad00d 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis.smali
@@ -174,7 +174,7 @@
.method private final configureToolbar(Ljava/lang/String;)V
.locals 1
- const v0, 0x7f120577
+ const v0, 0x7f120580
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.smali
index cc6ff5d23c..4cf942c339 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.smali
@@ -251,7 +251,7 @@
.method private final configureToolbar(Ljava/lang/String;)V
.locals 1
- const v0, 0x7f120577
+ const v0, 0x7f120580
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -491,7 +491,7 @@
invoke-virtual {v0, p1}, Landroid/widget/EditText;->setText(Ljava/lang/CharSequence;)V
- const p1, 0x7f121070
+ const p1, 0x7f121078
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites.smali
index fddb2f5f40..9819b4ab95 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites.smali
@@ -62,7 +62,7 @@
.method private configureToolbar(Ljava/lang/String;)V
.locals 1
- const v0, 0x7f120a83
+ const v0, 0x7f120a8e
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3.smali
index 38818ef4e1..357a420608 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3.smali
@@ -61,7 +61,7 @@
aput-object v0, v2, v3
- const v3, 0x7f121153
+ const v3, 0x7f12115b
invoke-virtual {v1, v3, v2}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem.smali
index 28e5a5716a..3a1b8b1dc9 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem.smali
@@ -303,7 +303,7 @@
iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->inviteExpirationTime:Landroid/widget/TextView;
- const v0, 0x7f120be7
+ const v0, 0x7f120bee
invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(I)V
@@ -484,7 +484,7 @@
goto :goto_0
:cond_3
- const v1, 0x7f120a72
+ const v1, 0x7f120a7d
invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations.smali
index b855f5d898..50319e4347 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations.smali
@@ -133,7 +133,7 @@
.method private final configureToolbar(Ljava/lang/String;)V
.locals 1
- const v0, 0x7f120a85
+ const v0, 0x7f120a90
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali
index 4a2acc5c3d..5e058b7031 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali
@@ -575,12 +575,12 @@
if-eqz p5, :cond_2
- const v0, 0x7f120520
+ const v0, 0x7f120529
goto :goto_0
:cond_2
- const v0, 0x7f120521
+ const v0, 0x7f12052a
:goto_0
invoke-virtual {v8, v0}, Landroid/widget/TextView;->setText(I)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers.smali
index e08bbde586..fb8dd1826e 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers.smali
@@ -165,7 +165,7 @@
.method private configureToolbar(Ljava/lang/String;)V
.locals 1
- const v0, 0x7f120bf1
+ const v0, 0x7f120bf8
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -507,7 +507,7 @@
if-nez v0, :cond_1
- const p1, 0x7f120375
+ const p1, 0x7f12037e
invoke-static {p0, p1}, Le/a/b/j;->a(Landroidx/fragment/app/Fragment;I)V
@@ -547,14 +547,14 @@
if-eqz p1, :cond_3
- const p1, 0x7f120376
+ const p1, 0x7f12037f
invoke-static {p0, p1}, Le/a/b/j;->a(Landroidx/fragment/app/Fragment;I)V
goto :goto_2
:cond_3
- const p1, 0x7f120374
+ const p1, 0x7f12037d
invoke-static {p0, p1}, Le/a/b/j;->a(Landroidx/fragment/app/Fragment;I)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali
index e025a6ede9..caa6401315 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali
@@ -79,7 +79,7 @@
if-ge p2, v0, :cond_0
- const v0, 0x7f1212a2
+ const v0, 0x7f1212aa
invoke-virtual {p1, v0}, Lcom/discord/views/CheckedSetting;->a(I)V
@@ -254,7 +254,7 @@
if-nez p2, :cond_0
- const v0, 0x7f1212a2
+ const v0, 0x7f1212aa
invoke-virtual {p1, v0}, Lcom/discord/views/CheckedSetting;->a(I)V
@@ -379,7 +379,7 @@
.method public synthetic a(Lcom/discord/models/domain/ModelGuild;)V
.locals 0
- const p1, 0x7f121122
+ const p1, 0x7f12112a
invoke-static {p0, p1}, Le/a/b/j;->a(Landroidx/fragment/app/Fragment;I)V
@@ -423,7 +423,7 @@
invoke-virtual {p0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar;
- const v0, 0x7f120c29
+ const v0, 0x7f120c30
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -565,7 +565,7 @@
aput-object v1, v0, v2
- const v1, 0x7f121415
+ const v1, 0x7f12141d
invoke-virtual {p0, v1, v0}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -587,7 +587,7 @@
aput-object v1, v0, v2
- const v1, 0x7f121411
+ const v1, 0x7f121419
invoke-virtual {p0, v1, v0}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureBannerImage$1$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureBannerImage$1$2.smali
index 1bbf8b4846..5722d0ee26 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureBannerImage$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureBannerImage$1$2.smali
@@ -41,9 +41,9 @@
iget-object v0, v0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureBannerImage$1;->this$0:Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
- const v1, 0x7f1203c9
+ const v1, 0x7f1203d2
- const v2, 0x7f1212ec
+ const v2, 0x7f1212f4
invoke-static {v0, v1, v2}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1$2.smali
index f2f0e2a500..cf6317fd52 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1$2.smali
@@ -41,9 +41,9 @@
iget-object v0, v0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1;->this$0:Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
- const v1, 0x7f1203c9
+ const v1, 0x7f1203d2
- const v2, 0x7f1212ec
+ const v2, 0x7f1212f4
invoke-static {v0, v1, v2}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureSplashImage$1$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureSplashImage$1$2.smali
index 7e289b8b0f..2b3e09963c 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureSplashImage$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureSplashImage$1$2.smali
@@ -41,9 +41,9 @@
iget-object v0, v0, Lcom/discord/widgets/servers/WidgetServerSettingsOverview$configureSplashImage$1;->this$0:Lcom/discord/widgets/servers/WidgetServerSettingsOverview;
- const v1, 0x7f1203c9
+ const v1, 0x7f1203d2
- const v2, 0x7f1212ec
+ const v2, 0x7f1212f4
invoke-static {v0, v1, v2}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$2.smali
index c1cccbe085..f320a9683d 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$2.smali
@@ -59,7 +59,7 @@
const/4 v5, 0x1
- const v6, 0x7f120c94
+ const v6, 0x7f120c9b
invoke-virtual/range {v0 .. v6}, Lcom/discord/widgets/channels/WidgetChannelSelector$Companion;->launchForVoice(Landroidx/fragment/app/Fragment;JIZI)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$4.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$4.smali
index 863675ca02..f379a2c337 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$4.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureUI$4.smali
@@ -59,7 +59,7 @@
const/4 v5, 0x1
- const v6, 0x7f120cbc
+ const v6, 0x7f120cc3
invoke-virtual/range {v0 .. v6}, Lcom/discord/widgets/channels/WidgetChannelSelector$Companion;->launchForText(Landroidx/fragment/app/Fragment;JIZI)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali
index 8c02469384..a351599882 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali
@@ -1477,7 +1477,7 @@
move-result-object v0
- const v1, 0x7f120c94
+ const v1, 0x7f120c9b
const v2, 0x7f08022f
@@ -1657,7 +1657,7 @@
move-result-object v0
- const v6, 0x7f120974
+ const v6, 0x7f12097f
new-array v7, v4, [Ljava/lang/Object;
@@ -1765,7 +1765,7 @@
goto/16 :goto_3
:cond_3
- const v0, 0x7f120975
+ const v0, 0x7f120980
new-array v6, v2, [Ljava/lang/Object;
@@ -1877,7 +1877,7 @@
move-result-object v1
- const v2, 0x7f120973
+ const v2, 0x7f12097e
new-array v3, v4, [Ljava/lang/Object;
@@ -2446,7 +2446,7 @@
move-result-object v0
- const v6, 0x7f120974
+ const v6, 0x7f12097f
new-array v7, v4, [Ljava/lang/Object;
@@ -2554,7 +2554,7 @@
goto/16 :goto_3
:cond_3
- const v0, 0x7f120975
+ const v0, 0x7f120980
new-array v6, v3, [Ljava/lang/Object;
@@ -2666,7 +2666,7 @@
move-result-object v1
- const v2, 0x7f120973
+ const v2, 0x7f12097e
new-array v3, v4, [Ljava/lang/Object;
@@ -2749,7 +2749,7 @@
move-result-object v0
- const v1, 0x7f120cbc
+ const v1, 0x7f120cc3
const v2, 0x7f080228
@@ -2907,7 +2907,7 @@
goto :goto_0
:cond_1
- const v2, 0x7f121120
+ const v2, 0x7f121128
invoke-virtual {p0, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -3390,7 +3390,7 @@
invoke-direct {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->configureUI(Lcom/discord/widgets/servers/WidgetServerSettingsOverview$Model;)V
- const p1, 0x7f121122
+ const p1, 0x7f12112a
const/4 v0, 0x4
@@ -4456,7 +4456,7 @@
invoke-virtual {v2, v3, v4}, Lcom/discord/app/AppTextView;->a(Ljava/lang/String;[Ljava/lang/Object;)V
- const v2, 0x7f12098f
+ const v2, 0x7f12099a
new-array v3, v1, [Ljava/lang/Object;
@@ -4506,7 +4506,7 @@
invoke-virtual {v3, v5}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
- const v3, 0x7f1208f0
+ const v3, 0x7f1208fb
new-array v1, v1, [Ljava/lang/Object;
@@ -4571,7 +4571,7 @@
invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->initChannelSelectedHandler()V
- const v0, 0x7f120da4
+ const v0, 0x7f120dac
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali
index 900f1f5951..f22b2686f9 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali
@@ -174,7 +174,7 @@
.method private configureToolbar(Ljava/lang/String;)V
.locals 1
- const v0, 0x7f121035
+ const v0, 0x7f12103d
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -550,7 +550,7 @@
.method public synthetic a(Ljava/lang/Void;)V
.locals 0
- const p1, 0x7f121034
+ const p1, 0x7f12103c
invoke-static {p0, p1}, Le/a/b/j;->a(Landroidx/fragment/app/Fragment;I)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem.smali
index f75bb659cd..db43f7f673 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem.smali
@@ -87,7 +87,7 @@
move-result-object p0
- const v0, 0x7f120637
+ const v0, 0x7f120640
invoke-static {p0, v0}, Le/a/b/j;->a(Landroid/content/Context;I)V
@@ -103,7 +103,7 @@
move-result-object p0
- const v0, 0x7f1209b7
+ const v0, 0x7f1209c2
invoke-static {p0, v0}, Le/a/b/j;->a(Landroid/content/Context;I)V
@@ -119,7 +119,7 @@
move-result-object p0
- const v0, 0x7f1212d1
+ const v0, 0x7f1212d9
invoke-static {p0, v0}, Le/a/b/j;->a(Landroid/content/Context;I)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog.smali
index de487fbf26..6b1d81dc28 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog.smali
@@ -61,12 +61,12 @@
if-eqz p3, :cond_1
- const v1, 0x7f12051b
+ const v1, 0x7f120524
goto :goto_0
:cond_1
- const v1, 0x7f12058b
+ const v1, 0x7f120594
:goto_0
invoke-virtual {v0, v1}, Landroid/widget/Button;->setText(I)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity.smali
index 9cd8e0cfa0..9f586a6f4b 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity.smali
@@ -49,7 +49,7 @@
.method private configureToolbar(Ljava/lang/String;)V
.locals 1
- const v0, 0x7f1210f8
+ const v0, 0x7f121100
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -80,7 +80,7 @@
iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity;->mfaToggleButton:Lcom/google/android/material/button/MaterialButton;
- const v1, 0x7f120844
+ const v1, 0x7f12084f
invoke-virtual {v0, v1}, Landroid/widget/Button;->setText(I)V
@@ -107,7 +107,7 @@
:cond_1
iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity;->mfaToggleButton:Lcom/google/android/material/button/MaterialButton;
- const v1, 0x7f120845
+ const v1, 0x7f120850
invoke-virtual {v0, v1}, Landroid/widget/Button;->setText(I)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali
index c888eaf14e..1a3e12960a 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali
@@ -122,7 +122,7 @@
move-result-object v0
- const v2, 0x7f1212a8
+ const v2, 0x7f1212b0
const/4 v3, 0x1
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali
index 277231d893..1ca5d476b8 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali
@@ -118,7 +118,7 @@
iget-object v3, p0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->currentUrl:Lcom/discord/app/AppTextView;
- const v4, 0x7f121403
+ const v4, 0x7f12140b
const/4 v5, 0x1
@@ -166,7 +166,7 @@
.method private configureToolbar(Ljava/lang/String;)V
.locals 1
- const v0, 0x7f12114f
+ const v0, 0x7f121157
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1.smali
index d37af053ea..78c757c588 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1.smali
@@ -1020,7 +1020,7 @@
:cond_1e
iget-object v1, v0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1;->$context:Landroid/content/Context;
- const v2, 0x7f120939
+ const v2, 0x7f120944
invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.smali
index 0ee8dd5b7e..1b7e888610 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.smali
@@ -554,7 +554,7 @@
move-result-object v1
- const v2, 0x7f12047e
+ const v2, 0x7f120487
const/4 v3, 0x0
@@ -571,7 +571,7 @@
invoke-virtual {v1}, Landroid/app/Activity;->finish()V
:cond_0
- const v1, 0x7f12096a
+ const v1, 0x7f120975
invoke-virtual {p0, v1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2.smali
index 0d5d13a705..b091a70126 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2.smali
@@ -96,7 +96,7 @@
iget-object v0, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2;->$context:Landroid/content/Context;
- const v1, 0x7f120939
+ const v1, 0x7f120944
invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.smali
index 7c5363100d..2ab9723864 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.smali
@@ -433,7 +433,7 @@
iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet;->adapter:Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter;
- const p1, 0x7f12096a
+ const p1, 0x7f120975
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -450,13 +450,13 @@
if-nez p1, :cond_1
- const p1, 0x7f12093a
+ const p1, 0x7f120945
goto :goto_1
:cond_1
:goto_0
- const p1, 0x7f120936
+ const p1, 0x7f120941
:goto_1
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
@@ -478,13 +478,13 @@
if-nez p2, :cond_3
- const p2, 0x7f1210e3
+ const p2, 0x7f1210eb
goto :goto_3
:cond_3
:goto_2
- const p2, 0x7f1210b1
+ const p2, 0x7f1210b9
:goto_3
invoke-virtual {p1, p2}, Landroid/widget/EditText;->setHint(I)V
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.smali
index 70b313e914..4c436966b4 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.smali
@@ -359,17 +359,17 @@
goto :goto_3
:cond_6
- const v13, 0x7f120968
+ const v13, 0x7f120973
goto :goto_3
:cond_7
- const v13, 0x7f120967
+ const v13, 0x7f120972
goto :goto_3
:cond_8
- const v13, 0x7f120966
+ const v13, 0x7f120971
:goto_3
invoke-static {v0, v13}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
@@ -541,7 +541,7 @@
if-eq v1, v3, :cond_10
- const v10, 0x7f120964
+ const v10, 0x7f12096f
invoke-static {v0, v10}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
@@ -550,7 +550,7 @@
goto :goto_6
:cond_10
- const v10, 0x7f120962
+ const v10, 0x7f12096d
invoke-static {v0, v10}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
@@ -565,11 +565,11 @@
const/4 v11, 0x4
- const v12, 0x7f12095f
+ const v12, 0x7f12096a
const v13, 0x7f0802d1
- const v14, 0x7f120960
+ const v14, 0x7f12096b
const v15, 0x7f0803b0
@@ -662,11 +662,11 @@
move-result v7
- const v8, 0x7f120961
+ const v8, 0x7f12096c
new-array v10, v3, [Ljava/lang/Object;
- const v11, 0x7f1205c7
+ const v11, 0x7f1205d0
new-array v3, v3, [Ljava/lang/Object;
@@ -708,7 +708,7 @@
move-result v2
- const v4, 0x7f12095e
+ const v4, 0x7f120969
invoke-static {v0, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
@@ -799,11 +799,11 @@
move-result v7
- const v8, 0x7f120961
+ const v8, 0x7f12096c
new-array v10, v3, [Ljava/lang/Object;
- const v12, 0x7f1205c7
+ const v12, 0x7f1205d0
new-array v3, v3, [Ljava/lang/Object;
@@ -843,7 +843,7 @@
move-result v4
- const v5, 0x7f12095c
+ const v5, 0x7f120967
invoke-static {v0, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
@@ -863,7 +863,7 @@
move-result v2
- const v4, 0x7f12095d
+ const v4, 0x7f120968
invoke-static {v0, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
@@ -952,7 +952,7 @@
move-result v4
- const v5, 0x7f120959
+ const v5, 0x7f120964
invoke-static {v0, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
@@ -970,7 +970,7 @@
move-result v4
- const v5, 0x7f12095a
+ const v5, 0x7f120965
invoke-static {v0, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
@@ -990,7 +990,7 @@
move-result v2
- const v4, 0x7f12095b
+ const v4, 0x7f120966
invoke-static {v0, v4}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.smali
index 2f4446d481..eecdd3243c 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.smali
@@ -977,22 +977,22 @@
goto :goto_0
:cond_0
- const v5, 0x7f120f09
+ const v5, 0x7f120f11
goto :goto_0
:cond_1
- const v5, 0x7f120f08
+ const v5, 0x7f120f10
goto :goto_0
:cond_2
- const v5, 0x7f120f07
+ const v5, 0x7f120f0f
goto :goto_0
:cond_3
- const v5, 0x7f120e88
+ const v5, 0x7f120e91
:goto_0
invoke-virtual {p0, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -1066,7 +1066,7 @@
.method private final configureToolbar(Ljava/lang/String;)V
.locals 1
- const v0, 0x7f120e9a
+ const v0, 0x7f120ea3
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -2055,7 +2055,7 @@
invoke-static {v8, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v1, 0x7f120e8f
+ const v1, 0x7f120e98
const/4 v2, 0x1
@@ -2115,7 +2115,7 @@
invoke-static {v0, v3}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v3, 0x7f120ea4
+ const v3, 0x7f120ead
new-array v8, v9, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.smali
index 741a245e04..2f4a22db83 100644
--- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.smali
+++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscriptionConfirmation.smali
@@ -294,7 +294,7 @@
.method private final configureToolbar(Ljava/lang/String;)V
.locals 1
- const v0, 0x7f120e9a
+ const v0, 0x7f120ea3
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -830,7 +830,7 @@
move-result-object p1
- const v3, 0x7f120eb0
+ const v3, 0x7f120eb9
new-array v2, v2, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali
index b61a323f74..d8cceb97d3 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali
@@ -483,7 +483,7 @@
.method private final getDateString(Landroid/content/Context;)Ljava/lang/CharSequence;
.locals 3
- const v0, 0x7f120393
+ const v0, 0x7f12039c
invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -732,7 +732,7 @@
invoke-static {p0, p1, v0, v1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const p1, 0x7f121478
+ const p1, 0x7f121480
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -762,7 +762,7 @@
invoke-static {v2, v0}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v0, 0x7f120392
+ const v0, 0x7f12039b
invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -796,7 +796,7 @@
invoke-virtual {p1, v0}, Landroid/widget/TextView;->setMovementMethod(Landroid/text/method/MovementMethod;)V
- const p1, 0x7f120396
+ const p1, 0x7f12039f
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet.smali b/com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet.smali
index 4d3df9e0b0..3b156e57e6 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetMuteSettingsSheet.smali
@@ -530,7 +530,7 @@
goto :goto_0
:cond_0
- const v0, 0x7f120c62
+ const v0, 0x7f120c69
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -539,7 +539,7 @@
goto :goto_0
:cond_1
- const v0, 0x7f120c63
+ const v0, 0x7f120c6a
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -548,7 +548,7 @@
goto :goto_0
:cond_2
- const v0, 0x7f120c65
+ const v0, 0x7f120c6c
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -557,7 +557,7 @@
goto :goto_0
:cond_3
- const v0, 0x7f120c64
+ const v0, 0x7f120c6b
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -603,7 +603,7 @@
if-eqz p1, :cond_6
- const p1, 0x7f1204e9
+ const p1, 0x7f1204f2
const/4 v0, 0x0
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
index 9f715c83b1..99fa63813d 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
@@ -966,12 +966,12 @@
if-ne v0, v1, :cond_3
- const v0, 0x7f120f40
+ const v0, 0x7f120f48
goto :goto_3
:cond_3
- const v0, 0x7f120f3f
+ const v0, 0x7f120f47
:goto_3
invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -1542,13 +1542,13 @@
invoke-direct {v1, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V
- const p1, 0x7f120ba7
+ const p1, 0x7f120bae
invoke-virtual {v1, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
move-result-object v1
- const v2, 0x7f1213b2
+ const v2, 0x7f1213ba
invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
@@ -1566,7 +1566,7 @@
move-result-object p1
- const v1, 0x7f120370
+ const v1, 0x7f120379
const/4 v2, 0x2
@@ -1599,7 +1599,7 @@
invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
- const p1, 0x7f121392
+ const p1, 0x7f12139a
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -1651,7 +1651,7 @@
move-result-object p1
- const v0, 0x7f1200c7
+ const v0, 0x7f1200c9
invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -1663,7 +1663,7 @@
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
- const-string v0, " - 10.2.5 (1025)"
+ const-string v0, " - 10.2.6 (1026)"
invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$2.smali
index 99326ddb1c..35556385eb 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance$configureUI$2.smali
@@ -110,7 +110,7 @@
iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance$configureUI$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsAppearance;
- const v2, 0x7f121270
+ const v2, 0x7f121278
new-array v1, v1, [Ljava/lang/Object;
@@ -146,7 +146,7 @@
move-result-object p1
- const v0, 0x7f121271
+ const v0, 0x7f121279
iget-object v2, p0, Lcom/discord/widgets/settings/WidgetSettingsAppearance$configureUI$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsAppearance;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali
index c7ec7deb88..83cbd4f3b7 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali
@@ -1299,7 +1299,7 @@
move-result-object p1
- const v0, 0x7f1213a3
+ const v0, 0x7f1213ab
invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -1321,7 +1321,7 @@
const/4 v2, 0x0
- const v3, 0x7f12126e
+ const v3, 0x7f121276
invoke-static {v0, v3, v2, v1}, Le/a/b/j;->a(Landroid/content/Context;IILcom/discord/utilities/view/ToastManager;)V
@@ -1457,11 +1457,11 @@
invoke-super {p0, p1}, Landroidx/fragment/app/Fragment;->onActivityCreated(Landroid/os/Bundle;)V
- const p1, 0x7f1200d1
+ const p1, 0x7f1200d3
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
- const p1, 0x7f121392
+ const p1, 0x7f12139a
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps.smali
index 63c508f05d..afff024270 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAuthorizedApps.smali
@@ -213,13 +213,13 @@
invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V
- const v1, 0x7f1204e4
+ const v1, 0x7f1204ed
invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
move-result-object v0
- const v1, 0x7f1204f2
+ const v1, 0x7f1204fb
invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
@@ -227,7 +227,7 @@
const/4 v1, 0x0
- const v2, 0x7f120370
+ const v2, 0x7f120379
const/4 v3, 0x2
@@ -239,7 +239,7 @@
invoke-direct {v1, p0, p1, p2}, Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps$deauthorizeApp$1;->(Lcom/discord/widgets/settings/WidgetSettingsAuthorizedApps;J)V
- const p1, 0x7f1204e3
+ const p1, 0x7f1204ec
invoke-virtual {v0, p1, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setPositiveButton(ILkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali
index 4bb61034b5..163b70d499 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali
@@ -283,11 +283,11 @@
invoke-super {p0, p1}, Landroidx/fragment/app/Fragment;->onActivityCreated(Landroid/os/Bundle;)V
- const p1, 0x7f121392
+ const p1, 0x7f12139a
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
- const p1, 0x7f120659
+ const p1, 0x7f120662
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -365,7 +365,7 @@
invoke-static {v2, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v1, 0x7f120515
+ const v1, 0x7f12051e
const/4 v3, 0x1
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper.smali
index a2580bbba8..0861a559a8 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper.smali
@@ -73,7 +73,7 @@
invoke-static {p0, p1, v0, v1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const p1, 0x7f120516
+ const p1, 0x7f12051f
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2.smali
index c7a601bc0b..6fc858f79d 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2.smali
@@ -81,7 +81,7 @@
iget-object v1, v0, Lcom/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsGameActivity;
- const v5, 0x7f121333
+ const v5, 0x7f12133b
invoke-virtual {v1, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -89,7 +89,7 @@
iget-object v1, v0, Lcom/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsGameActivity;
- const v6, 0x7f12070a
+ const v6, 0x7f120715
invoke-virtual {v1, v6}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -101,7 +101,7 @@
iget-object v1, v0, Lcom/discord/widgets/settings/WidgetSettingsGameActivity$configureUI$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsGameActivity;
- const v7, 0x7f12070b
+ const v7, 0x7f120716
invoke-virtual {v1, v7}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity.smali
index 1f822cb85c..bd7794a509 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGameActivity.smali
@@ -333,7 +333,7 @@
move-result-object v0
- const v1, 0x7f12113c
+ const v1, 0x7f121144
invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -366,7 +366,7 @@
move-result-object v0
- const v1, 0x7f121138
+ const v1, 0x7f121140
invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -374,7 +374,7 @@
move-result-object v0
- const v1, 0x7f12113a
+ const v1, 0x7f121142
invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -651,7 +651,7 @@
move-result-object v0
- const v1, 0x7f120e09
+ const v1, 0x7f120e12
const/4 v2, 0x1
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali
index 0059ad824d..01b105000a 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali
@@ -1679,139 +1679,139 @@
const/4 p0, -0x1
:goto_1
- const v0, 0x7f12058a
+ const v0, 0x7f120593
packed-switch p0, :pswitch_data_0
return v0
:pswitch_0
- const p0, 0x7f12126b
+ const p0, 0x7f121273
return p0
:pswitch_1
- const p0, 0x7f12142c
+ const p0, 0x7f121434
return p0
:pswitch_2
- const p0, 0x7f1214a9
+ const p0, 0x7f1214b1
return p0
:pswitch_3
- const p0, 0x7f121033
+ const p0, 0x7f12103b
return p0
:pswitch_4
- const p0, 0x7f1209c8
+ const p0, 0x7f1209d3
return p0
:pswitch_5
- const p0, 0x7f120baa
+ const p0, 0x7f120bb1
return p0
:pswitch_6
- const p0, 0x7f12056c
+ const p0, 0x7f120575
return p0
:pswitch_7
- const p0, 0x7f120c93
+ const p0, 0x7f120c9a
return p0
:pswitch_8
- const p0, 0x7f1205c3
+ const p0, 0x7f1205cc
return p0
:pswitch_9
- const p0, 0x7f1209c7
+ const p0, 0x7f1209d2
return p0
:pswitch_a
- const p0, 0x7f120b6e
+ const p0, 0x7f120b79
return p0
:pswitch_b
- const p0, 0x7f1214aa
+ const p0, 0x7f1214b2
return p0
:pswitch_c
- const p0, 0x7f120b0f
+ const p0, 0x7f120b1a
return p0
:pswitch_d
- const p0, 0x7f1212ea
+ const p0, 0x7f1212f2
return p0
:pswitch_e
- const p0, 0x7f121048
+ const p0, 0x7f121050
return p0
:pswitch_f
- const p0, 0x7f12028a
+ const p0, 0x7f12028c
return p0
:pswitch_10
- const p0, 0x7f1204aa
+ const p0, 0x7f1204b3
return p0
:pswitch_11
- const p0, 0x7f1212a5
+ const p0, 0x7f1212ad
return p0
:pswitch_12
- const p0, 0x7f1211f2
+ const p0, 0x7f1211fa
return p0
:pswitch_13
- const p0, 0x7f120fa3
+ const p0, 0x7f120fab
return p0
:pswitch_14
- const p0, 0x7f120e21
+ const p0, 0x7f120e2a
return p0
:pswitch_15
- const p0, 0x7f120c92
+ const p0, 0x7f120c99
return p0
:pswitch_16
- const p0, 0x7f120b0e
+ const p0, 0x7f120b19
return p0
:pswitch_17
- const p0, 0x7f1206b8
+ const p0, 0x7f1206c1
return p0
:pswitch_18
- const p0, 0x7f1205aa
+ const p0, 0x7f1205b3
return p0
:pswitch_19
- const p0, 0x7f120589
+ const p0, 0x7f120592
return p0
@@ -1819,12 +1819,12 @@
return v0
:pswitch_1b
- const p0, 0x7f1204e0
+ const p0, 0x7f1204e9
return p0
:pswitch_1c
- const p0, 0x7f1204c1
+ const p0, 0x7f1204ca
return p0
@@ -1940,11 +1940,11 @@
invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
- const v0, 0x7f121392
+ const v0, 0x7f12139a
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
- const v0, 0x7f120b70
+ const v0, 0x7f120b7b
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali
index 6820937c6e..f6ca75d382 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali
@@ -372,11 +372,11 @@
invoke-super {p0, p1}, Landroidx/fragment/app/Fragment;->onActivityCreated(Landroid/os/Bundle;)V
- const p1, 0x7f121392
+ const p1, 0x7f12139a
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
- const p1, 0x7f121265
+ const p1, 0x7f12126d
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -428,7 +428,7 @@
move-result-object p1
- const v1, 0x7f120a5d
+ const v1, 0x7f120a68
invoke-virtual {p0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali
index 0730ffa05f..c7d42e55c4 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali
@@ -521,11 +521,11 @@
invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
- const p1, 0x7f121392
+ const p1, 0x7f12139a
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
- const p1, 0x7f120d14
+ const p1, 0x7f120d1b
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1.smali
index 7d000518bb..d65b71a54d 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1.smali
@@ -101,15 +101,15 @@
if-eqz p5, :cond_0
- const v0, 0x7f121337
+ const v0, 0x7f12133f
invoke-virtual {p2, v0}, Landroid/widget/TextView;->setText(I)V
- const p2, 0x7f121334
+ const p2, 0x7f12133c
invoke-virtual {p3, p2}, Landroid/widget/TextView;->setText(I)V
- const p2, 0x7f121335
+ const p2, 0x7f12133d
invoke-virtual {p4, p2}, Landroid/widget/TextView;->setText(I)V
@@ -119,7 +119,7 @@
invoke-virtual {p4, p2}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
- const p2, 0x7f121336
+ const p2, 0x7f12133e
invoke-virtual {p5, p2}, Landroid/widget/TextView;->setText(I)V
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1.smali
index 661a55c85b..91700dd455 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1.smali
@@ -101,15 +101,15 @@
if-eqz p5, :cond_0
- const v0, 0x7f120e0d
+ const v0, 0x7f120e16
invoke-virtual {p2, v0}, Landroid/widget/TextView;->setText(I)V
- const p2, 0x7f120e0a
+ const p2, 0x7f120e13
invoke-virtual {p3, p2}, Landroid/widget/TextView;->setText(I)V
- const p2, 0x7f120e0b
+ const p2, 0x7f120e14
invoke-virtual {p4, p2}, Landroid/widget/TextView;->setText(I)V
@@ -119,7 +119,7 @@
invoke-virtual {p4, p2}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
- const p2, 0x7f120e0c
+ const p2, 0x7f120e15
invoke-virtual {p5, p2}, Landroid/widget/TextView;->setText(I)V
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.smali
index 0f41a7c6b8..78eefac1f6 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.smali
@@ -74,7 +74,7 @@
:cond_0
iget-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1;->this$0:Lcom/discord/widgets/settings/WidgetSettingsPrivacy;
- const v0, 0x7f1204da
+ const v0, 0x7f1204e3
const/4 v1, 0x0
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.smali
index 10d5bcb1b4..d74d6eb92c 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.smali
@@ -75,19 +75,19 @@
invoke-direct {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V
- const v2, 0x7f1204d9
+ const v2, 0x7f1204e2
invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
move-result-object v1
- const v2, 0x7f1204d8
+ const v2, 0x7f1204e1
invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
move-result-object v1
- const v2, 0x7f120d61
+ const v2, 0x7f120d69
const/4 v3, 0x2
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.smali
index 104d98fd96..f02525ed37 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.smali
@@ -86,7 +86,7 @@
invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V
- const v1, 0x7f1204d1
+ const v1, 0x7f1204da
invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
@@ -99,7 +99,7 @@
:cond_0
iget-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2;->$context:Landroid/content/Context;
- const v1, 0x7f1204d0
+ const v1, 0x7f1204d9
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -114,7 +114,7 @@
move-result-object p1
- const v0, 0x7f120d61
+ const v0, 0x7f120d69
const/4 v1, 0x2
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.smali
index 7b4b65e83b..0a71d30324 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.smali
@@ -72,13 +72,13 @@
invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V
- const v1, 0x7f1204cf
+ const v1, 0x7f1204d8
invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
move-result-object v0
- const v1, 0x7f1204d4
+ const v1, 0x7f1204dd
invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
@@ -88,7 +88,7 @@
invoke-direct {v1, p0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4$1;->(Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4;)V
- const v2, 0x7f120d61
+ const v2, 0x7f120d69
invoke-virtual {v0, v2, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setPositiveButton(ILkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
@@ -96,7 +96,7 @@
const/4 v1, 0x0
- const v2, 0x7f120370
+ const v2, 0x7f120379
const/4 v3, 0x2
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali
index 130f587ac0..e80a42e9ee 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali
@@ -1746,7 +1746,7 @@
move-result-object p1
- const p2, 0x7f1204c6
+ const p2, 0x7f1204cf
const/4 v0, 0x1
@@ -1768,7 +1768,7 @@
invoke-direct {p2, v7}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V
- const v0, 0x7f1204dd
+ const v0, 0x7f1204e6
invoke-virtual {p2, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
@@ -1778,7 +1778,7 @@
move-result-object p1
- const p2, 0x7f120d61
+ const p2, 0x7f120d69
const/4 v0, 0x2
@@ -2087,11 +2087,11 @@
invoke-static {v0, v3, v1, v2, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const v1, 0x7f121392
+ const v1, 0x7f12139a
invoke-virtual {v0, v1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
- const v1, 0x7f120f96
+ const v1, 0x7f120f9e
invoke-virtual {v0, v1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -2113,7 +2113,7 @@
move-result-object v1
- const v2, 0x7f1204cd
+ const v2, 0x7f1204d6
const/4 v6, 0x1
@@ -2165,7 +2165,7 @@
move-result-object v1
- const v7, 0x7f1204ca
+ const v7, 0x7f1204d3
invoke-virtual {v0, v7}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -2278,7 +2278,7 @@
invoke-virtual {v10, v11}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder;
- const v11, 0x7f120cfd
+ const v11, 0x7f120d04
invoke-virtual {v0, v11}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -2320,7 +2320,7 @@
invoke-virtual {v1, v8}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
- const v1, 0x7f1204db
+ const v1, 0x7f1204e4
new-array v7, v6, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder.smali
index 6b257c47fb..86f0b2430c 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder.smali
@@ -733,7 +733,7 @@
move-result-object v2
- const v5, 0x7f120541
+ const v5, 0x7f12054a
new-array v6, v3, [Ljava/lang/Object;
@@ -906,7 +906,7 @@
move-result-object v0
- const v1, 0x7f121185
+ const v1, 0x7f12118d
invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali
index 8220e728d7..9261fff0cb 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali
@@ -356,11 +356,11 @@
invoke-static {p0, p1, v0, v1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const p1, 0x7f121392
+ const p1, 0x7f12139a
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
- const p1, 0x7f120448
+ const p1, 0x7f120451
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali
index 23c3b16931..8bf6d391d6 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali
@@ -247,7 +247,7 @@
move-result-object v0
- const v1, 0x7f120438
+ const v1, 0x7f120441
const/4 v2, 0x0
@@ -357,11 +357,11 @@
invoke-static {p0, p1, v0, v1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const p1, 0x7f121392
+ const p1, 0x7f12139a
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
- const p1, 0x7f120448
+ const p1, 0x7f120451
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali
index 6b5f4c82f9..3c618c690f 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali
@@ -2086,7 +2086,7 @@
invoke-virtual {v0, v1}, Lcom/discord/stores/StoreMediaEngine;->setOpenSLESConfig(Lcom/discord/rtcconnection/mediaengine/MediaEngine$OpenSLESConfig;)V
:cond_2
- const v0, 0x7f1213dc
+ const v0, 0x7f1213e4
const/4 v1, 0x0
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$Mode.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$Mode.smali
index 2991249e88..66572c9e26 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$Mode.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$Mode.smali
@@ -52,11 +52,11 @@
const/4 v3, 0x0
- const v4, 0x7f12051c
+ const v4, 0x7f120525
- const v5, 0x7f12051d
+ const v5, 0x7f120526
- const v6, 0x7f12051b
+ const v6, 0x7f120524
move-object v1, v7
@@ -74,11 +74,11 @@
const/4 v10, 0x1
- const v11, 0x7f1204ed
+ const v11, 0x7f1204f6
- const v12, 0x7f1204ee
+ const v12, 0x7f1204f7
- const v13, 0x7f1204ec
+ const v13, 0x7f1204f5
move-object v8, v1
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.smali
index 643885cc48..5ce565c7a5 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.smali
@@ -564,7 +564,7 @@
move-result-object v2
- const v3, 0x7f120c19
+ const v3, 0x7f120c20
invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -580,7 +580,7 @@
move-result-object v2
- const v3, 0x7f120c15
+ const v3, 0x7f120c1c
invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -596,7 +596,7 @@
move-result-object v2
- const v3, 0x7f12058b
+ const v3, 0x7f120594
invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -615,7 +615,7 @@
move-result-object v2
- const v3, 0x7f120c1e
+ const v3, 0x7f120c25
invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -631,7 +631,7 @@
move-result-object v2
- const v3, 0x7f120c17
+ const v3, 0x7f120c1e
invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -647,7 +647,7 @@
move-result-object v2
- const v3, 0x7f12051b
+ const v3, 0x7f120524
invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3.smali
index 4c896a3618..5f0e041e68 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3.smali
@@ -103,7 +103,7 @@
iget-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$3;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
- const v0, 0x7f120f78
+ const v0, 0x7f120f80
invoke-virtual {p1, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$5$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$5$1.smali
index a44b9d94c1..89efcc8d4f 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$5$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$5$1.smali
@@ -41,9 +41,9 @@
iget-object v0, v0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$5;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
- const v1, 0x7f1203c9
+ const v1, 0x7f1203d2
- const v2, 0x7f1212ec
+ const v2, 0x7f1212f4
invoke-static {v0, v1, v2}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1$1.smali
index 79f176a06e..e41341f5c7 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1$1.smali
@@ -77,7 +77,7 @@
move-result-object v1
- const v2, 0x7f1213d1
+ const v2, 0x7f1213d9
invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount.smali
index 47d03f4df3..43aaa2e7a7 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount.smali
@@ -1558,7 +1558,7 @@
:goto_9
if-nez v2, :cond_b
- const v2, 0x7f120c14
+ const v2, 0x7f120c1b
new-array v3, v4, [Ljava/lang/Object;
@@ -1591,7 +1591,7 @@
if-eqz p1, :cond_c
- const p1, 0x7f120c18
+ const p1, 0x7f120c1f
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -1600,7 +1600,7 @@
goto :goto_a
:cond_c
- const p1, 0x7f120c15
+ const p1, 0x7f120c1c
invoke-virtual {p0, p1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -1650,7 +1650,7 @@
const/4 v0, 0x0
- const v1, 0x7f121071
+ const v1, 0x7f121079
const/4 v2, 0x4
@@ -2369,13 +2369,13 @@
invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V
- const v1, 0x7f1204f0
+ const v1, 0x7f1204f9
invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
move-result-object v0
- const v1, 0x7f1204f1
+ const v1, 0x7f1204fa
invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
@@ -2383,7 +2383,7 @@
const/4 v1, 0x0
- const v2, 0x7f120d61
+ const v2, 0x7f120d69
const/4 v3, 0x2
@@ -2419,7 +2419,7 @@
move-result-object v2
- const v3, 0x7f1212dc
+ const v3, 0x7f1212e4
invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -2433,7 +2433,7 @@
move-result-object v3
- const v4, 0x7f1213ce
+ const v4, 0x7f1213d6
invoke-virtual {v3, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -2447,7 +2447,7 @@
move-result-object v4
- const v5, 0x7f1212b8
+ const v5, 0x7f1212c0
invoke-virtual {v4, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -2574,11 +2574,11 @@
invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
- const p1, 0x7f121392
+ const p1, 0x7f12139a
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
- const p1, 0x7f1213d4
+ const p1, 0x7f1213dc
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.smali
index 24e6cfbf2e..fd16078d91 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.smali
@@ -80,7 +80,7 @@
move-result-object p1
- const v0, 0x7f120467
+ const v0, 0x7f120470
const/4 v1, 0x0
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder.smali
index 38041c99d7..f055cceed6 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder.smali
@@ -144,7 +144,7 @@
move-result-object v2
- const v3, 0x7f120271
+ const v3, 0x7f120273
const/4 v4, 0x2
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.smali
index 97be560730..6ec1c559bf 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.smali
@@ -163,7 +163,7 @@
move-result-object v4
- const v5, 0x7f1213ac
+ const v5, 0x7f1213b4
invoke-virtual {v4, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -230,7 +230,7 @@
move-result-object v2
- const v4, 0x7f1213e5
+ const v4, 0x7f1213ed
invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.smali
index 9a84d567ec..a6d0dc9819 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.smali
@@ -436,7 +436,7 @@
move-result-object v2
- const v3, 0x7f1213b6
+ const v3, 0x7f1213be
invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -450,7 +450,7 @@
move-result-object v2
- const v4, 0x7f1212be
+ const v4, 0x7f1212c6
invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -501,11 +501,11 @@
invoke-super {p0, p1}, Landroidx/fragment/app/Fragment;->onActivityCreated(Landroid/os/Bundle;)V
- const p1, 0x7f121392
+ const p1, 0x7f12139a
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
- const p1, 0x7f1212be
+ const p1, 0x7f1212c6
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -531,7 +531,7 @@
move-result-object p1
- const p2, 0x7f1212bd
+ const p2, 0x7f1212c5
const/4 v0, 0x0
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$saveNewPassword$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$saveNewPassword$1.smali
index 0c946d8223..79ff2e7f44 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$saveNewPassword$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$saveNewPassword$1.smali
@@ -51,7 +51,7 @@
iget-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword$saveNewPassword$1;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;
- const v1, 0x7f121071
+ const v1, 0x7f121079
const/4 v2, 0x0
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.smali
index dae8f3a665..24922f92d6 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.smali
@@ -495,7 +495,7 @@
move-result-object v2
- const v3, 0x7f120db9
+ const v3, 0x7f120dc1
invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -532,7 +532,7 @@
move-result-object v2
- const v3, 0x7f120db3
+ const v3, 0x7f120dbb
invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -589,7 +589,7 @@
move-result-object v2
- const v3, 0x7f1212e0
+ const v3, 0x7f1212e8
invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -710,11 +710,11 @@
invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
- const p1, 0x7f121392
+ const p1, 0x7f12139a
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
- const p1, 0x7f12039a
+ const p1, 0x7f1203a3
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1.smali
index 3edc42330d..9550bc0df8 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1.smali
@@ -67,7 +67,7 @@
iget-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;
- const p2, 0x7f120f8b
+ const p2, 0x7f120f93
invoke-virtual {p1, p2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$saveInfo$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$saveInfo$1.smali
index ad9a4b38e4..4607d145d2 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$saveInfo$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$saveInfo$1.smali
@@ -65,7 +65,7 @@
iget-object v0, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$saveInfo$1;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;
- const v2, 0x7f121071
+ const v2, 0x7f121079
const/4 v3, 0x4
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$validationManager$2.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$validationManager$2.smali
index 9707e51f00..4f2761eee5 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$validationManager$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$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, 0x7f1213f9
+ const v7, 0x7f121401
invoke-virtual {v6, v7}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
@@ -96,9 +96,9 @@
sget-object v6, Lcom/discord/utilities/auth/AuthUtils;->INSTANCE:Lcom/discord/utilities/auth/AuthUtils;
- const v8, 0x7f120e41
+ const v8, 0x7f120e4a
- const v9, 0x7f120e46
+ const v9, 0x7f120e4f
invoke-virtual {v6, v8, v9}, Lcom/discord/utilities/auth/AuthUtils;->createDiscriminatorInputValidator(II)Lcom/discord/utilities/view/validators/InputValidator;
@@ -126,7 +126,7 @@
sget-object v8, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
- const v9, 0x7f120573
+ const v9, 0x7f12057c
invoke-virtual {v8, v9}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
@@ -136,7 +136,7 @@
sget-object v8, Lcom/discord/utilities/auth/AuthUtils;->INSTANCE:Lcom/discord/utilities/auth/AuthUtils;
- const v9, 0x7f120572
+ const v9, 0x7f12057b
invoke-virtual {v8, v9}, Lcom/discord/utilities/auth/AuthUtils;->createEmailInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
@@ -162,7 +162,7 @@
sget-object v6, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
- const v8, 0x7f120db9
+ const v8, 0x7f120dc1
invoke-virtual {v6, v8}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
@@ -172,7 +172,7 @@
sget-object v6, Lcom/discord/utilities/auth/AuthUtils;->INSTANCE:Lcom/discord/utilities/auth/AuthUtils;
- const v7, 0x7f120db3
+ const v7, 0x7f120dbb
invoke-virtual {v6, v7}, Lcom/discord/utilities/auth/AuthUtils;->createPasswordInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit.smali
index f2fce0268d..fd6ca99a97 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit.smali
@@ -1073,11 +1073,11 @@
invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
- const p1, 0x7f121392
+ const p1, 0x7f12139a
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
- const p1, 0x7f1213b3
+ const p1, 0x7f1213bb
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.smali b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.smali
index df25eaaa80..8ff590f762 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.smali
@@ -99,7 +99,7 @@
invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
- const v0, 0x7f1212c3
+ const v0, 0x7f1212cb
const/4 v1, 0x2
diff --git a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.smali b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.smali
index 74d3d76771..a0dd3904f4 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.smali
@@ -192,7 +192,7 @@
invoke-virtual {v1, v0}, Landroid/content/ClipboardManager;->setPrimaryClip(Landroid/content/ClipData;)V
:cond_0
- const v0, 0x7f120467
+ const v0, 0x7f120470
const/4 v1, 0x0
@@ -290,7 +290,7 @@
const/4 v2, 0x1
- const v3, 0x7f120b7d
+ const v3, 0x7f120b84
const/4 v4, 0x0
@@ -302,7 +302,7 @@
new-array v5, v2, [Ljava/lang/Object;
- const v6, 0x7f1212b6
+ const v6, 0x7f1212be
invoke-virtual {p0, v6}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -349,7 +349,7 @@
new-array v2, v2, [Ljava/lang/Object;
- const v5, 0x7f1212b7
+ const v5, 0x7f1212bf
invoke-virtual {p0, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.smali b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.smali
index 2429f041d7..3a8dfde5af 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFASteps.smali
@@ -254,7 +254,7 @@
const/4 v3, 0x0
- const v4, 0x7f120370
+ const v4, 0x7f120379
const/4 v5, 0x0
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeaderViewHolder.smali b/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeaderViewHolder.smali
index 74fd95f798..bbbc1d843d 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeaderViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceAdapter$PaymentSourceHeaderViewHolder.smali
@@ -80,7 +80,7 @@
if-ne p2, v0, :cond_0
- const p2, 0x7f120d70
+ const p2, 0x7f120d78
goto :goto_0
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceView.smali b/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceView.smali
index 3dd2bffde7..da59642702 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceView.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/PaymentSourceView.smali
@@ -194,7 +194,7 @@
aput-object v2, v1, v4
- const v2, 0x7f120dd4
+ const v2, 0x7f120ddc
invoke-static {p0, v2, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
@@ -244,7 +244,7 @@
aput-object p1, v0, v4
- const p1, 0x7f120dd6
+ const p1, 0x7f120dde
invoke-static {p0, p1, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String;
@@ -260,7 +260,7 @@
iget-object v0, p0, Lcom/discord/widgets/settings/billing/PaymentSourceView;->title:Landroid/widget/TextView;
- const v1, 0x7f120def
+ const v1, 0x7f120df7
invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1.smali
index d6043b1337..7a63df422b 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1.smali
@@ -63,7 +63,7 @@
iget-object p1, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$deletePaymentSource$1;->this$0:Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
- const v0, 0x7f120ddc
+ const v0, 0x7f120de4
const/4 v1, 0x0
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2.smali
index 4550736d71..c438ab3168 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2.smali
@@ -53,7 +53,7 @@
iget-object v3, v0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2;->this$0:Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
- const v4, 0x7f120dda
+ const v4, 0x7f120de2
invoke-virtual {v3, v4}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -61,7 +61,7 @@
iget-object v4, v0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2;->this$0:Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
- const v5, 0x7f120ddb
+ const v5, 0x7f120de3
invoke-virtual {v4, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -73,7 +73,7 @@
iget-object v5, v0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$initPaymentSourceInfo$2;->this$0:Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
- const v6, 0x7f120d61
+ const v6, 0x7f120d69
invoke-virtual {v5, v6}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1.smali
index bf8dc20936..4ab9b61325 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1.smali
@@ -63,7 +63,7 @@
iget-object p1, p0, Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog$updatePaymentSource$1;->this$0:Lcom/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog;
- const v0, 0x7f120ddf
+ const v0, 0x7f120de7
const/4 v1, 0x0
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.smali
index e76faf837d..53c5952455 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/WidgetPaymentSourceEditDialog.smali
@@ -1179,7 +1179,7 @@
if-eqz v3, :cond_0
- const v3, 0x7f120dde
+ const v3, 0x7f120de6
new-array v4, v10, [Ljava/lang/Object;
@@ -1194,7 +1194,7 @@
goto :goto_0
:cond_0
- const v3, 0x7f120ddd
+ const v3, 0x7f120de5
invoke-virtual {p0, v3}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -1478,7 +1478,7 @@
move-result-object p1
- const v0, 0x7f1202a1
+ const v0, 0x7f1202a3
invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -1490,7 +1490,7 @@
move-result-object p1
- const v0, 0x7f12029e
+ const v0, 0x7f1202a0
invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -1601,7 +1601,7 @@
sget-object v6, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
- const v7, 0x7f12029d
+ const v7, 0x7f12029f
invoke-virtual {v6, v7}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
@@ -1627,7 +1627,7 @@
sget-object v6, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
- const v8, 0x7f120295
+ const v8, 0x7f120297
invoke-virtual {v6, v8}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
@@ -1651,7 +1651,7 @@
sget-object v6, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
- const v8, 0x7f120298
+ const v8, 0x7f12029a
invoke-virtual {v6, v8}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
@@ -1693,12 +1693,12 @@
if-eqz p1, :cond_0
- const p1, 0x7f1202a2
+ const p1, 0x7f1202a4
goto :goto_0
:cond_0
- const p1, 0x7f1202a5
+ const p1, 0x7f1202a7
:goto_0
invoke-virtual {v6, p1}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
@@ -1727,7 +1727,7 @@
sget-object v5, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
- const v6, 0x7f1202a0
+ const v6, 0x7f1202a2
invoke-virtual {v5, v6}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
@@ -1759,7 +1759,7 @@
if-eqz v1, :cond_2
- const v2, 0x7f120de0
+ const v2, 0x7f120de8
invoke-virtual {p0, v2}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsBilling.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsBilling.smali
index ae6eb94e24..0a84eaaf91 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsBilling.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsBilling.smali
@@ -115,11 +115,11 @@
invoke-super {p0, p1}, Landroidx/fragment/app/Fragment;->onActivityCreated(Landroid/os/Bundle;)V
- const p1, 0x7f12028b
+ const p1, 0x7f12028d
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
- const p1, 0x7f121392
+ const p1, 0x7f12139a
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
@@ -163,7 +163,7 @@
new-instance v4, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;
- const v5, 0x7f1202d6
+ const v5, 0x7f1202d8
invoke-virtual {p0, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -183,7 +183,7 @@
new-instance v4, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;
- const v5, 0x7f1202d0
+ const v5, 0x7f1202d2
invoke-virtual {p0, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsPaymentHistory.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsPaymentHistory.smali
index 2dbcb7f0b4..641d621b1a 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsPaymentHistory.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsPaymentHistory.smali
@@ -157,7 +157,7 @@
invoke-static {v2, v3}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-virtual {p1, v2}, Lcom/discord/utilities/auth/AuthUtils;->getWebHandoffUrl(Landroid/net/Uri;)Lrx/Observable;
+ invoke-virtual {p1, v2}, Lcom/discord/utilities/auth/AuthUtils;->getBillingWebHandoffUrl(Landroid/net/Uri;)Lrx/Observable;
move-result-object p1
@@ -177,7 +177,7 @@
move-result-object v1
- const-string p1, "AuthUtils\n .getWe\u2026AppTransformers.ui(this))"
+ const-string p1, "AuthUtils\n .getBi\u2026AppTransformers.ui(this))"
invoke-static {v1, p1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting.smali
index 2a9440c3b0..55b1925954 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGifting.smali
@@ -561,7 +561,7 @@
if-eqz v3, :cond_3
- const v3, 0x7f1200e6
+ const v3, 0x7f1200e8
invoke-virtual {p0, v3}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -1471,7 +1471,7 @@
aput-object v6, v4, v3
- const v6, 0x7f1202de
+ const v6, 0x7f1202e0
invoke-virtual {v0, v6, v4}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -1513,7 +1513,7 @@
aput-object v7, v4, v3
- const v7, 0x7f1202dc
+ const v7, 0x7f1202de
invoke-virtual {v0, v7, v4}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -1621,7 +1621,7 @@
invoke-static {v9, v8}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v4, 0x7f120f26
+ const v4, 0x7f120f2e
invoke-virtual {v0, v4}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -1671,7 +1671,7 @@
invoke-static {v9, v8}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v4, 0x7f120e61
+ const v4, 0x7f120e6a
invoke-virtual {v0, v4}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem.smali
index f321b0e11a..50ea390ee8 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsGiftingAdapter$EntitlementListItem.smali
@@ -642,12 +642,12 @@
if-eqz p1, :cond_3
- const v6, 0x7f120466
+ const v6, 0x7f12046f
goto :goto_1
:cond_3
- const v6, 0x7f120468
+ const v6, 0x7f120471
:goto_1
invoke-virtual {v5, v6}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -734,7 +734,7 @@
move-result-object v4
- const v5, 0x7f1207cf
+ const v5, 0x7f1207da
new-array v6, v11, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$getHeaderText$1.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$getHeaderText$1.smali
index 33cdc99f51..4be094cc59 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$getHeaderText$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium$getHeaderText$1.smali
@@ -68,7 +68,7 @@
if-ne v0, v1, :cond_0
- const v0, 0x7f120f1b
+ const v0, 0x7f120f23
goto :goto_0
@@ -80,7 +80,7 @@
throw v0
:cond_1
- const v0, 0x7f120f1a
+ const v0, 0x7f120f22
:goto_0
return v0
diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali
index 16cd56b07b..5184821023 100644
--- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali
@@ -1081,7 +1081,7 @@
new-instance v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
- const v3, 0x7f120370
+ const v3, 0x7f120379
invoke-virtual {v0, v3}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -1158,7 +1158,7 @@
new-instance v2, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
- const v3, 0x7f12102c
+ const v3, 0x7f121034
invoke-virtual {v0, v3}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -1197,7 +1197,7 @@
new-instance v3, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
- const v5, 0x7f1202c9
+ const v5, 0x7f1202cb
invoke-virtual {v0, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -1220,7 +1220,7 @@
new-instance v3, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$ButtonConfig;
- const v5, 0x7f120290
+ const v5, 0x7f120292
invoke-virtual {v0, v5}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -1819,7 +1819,7 @@
goto :goto_2
:cond_2
- const p1, 0x7f120e7a
+ const p1, 0x7f120e83
new-array v4, v3, [Ljava/lang/Object;
@@ -1848,7 +1848,7 @@
goto :goto_2
:cond_3
- const p1, 0x7f120e75
+ const p1, 0x7f120e7e
new-array v4, v3, [Ljava/lang/Object;
@@ -1947,7 +1947,7 @@
if-ne v0, v1, :cond_1
- const v0, 0x7f1202d3
+ const v0, 0x7f1202d5
goto :goto_0
@@ -1959,7 +1959,7 @@
throw p1
:cond_2
- const v0, 0x7f1202d4
+ const v0, 0x7f1202d6
:goto_0
invoke-virtual {p1}, Lcom/discord/models/domain/ModelSubscription;->getPlanType()Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;
@@ -1981,7 +1981,7 @@
goto :goto_1
:pswitch_0
- const v3, 0x7f120f63
+ const v3, 0x7f120f6b
invoke-virtual {p0, v3}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -1990,7 +1990,7 @@
goto :goto_1
:pswitch_1
- const v3, 0x7f120f62
+ const v3, 0x7f120f6a
invoke-virtual {p0, v3}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -2045,7 +2045,7 @@
aput-object v3, v5, v6
- const v3, 0x7f12125e
+ const v3, 0x7f121266
invoke-virtual {p0, v3}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -2957,7 +2957,7 @@
move-result-object v1
- const v2, 0x7f120f21
+ const v2, 0x7f120f29
new-array v3, v6, [Ljava/lang/Object;
@@ -3065,7 +3065,7 @@
:cond_2
:goto_0
- const v1, 0x7f120e40
+ const v1, 0x7f120e49
new-array v2, v6, [Ljava/lang/Object;
@@ -3117,7 +3117,7 @@
if-ne v1, v2, :cond_0
- const p3, 0x7f1202e4
+ const p3, 0x7f1202e6
goto :goto_0
@@ -3132,7 +3132,7 @@
if-ne p3, v1, :cond_1
- const p3, 0x7f1202ea
+ const p3, 0x7f1202ec
goto :goto_0
@@ -3145,7 +3145,7 @@
if-ne p3, v1, :cond_2
- const p3, 0x7f1202e2
+ const p3, 0x7f1202e4
goto :goto_0
@@ -3158,7 +3158,7 @@
if-ne p3, v1, :cond_3
- const p3, 0x7f1202e8
+ const p3, 0x7f1202ea
goto :goto_0
@@ -3270,7 +3270,7 @@
if-ne p1, v0, :cond_1
- const p1, 0x7f1205f7
+ const p1, 0x7f120600
new-array v0, v0, [Ljava/lang/Object;
@@ -3895,7 +3895,7 @@
invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V
- const v1, 0x7f120f71
+ const v1, 0x7f120f79
invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
@@ -3907,7 +3907,7 @@
move-result-object v0
- const v1, 0x7f120f70
+ const v1, 0x7f120f78
invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
@@ -3917,7 +3917,7 @@
invoke-direct {v1, p0}, Lcom/discord/widgets/settings/premium/WidgetSettingsPremium$showDowngradeModal$1;->(Lcom/discord/widgets/settings/premium/WidgetSettingsPremium;)V
- const v2, 0x7f120d61
+ const v2, 0x7f120d69
invoke-virtual {v0, v2, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setPositiveButton(ILkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
@@ -4226,11 +4226,11 @@
invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
- const p1, 0x7f121392
+ const p1, 0x7f12139a
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
- const p1, 0x7f120f66
+ const p1, 0x7f120f6e
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -4244,11 +4244,11 @@
move-result-object v2
- const v3, 0x7f120e51
+ const v3, 0x7f120e5a
new-array p1, p1, [Ljava/lang/Object;
- const v4, 0x7f1205ca
+ const v4, 0x7f1205d3
invoke-virtual {p0, v4}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -4256,7 +4256,7 @@
aput-object v4, p1, v1
- const v4, 0x7f1205c9
+ const v4, 0x7f1205d2
invoke-virtual {p0, v4}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -4266,7 +4266,7 @@
aput-object v4, p1, v5
- const v4, 0x7f1205c8
+ const v4, 0x7f1205d1
invoke-virtual {p0, v4}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -4286,7 +4286,7 @@
move-result-object p1
- const v2, 0x7f12097c
+ const v2, 0x7f120987
new-array v3, v5, [Ljava/lang/Object;
@@ -4316,7 +4316,7 @@
move-result-object p1
- const v2, 0x7f12097e
+ const v2, 0x7f120989
new-array v3, v5, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel.smali b/com.discord/smali/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel.smali
index f09b46eb95..6f410d0760 100644
--- a/com.discord/smali/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premiumguild/SettingsPremiumGuildViewModel.smali
@@ -297,7 +297,7 @@
new-instance p1, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$HeaderItem;
- const v2, 0x7f120ebf
+ const v2, 0x7f120ec8
invoke-direct {p1, v2}, Lcom/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$Item$HeaderItem;->(I)V
diff --git a/com.discord/smali/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription.smali b/com.discord/smali/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription.smali
index a44000e20d..e4f4e6c995 100644
--- a/com.discord/smali/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscription.smali
@@ -1300,11 +1300,11 @@
invoke-static {p0, v2, v0, v1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const v0, 0x7f121392
+ const v0, 0x7f12139a
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
- const v0, 0x7f120eff
+ const v0, 0x7f120f07
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -1364,7 +1364,7 @@
invoke-static {v3, p1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const p1, 0x7f120efe
+ const p1, 0x7f120f06
const/4 v4, 0x1
diff --git a/com.discord/smali/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$GuildListItem.smali b/com.discord/smali/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$GuildListItem.smali
index 50bab61022..ca478dc5d2 100644
--- a/com.discord/smali/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$GuildListItem.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$GuildListItem.smali
@@ -544,7 +544,7 @@
move-result-object v1
- const v2, 0x7f120ed9
+ const v2, 0x7f120ee1
new-array v3, v3, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem.smali b/com.discord/smali/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem.smali
index 5968d9bb76..390af6ea1f 100644
--- a/com.discord/smali/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem.smali
+++ b/com.discord/smali/com/discord/widgets/settings/premiumguild/WidgetSettingsPremiumGuildSubscriptionAdapter$PremiumGuildSubListItem.smali
@@ -586,7 +586,7 @@
if-eqz v6, :cond_5
- const v7, 0x7f120ef1
+ const v7, 0x7f120ef9
new-array v5, v15, [Ljava/lang/Object;
@@ -608,7 +608,7 @@
move-object/from16 v5, v16
- const v15, 0x7f120ef1
+ const v15, 0x7f120ef9
move-object v7, v3
@@ -638,7 +638,7 @@
aput-object v5, v2, v15
- const v5, 0x7f120ef1
+ const v5, 0x7f120ef9
invoke-virtual {v3, v5, v2}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -746,7 +746,7 @@
aput-object v4, v11, v13
- const v4, 0x7f120e7b
+ const v4, 0x7f120e84
invoke-virtual {v3, v4, v11}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -878,7 +878,7 @@
goto :goto_8
:cond_b
- const v6, 0x7f120ef6
+ const v6, 0x7f120efe
invoke-virtual {v3, v6}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali
index 0c98f87860..d61ea01951 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali
@@ -679,7 +679,7 @@
goto :goto_1
:cond_1
- const p1, 0x7f121319
+ const p1, 0x7f121321
:goto_1
invoke-virtual {v0, p1}, Landroid/widget/TextView;->setHint(I)V
@@ -1367,7 +1367,7 @@
if-eqz p5, :cond_0
- const v1, 0x7f1203b1
+ const v1, 0x7f1203ba
const/4 v2, 0x0
diff --git a/com.discord/smali/com/discord/widgets/spectate/StreamFeedbackSheetViewModel.smali b/com.discord/smali/com/discord/widgets/spectate/StreamFeedbackSheetViewModel.smali
index 89f7a5c8bb..0423fc3951 100644
--- a/com.discord/smali/com/discord/widgets/spectate/StreamFeedbackSheetViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/spectate/StreamFeedbackSheetViewModel.smali
@@ -136,11 +136,11 @@
sget-object v3, Lt/q/o;->d:Lt/q/o;
- const v4, 0x7f1211c3
+ const v4, 0x7f1211cb
- const v5, 0x7f1211d8
+ const v5, 0x7f1211e0
- const v6, 0x7f1211d3
+ const v6, 0x7f1211db # 1.9416E38f
move-object v1, v0
@@ -201,11 +201,11 @@
new-instance v6, Lcom/discord/widgets/feedback/FeedbackSheetViewModel$ViewState;
- const v3, 0x7f1211c3
+ const v3, 0x7f1211cb
- const v4, 0x7f1211d8
+ const v4, 0x7f1211e0
- const v5, 0x7f1211d3
+ const v5, 0x7f1211db # 1.9416E38f
move-object v0, v6
diff --git a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog$configureUI$1.smali b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog$configureUI$1.smali
index 3e1edb9e3f..e684e7b255 100644
--- a/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/spectate/WidgetSpectateReportProblemDialog$configureUI$1.smali
@@ -114,7 +114,7 @@
move-result-object p1
- const v0, 0x7f1211db # 1.9416E38f
+ const v0, 0x7f1211e3
const/4 v2, 0x0
diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali
index be5940c40f..f3fee90681 100644
--- a/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali
+++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali
@@ -472,7 +472,7 @@
invoke-direct {p2}, Ljava/lang/StringBuilder;->()V
- const v0, 0x7f120435
+ const v0, 0x7f12043e
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -497,7 +497,7 @@
if-eqz p2, :cond_1
- const p2, 0x7f120c77
+ const p2, 0x7f120c7e
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -695,7 +695,7 @@
move-result-object p1
- const p3, 0x7f120c7f
+ const p3, 0x7f120c86
new-array v0, v0, [Ljava/lang/Object;
@@ -750,7 +750,7 @@
move-result-object p2
- const p3, 0x7f120c7d
+ const p3, 0x7f120c84
new-array v0, v0, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali b/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali
index bd7f623350..d5ce7526ff 100644
--- a/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali
+++ b/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali
@@ -216,7 +216,7 @@
if-eqz v0, :cond_1
- const v2, 0x7f12125e
+ const v2, 0x7f121266
invoke-direct {p0, v0, v2}, Lcom/discord/widgets/tos/WidgetTosAccept;->getFormattedUrl(Landroid/content/Context;I)Ljava/lang/CharSequence;
@@ -240,7 +240,7 @@
if-eqz v0, :cond_2
- const v1, 0x7f120f98
+ const v1, 0x7f120fa0
invoke-direct {p0, v0, v1}, Lcom/discord/widgets/tos/WidgetTosAccept;->getFormattedUrl(Landroid/content/Context;I)Ljava/lang/CharSequence;
diff --git a/com.discord/smali/com/discord/widgets/user/Badge$Companion$onBadgeClick$1.smali b/com.discord/smali/com/discord/widgets/user/Badge$Companion$onBadgeClick$1.smali
index 1edc464856..acfa6c2d19 100644
--- a/com.discord/smali/com/discord/widgets/user/Badge$Companion$onBadgeClick$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/Badge$Companion$onBadgeClick$1.smali
@@ -83,7 +83,7 @@
iget-object v0, p0, Lcom/discord/widgets/user/Badge$Companion$onBadgeClick$1;->$context:Landroid/content/Context;
- const v1, 0x7f120f7e
+ const v1, 0x7f120f86
invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/user/Badge$Companion.smali b/com.discord/smali/com/discord/widgets/user/Badge$Companion.smali
index bc228ce758..d93f78da47 100644
--- a/com.discord/smali/com/discord/widgets/user/Badge$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/user/Badge$Companion.smali
@@ -84,7 +84,7 @@
const v7, 0x7f080388
- const v6, 0x7f121192
+ const v6, 0x7f12119a
invoke-virtual {v2, v6}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -123,7 +123,7 @@
const v7, 0x7f08037d
- const v6, 0x7f120db2
+ const v6, 0x7f120dba
invoke-virtual {v2, v6}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -162,7 +162,7 @@
const v7, 0x7f08037b
- const v6, 0x7f1209cf
+ const v6, 0x7f1209da
invoke-virtual {v2, v6}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -195,7 +195,7 @@
move-result v4
- const v6, 0x7f1209e0
+ const v6, 0x7f1209eb
const/4 v7, 0x0
@@ -229,7 +229,7 @@
const v10, 0x7f0802e8
:goto_1
- const v4, 0x7f1209d7
+ const v4, 0x7f1209e2
invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -306,7 +306,7 @@
const v10, 0x7f0802ea
:goto_3
- const v4, 0x7f1209d8
+ const v4, 0x7f1209e3
invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -320,7 +320,7 @@
aput-object v4, v9, v7
- const v4, 0x7f1209e0
+ const v4, 0x7f1209eb
invoke-virtual {v2, v4, v9}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -385,7 +385,7 @@
const v10, 0x7f0802ec
:goto_5
- const v1, 0x7f1209d9
+ const v1, 0x7f1209e4
invoke-virtual {v2, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -399,7 +399,7 @@
aput-object v1, v9, v7
- const v1, 0x7f1209e0
+ const v1, 0x7f1209eb
invoke-virtual {v2, v1, v9}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -430,7 +430,7 @@
move-result v1
- const v4, 0x7f120341
+ const v4, 0x7f12034a
if-eqz v1, :cond_c
@@ -512,7 +512,7 @@
const v10, 0x7f08037e
- const v4, 0x7f12055e
+ const v4, 0x7f120567
invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -539,7 +539,7 @@
move-result v1
- const v4, 0x7f120f66
+ const v4, 0x7f120f6e
if-eqz v1, :cond_f
@@ -551,7 +551,7 @@
move-result-object v11
- const v5, 0x7f120e34
+ const v5, 0x7f120e3d
new-array v9, v8, [Ljava/lang/Object;
@@ -755,7 +755,7 @@
move-result-object v12
- const v4, 0x7f120f00
+ const v4, 0x7f120f08
new-array v5, v8, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetBanUser$onViewBound$3$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetBanUser$onViewBound$3$1.smali
index 442e18550b..96da6796f1 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetBanUser$onViewBound$3$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetBanUser$onViewBound$3$1.smali
@@ -73,7 +73,7 @@
aput-object p1, v1, v2
- const p1, 0x7f120278
+ const p1, 0x7f12027a
invoke-virtual {v0, p1, v1}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2$1.smali
index df96033f6d..a6927130cd 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2$1.smali
@@ -73,7 +73,7 @@
aput-object p1, v1, v2
- const p1, 0x7f120b6b
+ const p1, 0x7f120b76
invoke-virtual {v0, p1, v1}, Landroidx/fragment/app/Fragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers.smali b/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers.smali
index 0023d3219f..29fbc93f46 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers.smali
@@ -143,7 +143,7 @@
invoke-direct {v0}, Ljava/lang/StringBuilder;->()V
- const v1, 0x7f120fa2
+ const v1, 0x7f120faa
invoke-virtual {p0, v1}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -287,7 +287,7 @@
iget-object v3, p0, Lcom/discord/widgets/user/WidgetPruneUsers;->estimateText:Lcom/discord/app/AppTextView;
- const v4, 0x7f120604
+ const v4, 0x7f12060d
const/4 v6, 0x2
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter.smali
index 22b97e2cb6..b505d0c284 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter.smali
@@ -473,7 +473,7 @@
move-result-object v0
- const v5, 0x7f121276
+ const v5, 0x7f12127e
new-array v4, v4, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions.smali
index 54dc09e920..d6ac8fce9a 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions.smali
@@ -179,7 +179,7 @@
if-eqz v0, :cond_2
- const v0, 0x7f1200ba
+ const v0, 0x7f1200bc
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarSubtitle(I)Lkotlin/Unit;
@@ -324,7 +324,7 @@
invoke-static {p0, v1, v0, p1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const p1, 0x7f120ff6
+ const p1, 0x7f120ffe
invoke-virtual {p0, p1}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali
index 43d100a14d..e3468b4e74 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali
@@ -118,7 +118,7 @@
const v0, 0x7f040286
- const v1, 0x7f120cb0
+ const v1, 0x7f120cb7
invoke-direct {p1, p2, p0, v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfileEmptyListItem;->(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;II)V
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends.smali
index c23d4ffdf3..0e0663207d 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends.smali
@@ -94,7 +94,7 @@
const v3, 0x7f1000d4
- const v4, 0x7f120c68
+ const v4, 0x7f120c6f
invoke-static {v1, v3, v4, v0, v2}, Lcom/discord/utilities/resources/StringResourceUtilsKt;->getQuantityString(Landroid/content/res/Resources;III[Ljava/lang/Object;)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter.smali
index 94ae9a2d45..e2085db898 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter.smali
@@ -118,7 +118,7 @@
const v0, 0x7f040287
- const v1, 0x7f120cb1
+ const v1, 0x7f120cb8
invoke-direct {p1, p2, p0, v0, v1}, Lcom/discord/widgets/user/profile/WidgetUserProfileEmptyListItem;->(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;II)V
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds.smali
index 917cf21abb..a1fc8295dc 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds.smali
@@ -112,7 +112,7 @@
const v3, 0x7f1000d5
- const v4, 0x7f120c69
+ const v4, 0x7f120c70
invoke-static {v1, v3, v4, v0, v2}, Lcom/discord/utilities/resources/StringResourceUtilsKt;->getQuantityString(Landroid/content/res/Resources;III[Ljava/lang/Object;)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserSetCustomStatus.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserSetCustomStatus.smali
index b05878d238..57bfa0f10e 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserSetCustomStatus.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserSetCustomStatus.smali
@@ -986,7 +986,7 @@
invoke-static {p0, v1, v0, p1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const v0, 0x7f1204ac
+ const v0, 0x7f1204b5
invoke-virtual {p0, v0}, Lcom/discord/app/AppFragment;->setActionBarTitle(I)Lkotlin/Unit;
@@ -1106,7 +1106,7 @@
move-result-object v3
- const v6, 0x7f1204b1
+ const v6, 0x7f1204ba
new-array v7, v5, [Ljava/lang/Object;
@@ -1156,7 +1156,7 @@
move-result-object v0
- const v2, 0x7f1204b0
+ const v2, 0x7f1204b9
new-array v3, v5, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel.smali
index 6f7b9e9ac9..2dcfb1f2ce 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserSetCustomStatusViewModel.smali
@@ -193,7 +193,7 @@
new-instance v1, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$Event$SetStatusFailure;
- const v2, 0x7f1204e9
+ const v2, 0x7f1204f2
invoke-direct {v1, v2}, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$Event$SetStatusFailure;->(I)V
@@ -209,7 +209,7 @@
new-instance v1, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$Event$SetStatusSuccess;
- const v2, 0x7f1204bc
+ const v2, 0x7f1204c5
invoke-direct {v1, v2}, Lcom/discord/widgets/user/WidgetUserSetCustomStatusViewModel$Event$SetStatusSuccess;->(I)V
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali
index 2c68ad489b..a3cbc82a05 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali
@@ -642,7 +642,7 @@
const v2, 0x7f0803be
- const v3, 0x7f12119e
+ const v3, 0x7f1211a6
const/4 v4, 0x0
@@ -670,7 +670,7 @@
const v2, 0x7f0803bc
- const v3, 0x7f12119a
+ const v3, 0x7f1211a2
invoke-static/range {v0 .. v6}, Lcom/discord/widgets/user/WidgetUserStatusSheet;->setupPresenceLayout$default(Lcom/discord/widgets/user/WidgetUserStatusSheet;Landroid/view/ViewGroup;IILjava/lang/Integer;ILjava/lang/Object;)V
@@ -690,9 +690,9 @@
const p2, 0x7f0803bb
- const v0, 0x7f121198
+ const v0, 0x7f1211a0
- const v1, 0x7f121199
+ const v1, 0x7f1211a1
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -716,9 +716,9 @@
const p2, 0x7f0803bd
- const v0, 0x7f12119b
+ const v0, 0x7f1211a3
- const v1, 0x7f12119c
+ const v1, 0x7f1211a4
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
diff --git a/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerify.smali b/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerify.smali
index 2dc19ebe1e..3062d139e1 100644
--- a/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerify.smali
+++ b/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerify.smali
@@ -27,7 +27,7 @@
.method private getBodyText(Landroid/content/Context;)Ljava/lang/CharSequence;
.locals 1
- const v0, 0x7f121408
+ const v0, 0x7f121410
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -59,7 +59,7 @@
aput-object v0, v1, v2
- const v0, 0x7f121410
+ const v0, 0x7f121418
invoke-virtual {p0, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify.smali b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify.smali
index 217bb44747..5d6f3dc1ba 100644
--- a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify.smali
+++ b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify.smali
@@ -139,7 +139,7 @@
aput-object p1, v0, v1
- const p1, 0x7f12140a
+ const p1, 0x7f121412
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/user/presence/ViewHolderGameRichPresence.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderGameRichPresence.smali
index bbcbb7156a..24e0cd24d1 100644
--- a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderGameRichPresence.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderGameRichPresence.smali
@@ -66,7 +66,7 @@
if-eqz v2, :cond_0
- const v3, 0x7f12136a
+ const v3, 0x7f121372
const/4 v4, 0x2
diff --git a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence.smali
index cdc1e2906f..4f4e79a214 100644
--- a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderMusicRichPresence.smali
@@ -261,7 +261,7 @@
invoke-static {v6, v7}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v7, 0x7f121364
+ const v7, 0x7f12136c
new-array v8, v4, [Ljava/lang/Object;
@@ -281,7 +281,7 @@
invoke-static {v5, v6}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v6, 0x7f121363
+ const v6, 0x7f12136b
new-array v7, v4, [Ljava/lang/Object;
@@ -361,7 +361,7 @@
invoke-static {p2, v5}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v1, 0x7f12134a
+ const v1, 0x7f121352
invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -382,7 +382,7 @@
invoke-static {p2, v5}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v1, 0x7f121367
+ const v1, 0x7f12136f
new-array v2, v4, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.smali
index 816a5570ac..614da0c365 100644
--- a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderPlatformRichPresence.smali
@@ -497,7 +497,7 @@
move-result-object p3
- const v2, 0x7f12134e
+ const v2, 0x7f121356
new-array v1, v1, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.smali
index 9e2346e81c..c295217878 100644
--- a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.smali
@@ -118,7 +118,7 @@
if-eqz v1, :cond_1
- const v0, 0x7f12136a
+ const v0, 0x7f121372
const/4 v2, 0x2
@@ -272,7 +272,7 @@
if-eqz v1, :cond_0
- const v5, 0x7f121359
+ const v5, 0x7f121361
new-array v6, v3, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderUserRichPresence.smali b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderUserRichPresence.smali
index 2d8a34ff51..1c7cd7ee39 100644
--- a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderUserRichPresence.smali
+++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderUserRichPresence.smali
@@ -485,7 +485,7 @@
if-eqz v2, :cond_1
- const v3, 0x7f12136a
+ const v3, 0x7f121372
const/4 v4, 0x2
@@ -890,7 +890,7 @@
move-result-wide v9
- const p1, 0x7f12136c
+ const p1, 0x7f121374
invoke-virtual {p0, p1}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->getString(I)Ljava/lang/String;
@@ -925,7 +925,7 @@
move-result-wide v9
- const p1, 0x7f12136e
+ const p1, 0x7f121376
invoke-virtual {p0, p1}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserProfileAdminView.smali b/com.discord/smali/com/discord/widgets/user/profile/UserProfileAdminView.smali
index ed075d40e0..f192e6b3b2 100644
--- a/com.discord/smali/com/discord/widgets/user/profile/UserProfileAdminView.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserProfileAdminView.smali
@@ -623,12 +623,12 @@
if-eqz v1, :cond_0
- const v1, 0x7f121010
+ const v1, 0x7f121018
goto :goto_0
:cond_0
- const v1, 0x7f120b66
+ const v1, 0x7f120b71
:goto_0
invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->getKickButton()Landroid/widget/TextView;
@@ -683,12 +683,12 @@
if-eqz v1, :cond_2
- const v1, 0x7f121125
+ const v1, 0x7f12112d
goto :goto_2
:cond_2
- const v1, 0x7f12111a
+ const v1, 0x7f121122
:goto_2
invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->getServerMuteButton()Landroid/widget/TextView;
@@ -747,12 +747,12 @@
if-eqz v1, :cond_4
- const v1, 0x7f121124
+ const v1, 0x7f12112c
goto :goto_4
:cond_4
- const v1, 0x7f121111
+ const v1, 0x7f121119
:goto_4
invoke-direct {p0}, Lcom/discord/widgets/user/profile/UserProfileAdminView;->getServerDeafenButton()Landroid/widget/TextView;
diff --git a/com.discord/smali/com/discord/widgets/user/profile/UserStatusPresenceCustomView.smali b/com.discord/smali/com/discord/widgets/user/profile/UserStatusPresenceCustomView.smali
index be8fa96a7c..a1d3a90d6b 100644
--- a/com.discord/smali/com/discord/widgets/user/profile/UserStatusPresenceCustomView.smali
+++ b/com.discord/smali/com/discord/widgets/user/profile/UserStatusPresenceCustomView.smali
@@ -521,7 +521,7 @@
move-result-object p1
- const v0, 0x7f1204ba
+ const v0, 0x7f1204c3
invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(I)V
diff --git a/com.discord/smali/com/discord/widgets/user/search/ViewGlobalSearchItem.smali b/com.discord/smali/com/discord/widgets/user/search/ViewGlobalSearchItem.smali
index f65cca950c..45d8d3abe8 100644
--- a/com.discord/smali/com/discord/widgets/user/search/ViewGlobalSearchItem.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/ViewGlobalSearchItem.smali
@@ -972,7 +972,7 @@
move-result-object v0
- const v1, 0x7f1206cb
+ const v1, 0x7f1206d4
invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$Companion.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$Companion.smali
index de07825345..8adf6a6474 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch$Companion.smali
@@ -67,7 +67,7 @@
new-array v0, v0, [Lkotlin/Pair;
- const v1, 0x7f1213fa
+ const v1, 0x7f121402
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -89,7 +89,7 @@
const/4 v1, 0x1
- const v2, 0x7f121267
+ const v2, 0x7f12126f # 1.94163E38f
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -109,7 +109,7 @@
const/4 v1, 0x2
- const v2, 0x7f121446
+ const v2, 0x7f12144e
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -129,7 +129,7 @@
const/4 v1, 0x3
- const v2, 0x7f121128
+ const v2, 0x7f121130
invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch.smali
index e8cef1afbf..e7f5827e8c 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch.smali
@@ -1212,7 +1212,7 @@
sget-object v2, Le/a/a/j;->i:Le/a/a/j$a;
- const v3, 0x7f1205ce
+ const v3, 0x7f1205d7
invoke-virtual {p0, v3}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -1389,7 +1389,7 @@
move-result-object p1
- const v1, 0x7f120fd4
+ const v1, 0x7f120fdc
invoke-virtual {p1, v1}, Landroid/widget/EditText;->setHint(I)V
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$Item.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$Item.smali
index 0f19a3f60b..20e1b4d6d7 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$Item.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchGuildsAdapter$Item.smali
@@ -172,7 +172,7 @@
if-eqz v0, :cond_1
- const v1, 0x7f1209c5
+ const v1, 0x7f1209d0
invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -240,7 +240,7 @@
invoke-virtual {p1, v0}, Landroid/widget/TextView;->setBackgroundResource(I)V
- const v0, 0x7f120c02
+ const v0, 0x7f120c09
new-array v1, v1, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion.smali
index 344a856afd..4bcc500287 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion.smali
@@ -1245,7 +1245,7 @@
new-instance v3, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
- const v6, 0x7f1211e9
+ const v6, 0x7f1211f1
const/4 v7, 0x0
@@ -1280,7 +1280,7 @@
new-instance v6, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
- const v17, 0x7f120fd1
+ const v17, 0x7f120fd9
const/16 v18, 0x0
@@ -1306,7 +1306,7 @@
new-instance v12, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
- const v7, 0x7f1211e9
+ const v7, 0x7f1211f1
const/4 v8, 0x0
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5.smali
index 870036efc1..d032587dd2 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureProfileActionButtons$5.smali
@@ -131,13 +131,13 @@
sget-object v5, Lcom/discord/widgets/notice/WidgetNoticeDialog;->Companion:Lcom/discord/widgets/notice/WidgetNoticeDialog$Companion;
- const v4, 0x7f120a57
+ const v4, 0x7f120a62
invoke-virtual {v1, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
move-result-object v7
- const v4, 0x7f121388
+ const v4, 0x7f121390
invoke-virtual {v1, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -147,13 +147,13 @@
invoke-static {v8, v4}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V
- const v4, 0x7f1206be
+ const v4, 0x7f1206c7
invoke-virtual {v1, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
move-result-object v9
- const v4, 0x7f1206c2
+ const v4, 0x7f1206cb
invoke-virtual {v1, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali
index a461144342..4c24639aad 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali
@@ -1045,7 +1045,7 @@
if-eqz v0, :cond_0
- const v2, 0x7f1206ca
+ const v2, 0x7f1206d3
invoke-virtual {v0, v1, v2}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->addRelationship(Ljava/lang/Integer;I)V
@@ -2540,7 +2540,7 @@
if-eqz v0, :cond_9
- const p1, 0x7f121386
+ const p1, 0x7f12138e
const/4 v0, 0x0
@@ -2757,7 +2757,7 @@
if-eqz v0, :cond_0
- const v1, 0x7f1206c3
+ const v1, 0x7f1206cc
invoke-virtual {v0, v1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->removeRelationship(I)V
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.smali
index ddc138be2f..a851fca7b8 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2.smali
@@ -65,7 +65,7 @@
iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$addRelationship$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
- const v0, 0x7f1204e9
+ const v0, 0x7f1204f2
invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2.smali
index 40100e7548..c1c9cfaaeb 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2.smali
@@ -65,7 +65,7 @@
iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildDeafenUser$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
- const v0, 0x7f1204e9
+ const v0, 0x7f1204f2
invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2.smali
index ceba0954d0..392d8a0027 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2.smali
@@ -65,7 +65,7 @@
iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$guildMuteUser$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
- const v0, 0x7f1204e9
+ const v0, 0x7f1204f2
invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.smali
index af33c67896..98b7a3d7cd 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2.smali
@@ -65,7 +65,7 @@
iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVideoCall$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
- const v0, 0x7f1204e9
+ const v0, 0x7f1204f2
invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.smali
index 5a80d629be..8377036e05 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2.smali
@@ -65,7 +65,7 @@
iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$launchVoiceCall$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
- const v0, 0x7f1204e9
+ const v0, 0x7f1204f2
invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.smali
index ec1551b8df..3e7952b39a 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1.smali
@@ -63,7 +63,7 @@
iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$1;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
- const v0, 0x7f120c31
+ const v0, 0x7f120c38
invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2.smali
index c4186028ad..736097debc 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2.smali
@@ -65,7 +65,7 @@
iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$moveUserToChannel$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
- const v0, 0x7f1204e9
+ const v0, 0x7f1204f2
invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.smali
index a7dcc8fc82..4ff8a0f83f 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2.smali
@@ -65,7 +65,7 @@
iget-object p1, p0, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel$removeRelationship$2;->this$0:Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;
- const v0, 0x7f1204e9
+ const v0, 0x7f1204f2
invoke-static {p1, v0}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->access$emitShowToastEvent(Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;I)V
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.smali
index 0d186f1a8b..5d9f9e5a33 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheetViewModel.smali
@@ -2072,7 +2072,7 @@
if-ne v0, v1, :cond_0
- const p1, 0x7f1203a1
+ const p1, 0x7f1203aa
invoke-direct {p0, p1}, Lcom/discord/widgets/user/usersheet/WidgetUserSheetViewModel;->emitShowToastEvent(I)V
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali
index c3bf344ffe..11a27a3fc9 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali
@@ -63,7 +63,7 @@
iget-object p1, p0, Lcom/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1;->this$0:Lcom/discord/widgets/voice/call/WidgetCallFailed;
- const v0, 0x7f1206ca
+ const v0, 0x7f1206d3
const/4 v1, 0x0
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed.smali
index d22cfeb148..c6ee8db8f6 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed.smali
@@ -203,7 +203,7 @@
move-result-object v0
- const v1, 0x7f120362
+ const v1, 0x7f12036b
const/4 v2, 0x1
@@ -393,7 +393,7 @@
move-result-object p1
- const v0, 0x7f121194
+ const v0, 0x7f12119c
invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -405,7 +405,7 @@
move-result-object p1
- const v0, 0x7f12008f
+ const v0, 0x7f120091
invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
@@ -417,7 +417,7 @@
move-result-object p1
- const v0, 0x7f120d61
+ const v0, 0x7f120d69
invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall.smali
index 4ac362c9e6..f2004468bd 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall.smali
@@ -879,7 +879,7 @@
move-result-object p1
- const v0, 0x7f12144a
+ const v0, 0x7f121452
invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(I)V
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$1$3.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$1$3.smali
index 980f861333..523968b739 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$1$3.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView$configureUI$1$3.smali
@@ -49,11 +49,11 @@
sget-object p1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion;
- invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getMediaSettings()Lcom/discord/stores/StoreMediaSettings;
+ invoke-virtual {p1}, Lcom/discord/stores/StoreStream$Companion;->getAudioDevices()Lcom/discord/stores/StoreAudioDevices;
move-result-object p1
- invoke-virtual {p1}, Lcom/discord/stores/StoreMediaSettings;->toggleOutputMode()V
+ invoke-virtual {p1}, Lcom/discord/stores/StoreAudioDevices;->toggleSpeakerOutput()V
return-void
.end method
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView.smali
index c696e014e0..3600031f9d 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView.smali
@@ -334,11 +334,11 @@
# virtual methods
.method public final configureUI(Lcom/discord/widgets/voice/model/CallModel;)V
- .locals 7
+ .locals 6
const/4 v0, 0x0
- if-eqz p1, :cond_6
+ if-eqz p1, :cond_5
invoke-direct {p0}, Lcom/discord/widgets/voice/call/WidgetPrivateCallControlsView;->getDisconnect()Landroid/view/View;
@@ -378,55 +378,41 @@
invoke-virtual {v1, v2}, Landroid/widget/ImageView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
- invoke-virtual {p1}, Lcom/discord/widgets/voice/model/CallModel;->getOutputMode()Lcom/discord/models/domain/ModelVoice$OutputMode;
+ invoke-virtual {p1}, Lcom/discord/widgets/voice/model/CallModel;->getAudioOutputDevice()Lcom/discord/stores/StoreAudioDevices$OutputDevice;
move-result-object v1
- sget-object v2, Lcom/discord/models/domain/ModelVoice$OutputMode;->SPEAKER:Lcom/discord/models/domain/ModelVoice$OutputMode;
+ instance-of v1, v1, Lcom/discord/stores/StoreAudioDevices$OutputDevice$Speaker;
- const/4 v3, 0x1
-
- const/4 v4, 0x0
-
- if-ne v1, v2, :cond_1
-
- const/4 v1, 0x1
-
- goto :goto_1
-
- :cond_1
- const/4 v1, 0x0
-
- :goto_1
invoke-direct {p0}, Lcom/discord/widgets/voice/call/WidgetPrivateCallControlsView;->getAudioOutputSelector()Landroid/widget/ImageView;
move-result-object v2
invoke-virtual {p0}, Landroid/widget/FrameLayout;->getResources()Landroid/content/res/Resources;
- move-result-object v5
+ move-result-object v3
- if-eqz v1, :cond_2
+ if-eqz v1, :cond_1
- const v6, 0x7f080115
+ const v4, 0x7f080115
- goto :goto_2
+ goto :goto_1
- :cond_2
- const v6, 0x7f080110
+ :cond_1
+ const v4, 0x7f080110
- :goto_2
- invoke-virtual {v5, v6, v0}, Landroid/content/res/Resources;->getDrawable(ILandroid/content/res/Resources$Theme;)Landroid/graphics/drawable/Drawable;
+ :goto_1
+ invoke-virtual {v3, v4, v0}, Landroid/content/res/Resources;->getDrawable(ILandroid/content/res/Resources$Theme;)Landroid/graphics/drawable/Drawable;
- move-result-object v5
+ move-result-object v3
- invoke-virtual {v2, v5}, Landroid/widget/ImageView;->setBackground(Landroid/graphics/drawable/Drawable;)V
+ invoke-virtual {v2, v3}, Landroid/widget/ImageView;->setBackground(Landroid/graphics/drawable/Drawable;)V
invoke-direct {p0}, Lcom/discord/widgets/voice/call/WidgetPrivateCallControlsView;->getAudioOutputSelector()Landroid/widget/ImageView;
move-result-object v2
- if-eqz v1, :cond_3
+ if-eqz v1, :cond_2
const v1, 0x7f060110
@@ -434,16 +420,16 @@
move-result v1
- goto :goto_3
+ goto :goto_2
- :cond_3
+ :cond_2
const v1, 0x7f06019e
invoke-static {p0, v1}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/view/View;I)I
move-result v1
- :goto_3
+ :goto_2
invoke-static {v2, v1}, Lcom/discord/utilities/color/ColorCompatKt;->tintWithColor(Landroid/widget/ImageView;I)V
invoke-direct {p0}, Lcom/discord/widgets/voice/call/WidgetPrivateCallControlsView;->getAudioOutputSelector()Landroid/widget/ImageView;
@@ -458,48 +444,52 @@
move-result-object v1
- if-eqz v1, :cond_4
+ const/4 v2, 0x1
+
+ const/4 v3, 0x0
+
+ if-eqz v1, :cond_3
const/4 v1, 0x1
- goto :goto_4
+ goto :goto_3
- :cond_4
+ :cond_3
const/4 v1, 0x0
- :goto_4
+ :goto_3
invoke-virtual {p1}, Lcom/discord/widgets/voice/model/CallModel;->getVideoDevices()Ljava/util/List;
- move-result-object v2
+ move-result-object v4
- invoke-interface {v2}, Ljava/util/Collection;->isEmpty()Z
+ invoke-interface {v4}, Ljava/util/Collection;->isEmpty()Z
- move-result v2
+ move-result v4
- xor-int/2addr v2, v3
+ xor-int/2addr v2, v4
invoke-direct {p0}, Lcom/discord/widgets/voice/call/WidgetPrivateCallControlsView;->getVideo()Landroid/widget/ImageView;
- move-result-object v3
+ move-result-object v4
const/4 v5, 0x2
- invoke-static {v3, v2, v4, v5, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+ invoke-static {v4, v2, v3, v5, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
invoke-direct {p0}, Lcom/discord/widgets/voice/call/WidgetPrivateCallControlsView;->getVideo()Landroid/widget/ImageView;
move-result-object v0
- if-eqz v1, :cond_5
+ if-eqz v1, :cond_4
const v2, 0x7f080402
- goto :goto_5
+ goto :goto_4
- :cond_5
+ :cond_4
const v2, 0x7f080401
- :goto_5
+ :goto_4
invoke-virtual {v0, v2}, Landroid/widget/ImageView;->setImageResource(I)V
invoke-direct {p0}, Lcom/discord/widgets/voice/call/WidgetPrivateCallControlsView;->getVideo()Landroid/widget/ImageView;
@@ -514,7 +504,7 @@
return-void
- :cond_6
+ :cond_5
const-string p1, "model"
invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali
index fab0cb6b2e..c6150d8ea4 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali
@@ -398,12 +398,12 @@
if-eqz v8, :cond_4
- const v8, 0x7f120a58
+ const v8, 0x7f120a63
goto :goto_2
:cond_4
- const v8, 0x7f120a53
+ const v8, 0x7f120a5e
:goto_2
invoke-virtual {v5, v8}, Landroid/widget/TextView;->setText(I)V
@@ -418,12 +418,12 @@
if-eqz v8, :cond_5
- const v8, 0x7f12142d
+ const v8, 0x7f121435
goto :goto_3
:cond_5
- const v8, 0x7f120b12
+ const v8, 0x7f120b1d
:goto_3
invoke-virtual {v5, v8}, Landroid/widget/TextView;->setText(I)V
@@ -495,12 +495,12 @@
if-eqz v0, :cond_8
- const v0, 0x7f120420
+ const v0, 0x7f120429
goto :goto_5
:cond_8
- const v0, 0x7f120421
+ const v0, 0x7f12042a
:goto_5
invoke-virtual {p0, v0}, Landroidx/fragment/app/Fragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali
index 6887fd0ed2..97ba9aa056 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali
@@ -396,7 +396,7 @@
move-result-object v0
- const v2, 0x7f120d64
+ const v2, 0x7f120d6c
const/4 v3, 0x1
diff --git a/com.discord/smali/com/discord/widgets/voice/feedback/CallFeedbackSheetViewModel.smali b/com.discord/smali/com/discord/widgets/voice/feedback/CallFeedbackSheetViewModel.smali
index 0a8ce87a71..9c5160cf0a 100644
--- a/com.discord/smali/com/discord/widgets/voice/feedback/CallFeedbackSheetViewModel.smali
+++ b/com.discord/smali/com/discord/widgets/voice/feedback/CallFeedbackSheetViewModel.smali
@@ -300,11 +300,11 @@
sget-object v3, Lt/q/o;->d:Lt/q/o;
- const v4, 0x7f120361
+ const v4, 0x7f12036a
- const v5, 0x7f120360
+ const v5, 0x7f120369
- const v6, 0x7f120355
+ const v6, 0x7f12035e
move-object v1, v0
@@ -381,11 +381,11 @@
new-instance v6, Lcom/discord/widgets/feedback/FeedbackSheetViewModel$ViewState;
- const v3, 0x7f120361
+ const v3, 0x7f12036a
- const v4, 0x7f120360
+ const v4, 0x7f120369
- const v5, 0x7f120355
+ const v5, 0x7f12035e
move-object v0, v6
diff --git a/com.discord/smali/com/discord/widgets/voice/feedback/FeedbackIssue.smali b/com.discord/smali/com/discord/widgets/voice/feedback/FeedbackIssue.smali
index d870c43a34..3ab76caa48 100644
--- a/com.discord/smali/com/discord/widgets/voice/feedback/FeedbackIssue.smali
+++ b/com.discord/smali/com/discord/widgets/voice/feedback/FeedbackIssue.smali
@@ -83,7 +83,7 @@
const-string v3, "OTHER"
- const v4, 0x7f12035e
+ const v4, 0x7f120367
invoke-direct {v1, v3, v2, v4}, Lcom/discord/widgets/voice/feedback/FeedbackIssue;->(Ljava/lang/String;II)V
@@ -97,7 +97,7 @@
const-string v3, "COULD_NOT_HEAR_AUDIO"
- const v4, 0x7f12035b
+ const v4, 0x7f120364
invoke-direct {v1, v3, v2, v4}, Lcom/discord/widgets/voice/feedback/FeedbackIssue;->(Ljava/lang/String;II)V
@@ -111,7 +111,7 @@
const-string v3, "NOBODY_COULD_HEAR_ME"
- const v4, 0x7f12035d
+ const v4, 0x7f120366
invoke-direct {v1, v3, v2, v4}, Lcom/discord/widgets/voice/feedback/FeedbackIssue;->(Ljava/lang/String;II)V
@@ -125,7 +125,7 @@
const-string v3, "AUDIO_ECHOS"
- const v4, 0x7f120357
+ const v4, 0x7f120360
invoke-direct {v1, v3, v2, v4}, Lcom/discord/widgets/voice/feedback/FeedbackIssue;->(Ljava/lang/String;II)V
@@ -139,7 +139,7 @@
const-string v3, "AUDIO_ROBOTIC"
- const v4, 0x7f120358
+ const v4, 0x7f120361
invoke-direct {v1, v3, v2, v4}, Lcom/discord/widgets/voice/feedback/FeedbackIssue;->(Ljava/lang/String;II)V
@@ -153,7 +153,7 @@
const-string v3, "AUDIO_CUT_IN_AND_OUT"
- const v4, 0x7f120356
+ const v4, 0x7f12035f
invoke-direct {v1, v3, v2, v4}, Lcom/discord/widgets/voice/feedback/FeedbackIssue;->(Ljava/lang/String;II)V
@@ -167,7 +167,7 @@
const-string v3, "VOLUME_TOO_LOW_OR_HIGH"
- const v4, 0x7f12035a
+ const v4, 0x7f120363
invoke-direct {v1, v3, v2, v4}, Lcom/discord/widgets/voice/feedback/FeedbackIssue;->(Ljava/lang/String;II)V
@@ -181,7 +181,7 @@
const-string v3, "BACKGROUND_NOISE_TOO_LOUD"
- const v4, 0x7f120359
+ const v4, 0x7f120362
invoke-direct {v1, v3, v2, v4}, Lcom/discord/widgets/voice/feedback/FeedbackIssue;->(Ljava/lang/String;II)V
@@ -195,7 +195,7 @@
const-string v3, "SPEAKERPHONE_ISSUE"
- const v4, 0x7f12035f
+ const v4, 0x7f120368
invoke-direct {v1, v3, v2, v4}, Lcom/discord/widgets/voice/feedback/FeedbackIssue;->(Ljava/lang/String;II)V
@@ -209,7 +209,7 @@
const-string v3, "HEADSET_OR_BLUETOOTH_ISSUE"
- const v4, 0x7f12035c
+ const v4, 0x7f120365
invoke-direct {v1, v3, v2, v4}, Lcom/discord/widgets/voice/feedback/FeedbackIssue;->(Ljava/lang/String;II)V
@@ -223,7 +223,7 @@
const-string v3, "STREAM_REPORT_BLACK"
- const v4, 0x7f1211c6
+ const v4, 0x7f1211ce
invoke-direct {v1, v3, v2, v4}, Lcom/discord/widgets/voice/feedback/FeedbackIssue;->(Ljava/lang/String;II)V
@@ -237,7 +237,7 @@
const-string v3, "STREAM_REPORT_BLURRY"
- const v4, 0x7f1211c7
+ const v4, 0x7f1211cf
invoke-direct {v1, v3, v2, v4}, Lcom/discord/widgets/voice/feedback/FeedbackIssue;->(Ljava/lang/String;II)V
@@ -251,7 +251,7 @@
const-string v3, "STREAM_REPORT_LAGGING"
- const v4, 0x7f1211d0
+ const v4, 0x7f1211d8
invoke-direct {v1, v3, v2, v4}, Lcom/discord/widgets/voice/feedback/FeedbackIssue;->(Ljava/lang/String;II)V
@@ -265,7 +265,7 @@
const-string v3, "STREAM_REPORT_OUT_OF_SYNC"
- const v4, 0x7f1211d2
+ const v4, 0x7f1211da
invoke-direct {v1, v3, v2, v4}, Lcom/discord/widgets/voice/feedback/FeedbackIssue;->(Ljava/lang/String;II)V
@@ -279,7 +279,7 @@
const-string v3, "STREAM_REPORT_AUDIO_MISSING"
- const v4, 0x7f1211c4
+ const v4, 0x7f1211cc
invoke-direct {v1, v3, v2, v4}, Lcom/discord/widgets/voice/feedback/FeedbackIssue;->(Ljava/lang/String;II)V
@@ -293,7 +293,7 @@
const/16 v3, 0xf
- const v4, 0x7f1211c5
+ const v4, 0x7f1211cd
invoke-direct {v1, v2, v3, v4}, Lcom/discord/widgets/voice/feedback/FeedbackIssue;->(Ljava/lang/String;II)V
@@ -309,7 +309,7 @@
const/16 v3, 0x10
- const v4, 0x7f1211ca
+ const v4, 0x7f1211d2
invoke-direct {v1, v2, v3, v4}, Lcom/discord/widgets/voice/feedback/FeedbackIssue;->(Ljava/lang/String;II)V
@@ -325,7 +325,7 @@
const/16 v3, 0x11
- const v4, 0x7f1211cb
+ const v4, 0x7f1211d3
invoke-direct {v1, v2, v3, v4}, Lcom/discord/widgets/voice/feedback/FeedbackIssue;->(Ljava/lang/String;II)V
@@ -341,7 +341,7 @@
const/16 v3, 0x12
- const v4, 0x7f1211cc
+ const v4, 0x7f1211d4
invoke-direct {v1, v2, v3, v4}, Lcom/discord/widgets/voice/feedback/FeedbackIssue;->