From 8a89d6a871fe94df9ce6b4112adc37962ec1eff5 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 29 Feb 2020 07:28:25 +0100 Subject: [PATCH] Changes of com.discord v1045 --- com.discord/apktool.yml | 6 +- .../assets/crashlytics-build.properties | 8 +- com.discord/original/AndroidManifest.xml | Bin 34484 -> 34484 bytes com.discord/res/values-bg/strings.xml | 3 - com.discord/res/values-cs/strings.xml | 3 - com.discord/res/values-da/strings.xml | 3 - com.discord/res/values-de/strings.xml | 3 - com.discord/res/values-el/strings.xml | 3 - com.discord/res/values-es-rES/strings.xml | 3 - com.discord/res/values-fi/strings.xml | 3 - com.discord/res/values-fr/strings.xml | 3 - com.discord/res/values-hr/strings.xml | 3 - com.discord/res/values-hu/strings.xml | 3 - com.discord/res/values-it/strings.xml | 3 - com.discord/res/values-ja/strings.xml | 3 - com.discord/res/values-ko/strings.xml | 3 - com.discord/res/values-lt/strings.xml | 3 - com.discord/res/values-nl/strings.xml | 3 - com.discord/res/values-no/strings.xml | 3 - com.discord/res/values-pl/strings.xml | 3 - com.discord/res/values-pt-rBR/strings.xml | 3 - com.discord/res/values-ro/strings.xml | 3 - com.discord/res/values-ru/strings.xml | 3 - com.discord/res/values-sv-rSE/strings.xml | 3 - com.discord/res/values-th/strings.xml | 3 - com.discord/res/values-tr/strings.xml | 3 - com.discord/res/values-uk/strings.xml | 3 - com.discord/res/values-vi/strings.xml | 3 - com.discord/res/values-zh-rCN/strings.xml | 3 - com.discord/res/values-zh-rTW/strings.xml | 3 - com.discord/res/values/strings.xml | 2 +- .../smali/com/discord/BuildConfig.smali | 6 +- .../activity/ModelActivityParty$Size.smali | 150 +++-- .../domain/activity/ModelActivityParty.smali | 64 +- .../discord/stores/StoreClientVersion.smali | 2 +- ...toreGuildSubscriptions$RangeComputer.smali | 8 +- .../analytics/AnalyticSuperProperties.smali | 6 +- ...ShallowPartitionCollection$Companion.smali | 2 +- .../collections/ShallowPartitionMap.smali | 2 +- .../collections/SnowflakePartitionMap.smali | 2 +- .../LeastRecentlyAddedSetSerializer.smali | 2 +- .../SnowflakePartitionMapSerializer.smali | 2 +- .../mg_recycler/DragAndDropAdapter.smali | 2 +- .../rest/RestAPI$AppHeadersProvider.smali | 2 +- .../textprocessing/MessageUtils.smali | 2 +- .../utilities/view/grid/FrameGridLayout.smali | 8 +- ...etChannelListUnreads$Model$Companion.smali | 4 +- .../WidgetChannelsListItemVoiceActions.smali | 566 +++++++++--------- ...tAdapter$WidgetCollapsedUserListItem.smali | 14 +- .../list/items/CollapsedUser$Companion.smali | 28 +- .../list/items/CollapsedUser$userId$2.smali | 2 +- .../channels/list/items/CollapsedUser.smali | 86 +-- .../ViewEmbedGameInvite$Model$Companion.smali | 56 +- .../chat/list/ViewEmbedGameInvite.smali | 28 +- ...hatListAdapter$ScrollToWithHighlight.smali | 2 +- ...erItemListenTogether$Model$Companion.smali | 142 ++--- ...getChatListAdapterItemListenTogether.smali | 2 +- .../widgets/debugging/WidgetFatalCrash.smali | 2 +- .../invite/ViewInviteSettingsSheet.smali | 4 +- .../widgets/settings/WidgetSettings.smali | 2 +- .../presence/ViewHolderGameRichPresence.smali | 57 +- .../ViewHolderStreamRichPresence.smali | 48 +- .../presence/ViewHolderUserRichPresence.smali | 57 +- ...teCall$initializeSystemUiListeners$1.smali | 2 +- com.discord/smali_classes2/a0/c0/a.smali | 2 +- com.discord/smali_classes2/a0/c0/f/k.smali | 4 +- com.discord/smali_classes2/a0/u$b.smali | 4 +- com.discord/smali_classes2/e/b/a/a/a.smali | 2 +- .../smali_classes2/e/k/a/c/e/p/g.smali | 78 ++- com.discord/{smali => smali_classes2}/o.smali | 0 .../smali_classes2/okhttp3/Headers$b.smali | 8 +- com.discord/smali_classes2/w/a0/b$a.smali | 4 +- com.discord/smali_classes2/w/a0/g$b$a.smali | 2 +- com.discord/smali_classes2/w/a0/g.smali | 2 +- com.discord/smali_classes2/w/a0/s.smali | 2 +- com.discord/smali_classes2/w/x/c.smali | 241 +++----- com.discord/smali_classes2/w/x/d.smali | 120 +++- com.discord/smali_classes2/w/x/e$a.smali | 34 ++ com.discord/smali_classes2/w/x/e.smali | 241 ++++++++ com.discord/smali_classes2/w/x/f.smali | 240 ++++++++ com.discord/smali_classes2/w/x/g.smali | 3 + com.discord/smali_classes2/x/a/a2/w.smali | 2 +- com.discord/smali_classes2/x/a/b2/b.smali | 2 +- com.discord/smali_classes2/x/a/b2/m.smali | 4 +- com.discord/smali_classes2/x/a/f0.smali | 4 +- com.discord/smali_classes2/x/a/z1/a.smali | 2 +- 86 files changed, 1530 insertions(+), 930 deletions(-) rename com.discord/{smali => smali_classes2}/o.smali (100%) create mode 100644 com.discord/smali_classes2/w/x/e$a.smali create mode 100644 com.discord/smali_classes2/w/x/e.smali create mode 100644 com.discord/smali_classes2/w/x/f.smali create mode 100644 com.discord/smali_classes2/w/x/g.smali diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index 7b0799aefe..06612f8a52 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-1044.apk +apkFileName: com.discord-1045.apk compressionType: false doNotCompress: - arsc @@ -190,5 +190,5 @@ usesFramework: tag: null version: 2.4.1-197d46-SNAPSHOT versionInfo: - versionCode: '1044' - versionName: '11.3' + versionCode: '1045' + versionName: '11.4' diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties index 409cb7837a..86495e6dbb 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! # -#Sat Feb 29 00:48:09 UTC 2020 -version_name=11.3 +#Sat Feb 29 04:59:37 UTC 2020 +version_name=11.4 package_name=com.discord -build_id=d0d6e9a5-e073-464c-864c-4ac3eb980073 -version_code=1044 +build_id=1ee9f684-7ed0-43ac-9f01-7dc57c512d1e +version_code=1045 app_name=com.discord diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index b1eab93499dda5f360f4a3a6718c5cc285296edd..ca16260359f27261dab52b65461af8507bb26e35 100644 GIT binary patch delta 23 ecmdne%e1AJX+sw$qsiuO&R$bS(anПубличните сървъри трябва да имат ясно публикувани правила и/или насоки за членове. Избери канала домакин. Настройки на публичен сървър Публичен - Настрой [Канали за обяви](%1$s), за да доставяш актуализации отвъд сървъра си. - *Ефект на тържествена сирена* Провери дали можеш да станещ част от Откриване на сървър, за да може повече хора да те намерят. Твоя сървър вече е публичен! Това съобщение ще бъде изпратено до всички сървъри, следващи този канал. Можеш да редактираш или изтриеш това съобщение по-късно и то ще се актуализира на всеки следващ сървър. @@ -4714,7 +4712,6 @@ NSFW каналите нямат филтър за нецензурно съдъ Когато инсталираш игри от Discord Store. Това прави игрите ти лесни за намиране чрез търсене в Windows. Действие Клавишна комбинация - [Научи повече за Krisp](%1$s) Текуща парола Отличител Имейл diff --git a/com.discord/res/values-cs/strings.xml b/com.discord/res/values-cs/strings.xml index 3f1bc07d80..a9e084c617 100644 --- a/com.discord/res/values-cs/strings.xml +++ b/com.discord/res/values-cs/strings.xml @@ -3697,8 +3697,6 @@ stažení desktopové aplikace." Veřejné servery musejí mít viditelná pravidla a/nebo zásady pro své členy. Vyber prosím kanál, na kterém budou zveřejněna. Nastavení veřejného serveru Veřejný - Nastav [Kanály oznámení](%1$s), které budou přinášet novinky nad rámec tvého serveru. - *Zvuky fanfár* Koukni, jestli splňuješ podmínky pro Vyhledávání serverů, aby tě mohlo najít více lidí. Tvůj server je nyní veřejný! Tato zpráva bude odeslána na všechny servery sledující tento kanál. Později můžeš tuto zprávu upravit nebo odstranit – aktualizuje se také na všech sledujících serverech. @@ -4674,7 +4672,6 @@ Podrž klávesu shift pro přímé nahrání." Při instalaci her z obchodu Discord Store. Kromě toho půjdou hry lépe najít pomocí vyhledávání ve Windows. Akční Klávesová zkratka - [Zjistit víc o Krisp](%1$s) Současné heslo Diskriminátor E-mail diff --git a/com.discord/res/values-da/strings.xml b/com.discord/res/values-da/strings.xml index 46b3a95e7d..45fcba5c8e 100644 --- a/com.discord/res/values-da/strings.xml +++ b/com.discord/res/values-da/strings.xml @@ -3679,8 +3679,6 @@ mens spillet er i fokus." Offentlige servere skal have tydeligt indsatte serverregler og/eller retningslinjer for medlemmer. Vælg den kanal, der er vært for dette. Indstillinger for offentlig server Offentlig - Opsæt [Bekendtgørelseskanaler](%1$s) for at levere opdateringer ud over din server. - * Airhorn lydeffekter * Kontroller, om du er kvalificeret til at være i serveropdagelse, så flere kan finde dig. Din server er nu offentlig! Denne besked vil blive sendt til alle servere, der følger denne kanal. Du kan redigere eller slette denne besked senere, og den vil blive opdateret på hver af følgende servere. @@ -4647,7 +4645,6 @@ Hold Shift-tasten nede for at uploade direkte." Opret en genvej til menuen Start Når spil installeres fra Discord Store. Lad dine spil kunne findes via Windows-søgning. Tast-tilknytning - [Få mere at vide om Krisp](%1$s) Nuværende adgangskode Diskriminator E-mail diff --git a/com.discord/res/values-de/strings.xml b/com.discord/res/values-de/strings.xml index c64c750c34..d612c6ed9f 100644 --- a/com.discord/res/values-de/strings.xml +++ b/com.discord/res/values-de/strings.xml @@ -3691,8 +3691,6 @@ Push-to-Talk-Erkennung zu ermöglichen, während du dich im Spiel befindest."Öffentliche Server müssen deutlich sichtbare Regeln und/oder Richtlinien für Mitglieder haben. Bitte wähle den Kanal aus, der diese beinhaltet. Einstellungen für öffentliche Server Öffentlich - Richte [Ankündigungskanäle](%1$s) ein, um Updates auch außerhalb deines Servers anzuzeigen. - *Fanfare* Überprüfe, ob „Server entdecken“ für dich infrage kommt, damit mehr Leute dich finden können. Dein Server ist jetzt öffentlich! Diese Nachricht wird an alle Server, die diesem Kanal folgen, geschickt. Du kannst sie später noch bearbeiten oder löschen. Sie wird dann auf den Servern entsprechend aktualisiert. @@ -4670,7 +4668,6 @@ Halte die Shifttaste gedrückt, um es direkt hochzuladen." Wenn du Spiele aus dem Discord Store installierst. Außerdem lässt sich dein Spiel so über die Windows-Suche finden. Aktion Hotkey - [Mehr über Krisp erfahren](%1$s) Aktuelles Passwort Tag-Nummer E-Mail diff --git a/com.discord/res/values-el/strings.xml b/com.discord/res/values-el/strings.xml index 0bf975ac46..d3a4a64c44 100644 --- a/com.discord/res/values-el/strings.xml +++ b/com.discord/res/values-el/strings.xml @@ -3720,8 +3720,6 @@ AFK. Αυτό δεν επηρεάζει τα προγράμματα περιήγ Οι δημόσιοι διακομιστές πρέπει να έχουν δημοσιεύσει εμφανώς κανόνες ή/και κατευθυντήριες γραμμές διακομιστή για τα μέλη. Επίλεξε το κανάλι που το φιλοξενεί. Ρυθμίσεις δημόσιου διακομιστή Δημόσιος - Ρύθμισε τα [Κανάλια ανακοινώσεων](%1$s) να παρέχουν ενημερώσεις και πέρα από τον διακομιστή σου. - *Ηχητικά εφέ τρομπέτας* Τσέκαρε αν πληροίς τις προϋποθέσεις για να περιλαμβάνεται ο διακομιστής σου στην Ανακάλυψη Διακομιστή, ώστε να μπορούν να σε βρουν περισσότερα άτομα. Ο διακομιστής σου έγινε δημόσιος! Αυτό το μήνυμα θα σταλεί σε όλους τους διακομιστές που ακολουθούν αυτό το κανάλι. Μπορείτε να επεξεργαστείτε ή να διαγράψετε αυτό το μήνυμα αργότερα, και θα ενημερωθεί αντίστοιχα ο κάθε διακομιστής που ακολουθεί. @@ -4710,7 +4708,6 @@ ping ήταν **%3$s ms**. Ο ρυθμός απώλειας εξερχόμενω Ομάδα Δημοσιότητας HypeSquad Ενέργεια Συντόμευση - [Μάθε περισσότερα για το Krisp](%1$s) Τρέχων κωδικός Διακριτικό Νέος κωδικός πρόσβασης diff --git a/com.discord/res/values-es-rES/strings.xml b/com.discord/res/values-es-rES/strings.xml index 1af7811f67..940dfa68ef 100644 --- a/com.discord/res/values-es-rES/strings.xml +++ b/com.discord/res/values-es-rES/strings.xml @@ -3680,8 +3680,6 @@ la detección de Pulsar para hablar mientras el juego está activo." Los servidores públicos deben mostrar con claridad las normas y directivas del mismo para los miembros. Selecciona el canal donde se muestran. Ajustes del servidor público Público - Configura [canales de anuncios](%1$s) para enviar actualizaciones a otros servidores. - *Sonido de sirena* Comprueba si cumples los requisitos de Descubrimiento de servidor para que te pueda encontrar más gente. ¡Tu servidor ya es público! Se enviará este mensaje a todos los servidores que sigan a este canal. Puedes editar o eliminar este mensaje más tarde, y se actualizará en todos los servidores que sigan al canal. @@ -4662,7 +4660,6 @@ Mantén pulsado Máyus para subir directamente." Cuando se instalen juegos de la tienda de Discord. Además, así tus juegos resultarán visibles en el buscador de Windows. Acción Atajo de teclado - [Más información sobre Krisp](%1$s) Contraseña actual Terminación numérica Correo electrónico diff --git a/com.discord/res/values-fi/strings.xml b/com.discord/res/values-fi/strings.xml index 8e8e873366..6ff70236ff 100644 --- a/com.discord/res/values-fi/strings.xml +++ b/com.discord/res/values-fi/strings.xml @@ -3731,8 +3731,6 @@ jotta radiopuhelintila toimii, kun pelin ikkuna on aktiivisena." Julkisten palvelimien sääntöjen tai toimintaohjeiden on oltava selkeästi esillä jäsenille. Valitse kanava, jossa ne ovat esillä. Julkisen palvelimen asetukset Julkinen - Määritä [tiedotekanavat](%1$s), niin voit välittää päivityksiä palvelimesi ulkopuolelle. - *Paineilmatorven töräytyksiä* Tarkista, täytätkö palvelinhaun vaatimukset, jotta voit helpottaa palvelimesi löytämistä. Palvelimesi on nyt julkinen! Tämä viesti lähetetään kaikille tätä kanavaa seuraaville palvelimille. Voit muokata viestiä myöhemmin tai poistaa sen. Viesti päivittyy vastaavasti kaikille seuraaville palvelimille. @@ -4717,7 +4715,6 @@ Jos haluat aloittaa lataamisen heti, pidä vaihtonäppäintä painettuna."Kun peli asennetaan Discordin kaupasta. Tällöin voit myös etsiä pelin Windowsin haulla. Toiminta Näppäinkomento - [Lue lisää Krispistä](%1$s) Nykyinen salasana Tunnusnumero Sähköposti diff --git a/com.discord/res/values-fr/strings.xml b/com.discord/res/values-fr/strings.xml index b9713420a1..d3b23962d1 100644 --- a/com.discord/res/values-fr/strings.xml +++ b/com.discord/res/values-fr/strings.xml @@ -3721,8 +3721,6 @@ puisse être utilisée même quand le jeu est à l'avant-plan." Suis les règles "Un serveur public doit disposer de règles ou d'une charte de serveur affichées clairement pour ses utilisateurs. Indique le salon qui les spécifie." Paramètres du serveur public - Configure des [salons des annonces](%1$s) qui enverront des mises à jour en dehors de ton serveur. - *Vuvuzelas* Vérifie si tu peux participer à Découverte de serveurs pour que plus de gens trouvent ton serveur. Ton serveur est désormais public ! Ce message va être envoyé à tous les serveurs qui suivent ce salon. Tu pourras toujours modifier ou supprimer ce message plus tard, et il sera mis à jour sur tous les serveurs abonnés. @@ -4698,7 +4696,6 @@ Maintiens la touche Maj pour uploader directement." Créer un raccourci dans le menu démarrer "Lors de l'installation de jeux depuis la boutique Discord. Permet également de rechercher tes jeux avec Windows Search." Raccourci clavier - [En savoir plus sur Krisp](%1$s) Mot de passe actuel Discriminateur E-mail diff --git a/com.discord/res/values-hr/strings.xml b/com.discord/res/values-hr/strings.xml index 00a76d060e..6a2503bdbb 100644 --- a/com.discord/res/values-hr/strings.xml +++ b/com.discord/res/values-hr/strings.xml @@ -3651,8 +3651,6 @@ aktivira se tipkama **%1$s**." Javni serveri moraju članovima jasno dati do znanja koja su pravila i/ili smjernice. Odaberi kanal na kojem se to nalazi. Postavke javnog servera Javno - Podesi [Kanale za najave](%1$s) kako bi tvoje obavijesti išle i izvan granica tvog servera. - *Trube, fanfare i drugo* Provjeri ispunjavaš li uvjete za ulaz u program Otkrivanje servera kako bi te više ljudi moglo pronaći. Tvoj server od sada je javan! Ova će poruka biti poslana svim serverima koji prate ovaj kanal. Kasnije možeš urediti ili izbrisati ovu poruku i ona će se ažurirati na svakom serveru koji prati. @@ -4622,7 +4620,6 @@ Drži shift za izravan prijenos." Pri instalaciji igara iz trgovine Discord. Isto tako, omogućuje da se tvoje igre mogu otkriti putem preko pretraživanja sustava Windows. Radnja Prečac - [Saznaj više o Krispu](%1$s) Trenutna lozinka E-pošta Nova lozinka diff --git a/com.discord/res/values-hu/strings.xml b/com.discord/res/values-hu/strings.xml index ae00f337c3..dac8927a3f 100644 --- a/com.discord/res/values-hu/strings.xml +++ b/com.discord/res/values-hu/strings.xml @@ -3715,8 +3715,6 @@ miközben a játékablak aktív." A nyilvános szerverek egyértelműen megadott szerveroldali szabályokkal és/vagy irányelvekkel kell rendelkezzenek a tagok számára. Válaszd ki az ezeket tartalmazó csatornát. Nyilvános szerver beállításai Nyilvános - Állítsd be a [bejelentési csatornákat](%1$s), hogy a szervereden kívülre is frissítéseket küldhess. - *Dudaszó hangeffektusok* Ellenőrizd, hogy jogosult vagy-e a szerverfelfedezésre, hogy még több ember megtalálhasson. A szervered innentől nyilvános! Ez az üzenet elküldésre kerül minden a csatornát követő szerverre. Később szerkesztheted vagy törölheted ezt az üzenetet, és ez minden követő szerveren megfelelően frissítve lesz. @@ -4702,7 +4700,6 @@ Nyomd a Shift gombot az azonnali feltöltéshez." Amikor játékokat telepítesz a Discord-áruházból. Felfedezhetővé teszi a játékokat a Windows-keresés számára. Művelet Gyorsgomb - [Tudj meg többet a Krispről](%1$s) Jelenlegi jelszó Megkülönböztető E-mail diff --git a/com.discord/res/values-it/strings.xml b/com.discord/res/values-it/strings.xml index 7cfaaa8461..655d271357 100644 --- a/com.discord/res/values-it/strings.xml +++ b/com.discord/res/values-it/strings.xml @@ -3707,8 +3707,6 @@ quando il gioco è in primo piano." I server pubblici devono avere regole e/o linee guida del server per gli utenti pubblicate con chiarezza. Ti preghiamo di selezionare il canale in cui si visualizzano. Impostazioni del server pubblico Pubblico - Imposta [canali delle notizie](%1$s) per fornire aggiornamenti non solo al tuo server. - *Applausi scroscianti* Controlla se hai i requisiti per apparire in Esplora server, così più gente potrà trovarti. Il tuo server è stato pubblicato! Questo messaggio verrà inviato a tutti server che seguono questo canale. Puoi modificare o cancellare il messaggio più tardi, esso verrà poi aggiornato di conseguenza su tutti i server che seguono. @@ -4687,7 +4685,6 @@ Tieni premuto Maiusc per caricare direttamente." Quando installi giochi dal negozio Discord. Inoltre potrai trovare i tuoi giochi con la ricerca Windows. Azione Associazione tasti - [Scopri di più su Krisp](%1$s) Password attuale Suffisso E-mail diff --git a/com.discord/res/values-ja/strings.xml b/com.discord/res/values-ja/strings.xml index d1cb3cd4f1..e8eb0e4070 100644 --- a/com.discord/res/values-ja/strings.xml +++ b/com.discord/res/values-ja/strings.xml @@ -3755,8 +3755,6 @@ Discordについて詳しい情報が必要ですか？" 公開サーバーは、メンバー用のサーバールールおよび／もしくはガイドラインを明示している必要があります。これをホストしているチャンネルを選択してください。 公開サーバーの設定 公開 - [アナウンスチャンネル](%1$s)を立ち上げ、あなたのサーバー外にも更新情報を届けましょう。 - *ファンファーレ* もっとたくさんの人々に見つけてもらうため、サーバー発見への参加要件を満たしているかチェックしましょう。 あなたのサーバーが公開されました！ このチャンネルをフォローしている全てのサーバーにこのメッセージが送信されます。後でこのメッセージの編集と削除ができ、各サーバーでその部分が更新されます。 @@ -4746,7 +4744,6 @@ Shiftを押しっぱなしですぐにアップロードします。" Discordストアからゲームをインストールする時に作成します。Windows検索でもゲームを見つけられるようになります。 アクション キー割り当て - [Krispについて](%1$s) 現在のパスワード 識別子 メールアドレス diff --git a/com.discord/res/values-ko/strings.xml b/com.discord/res/values-ko/strings.xml index edb623e4c1..810ebdb088 100644 --- a/com.discord/res/values-ko/strings.xml +++ b/com.discord/res/values-ko/strings.xml @@ -3749,8 +3749,6 @@ PC 앱을 받아주세요. [다운로드](onDownloadClick)" 공개 서버는 멤버가 볼 수 있도록 명확한 서버 규칙과 지침을 게재해야 해요. 이를 게시할 채널을 선택해주세요. 공개 서버 설정 공개 - [공지 채널](%1$s)을 설정해 업데이트 내용을 다른 서버에도 알리세요. - *폭죽 효과음* 사람들이 늘어날 수 있도록 서버 찾기 조건을 만족하는지 확인해보세요. 이제 서버가 공개되었습니다! 이 채널을 팔로우하는 모든 서버에 메시지가 전송돼요. 메시지는 나중에 수정하거나 삭제할 수 있고, 팔로우하는 서버에도 마찬가지로 적용될 거예요. @@ -4740,7 +4738,6 @@ Shift 키를 누른 상태로 놓으면 바로 올릴 수 있어요." Discord 스토어에서 게임을 설치할 때 시작 메뉴에 바로 가기를 만들어요. Windows 검색에서도 게임을 검색할 수 있어요. 명령 단축키 - [Krisp 자세히 알아보기](%1$s) 현재 비밀번호 식별 번호 이메일 diff --git a/com.discord/res/values-lt/strings.xml b/com.discord/res/values-lt/strings.xml index fe705b5fd3..61c5f49faa 100644 --- a/com.discord/res/values-lt/strings.xml +++ b/com.discord/res/values-lt/strings.xml @@ -3719,8 +3719,6 @@ galėtum Kalbėti visoje sistemoje." Vieši serveriai privalo aiškiai paskelbti serverio taisykles ir (arba) gaires, skirtas nariams. Pasirink kanalą, kuriame tai paskelbta. Viešo serverio nustatymai Viešas - Nustatyk [pranešimų kanalus](%1$s), kad siųstum naujienas už savo serverio ribų. - *Sirgalių sirenos garso efektai* Patikrink, ar atitinki reikalavimus, kad galėtum naudoti serverių atradimo funkciją ir tave galėtų rasti daugiau žmonių. Dabar tavo serveris yra viešas! Šis pranešimas bus išsiųstas į visus šį kanalą sekančius serverius. Šį pranešimą gali redaguoti arba pašalinti vėliau. Atitinkamai jis bus atnaujintas kiekviename sekančiame serveryje. @@ -4710,7 +4708,6 @@ Laikyk mygtuką shift tiesioginiam įkėlimui." Kai įdiegiami žaidimai iš Discord Parduotuvės. Tavo žaidimus taip pat galima atrasti naudojant Windows paiešką. Veiksmas Klavišų Trumpinys - [Sužinok daugiau apie Krisp](%1$s) Dabartinis slaptažodis Diskriminatorius El. paštas diff --git a/com.discord/res/values-nl/strings.xml b/com.discord/res/values-nl/strings.xml index 738b1eab1d..b12d31d5c7 100644 --- a/com.discord/res/values-nl/strings.xml +++ b/com.discord/res/values-nl/strings.xml @@ -3684,8 +3684,6 @@ detectie in te schakelen terwijl de game focus heeft." Openbare servers moeten duidelijk de serverregels en/of -richtlijnen voor leden plaatsen. Selecteer het kanaal dat dit host. Instellingen openbare server Openbaar - Stel [aankondigingskanalen](%1$s) in om updates buiten je server te geven. - *Luchthoorn-geluidseffecten* Controleer of je in aanmerking komt voor serverontdekking zodat meer mensen je kunnen vinden. Je server is nu openbaar! Dit bericht wordt gestuurd naar alle servers die dit kanaal volgen. Je kunt dit bericht later bewerken of verwijderen, waarna het wordt bijgewerkt/verwijderd in elke volgende server. @@ -4659,7 +4657,6 @@ Houd shift ingedrukt om direct te uploaden." Bij het installeren van games vanuit de Discord Store. Maakt ook je games vindbaar via Windows zoeken. Actie Toetsencombinatie - [Meer informatie over Krisp](%1$s) Huidig wachtwoord Identificatiecijfers E-mail diff --git a/com.discord/res/values-no/strings.xml b/com.discord/res/values-no/strings.xml index d46ed9de40..be1cb55c09 100644 --- a/com.discord/res/values-no/strings.xml +++ b/com.discord/res/values-no/strings.xml @@ -3629,8 +3629,6 @@ til datamaskinen din hvis du ønsker å bruke denne funksjonen uten å ha nettle Offentlige servere må ha tydelig publiserte serverregler og/eller -retningslinjer for medlemmer. Velg kanalen som er vert for dette. Offentlige serverinnstillinger Offentlig - Sett opp [kunngjøringskanaler](%1$s) for å levere oppdateringer utenfor serveren din. - *Lydeffekter fra lufthorn* Sjekk om du er kvalifisert til å være i serveroppdagelse slik at flere personer kan finne deg. Serveren din er nå offentlig! Denne meldingen blir sendt til alle serverne som følger denne kanalen. Du kan redigere eller slette denne meldingen senere, og den oppdateres tilsvarende på hver server som følger. @@ -4605,7 +4603,6 @@ Hold shift for å laste opp direkte." Opprett snarvei til startmenyen Når du installerer spill fra Discord Store. Gjør også spillene dine synlige via Windows-søk. Hurtigtast - [Finn ut mer om Krisp](%1$s) Nåværende passord Diskriminator E-postadresse diff --git a/com.discord/res/values-pl/strings.xml b/com.discord/res/values-pl/strings.xml index 02a469f930..d85f16efaf 100644 --- a/com.discord/res/values-pl/strings.xml +++ b/com.discord/res/values-pl/strings.xml @@ -3741,8 +3741,6 @@ podczas rozgrywki." Serwery publiczne muszą mieć wyraźnie przedstawione zasady lub wytyczne dotyczące serwera, które obowiązują członków. Wybierz kanał, na którym znajdą się te treści. Ustawienia serwera publicznego Publiczny - Ustaw [kanały ogłoszeniowe](%1$s), by przesyłać nowości poza serwer. - *Fanfary* Sprawdź, czy kwalifikujesz się do Wyszukiwania serwerów – wtedy więcej osób będzie mogło Cię znaleźć. Twój serwer jest teraz publiczny! Ta wiadomość zostanie wysłana na wszystkie serwery śledzące ten kanał. Możesz ją później edytować lub usunąć – zostanie odpowiednio zaktualizowana na każdym śledzącym serwerze. @@ -4727,7 +4725,6 @@ Przytrzymaj Shift, aby wysłać natychmiast." Podczas instalacji gier ze Sklepu Discorda. Twoje gry będzie także można znaleźć przez wyszukiwanie za pośrednictwem systemu Windows. Gry akcji Skrót klawiszowy - [Dowiedz się więcej o Krisp](%1$s) Bieżące hasło Numer rozróżniający „discriminator” Adres e-mail diff --git a/com.discord/res/values-pt-rBR/strings.xml b/com.discord/res/values-pt-rBR/strings.xml index 273d0e0991..49f7435355 100644 --- a/com.discord/res/values-pt-rBR/strings.xml +++ b/com.discord/res/values-pt-rBR/strings.xml @@ -3724,8 +3724,6 @@ Aperte para Falar possa ser usado enquanto o jogo estiver em primeiro plano."Servidores públicos precisam ter regras e/ou diretrizes claras e visíveis para os membros. Selecione o canal onde elas ficarão. Configurações do servidor público Público - Configure [Canais de Anúncios](%1$s) para enviar novidades além dos limites do seu servidor. - *Fogos de artifício* Veja se você pode estar no Descobrir Servidores, assim mais pessoas podem te achar. Seu servidor agora é público! Essa mensagem será enviada a todos os servidores que seguem esse canal. Você poderá editar ou excluir essa mensagem posteriormente e ela será atualizada de acordo em cada servidor seguindo esse canal. @@ -4709,7 +4707,6 @@ Pressione Shift para enviar diretamente." Ao instalar jogos da Loja Discord. Também permite que a busca do Windows encontre os jogos. Ação Atalho do teclado - [Saiba mais sobre Krisp](%1$s) Senha atual Discriminador E-mail diff --git a/com.discord/res/values-ro/strings.xml b/com.discord/res/values-ro/strings.xml index 9418bcc7f9..d6f45bfcc7 100644 --- a/com.discord/res/values-ro/strings.xml +++ b/com.discord/res/values-ro/strings.xml @@ -3686,8 +3686,6 @@ detectarea modului Push-to-talk în timpul jocului." Respectă regulamentul Serverele publice trebuie să aibă regulamentul pentru membri postat în mod vizibil. Te rugăm să selectezi canalul care le va găzdui. Setări server public - Setează [Canaluri pentru anunțuri](%1$s) pentru a trimite actualizări dincolo de server. - *Efecte sonore de claxon* Verifică dacă te îndeplinești cerințele funcției de Descoperire server, ca să te poată găsi mai multă lume. Server-ul tău e acum public! Acest mesaj va fi trimis la toate serverele care urmăresc acest canal. Îl poți edita sau șterge mai târziu și mesajul va fi actualizat în mod corespunzător pe fiecare server urmăritor. @@ -4668,7 +4666,6 @@ clientul Discord și începe să te bucuri de conversații chiar acum!" Atunci când instalezi jocuri din Magazinul Discord. De asemenea, permite ca jocurile tale să fie descoperite accesând funcția de căutare Windows. Acțiune Scurtătură - [Află mai multe despre Krisp](%1$s) Parolă actuală E-mail Parolă nouă diff --git a/com.discord/res/values-ru/strings.xml b/com.discord/res/values-ru/strings.xml index f5383f155e..16eb3c2ba2 100644 --- a/com.discord/res/values-ru/strings.xml +++ b/com.discord/res/values-ru/strings.xml @@ -3772,8 +3772,6 @@ На публичных серверах должны быть опубликованы правила и/или рекомендации для участников сервера. Выберите канал с ними. Настройки публичного сервера Публичный - Создайте [каналы с объявлениями](%1$s), чтобы публиковать новости на других серверах. - *Фанфары* Проверьте, удовлетворяете ли вы требованиям «Путешествия по серверам». Данная функция позволяет найти новых пользователей. Ваш сервер стал публичным! Это сообщение будет отправлено на все сервера, подписанные на этот канал. Если вы удалите или отредактируете это сообщение, оно будет автоматически изменено на всех подписанных серверах. @@ -4762,7 +4760,6 @@ При установке игр из Discord Store. Кроме того, игры можно будет находить через стандартный поиск Windows. Действие Горячие клавиши - [Узнайте больше о Krisp](%1$s) Текущий пароль Дискриминатор Электронная почта diff --git a/com.discord/res/values-sv-rSE/strings.xml b/com.discord/res/values-sv-rSE/strings.xml index b814cfdabd..27fdd99d54 100644 --- a/com.discord/res/values-sv-rSE/strings.xml +++ b/com.discord/res/values-sv-rSE/strings.xml @@ -3635,8 +3635,6 @@ medan spelet är i fokus." Offentliga servrar måste ha klara och tydliga serverregler och/eller riktlinjer för medlemmar. Välj värdkanal för detta. Inställningar för offentliga servrar Offentlig - Ställ in [Meddelandekanaler](%1$s) för att leverera uppdateringar bortom din server. - *Sirenljudeffekter* Kolla om du har vad som behövs för att vara med i Serveridentifiering så att fler personer kan hitta dig. Din server är nu offentlig! Det här meddelandet skickas till alla servrar som följer den här kanalen. Du kan redigera eller radera det här meddelandet senare och det kommer att uppdateras på motsvarande sätt på de följande servrarna. @@ -4609,7 +4607,6 @@ Håll inne skift för att ladda upp direkt." När du installerar spel från Discord-butiken kommer de även att kunna hittas med en Windows-sökning. Funktion Kortkommando - [Läs mer om Krisp](%1$s) Nuvarande lösenord Diskriminator E-post diff --git a/com.discord/res/values-th/strings.xml b/com.discord/res/values-th/strings.xml index 1cbb4bc190..2cc7e9839b 100644 --- a/com.discord/res/values-th/strings.xml +++ b/com.discord/res/values-th/strings.xml @@ -3722,8 +3722,6 @@ URL พิเศษใช้ได้เฉพาะตัวอักษร เ เซิร์ฟเวอร์สาธารณะจะต้องมีการโพสต์กฎหรือแนวทางของเซิร์ฟเวอร์ที่ชัดเจนให้แก่สมาชิก โปรดเลือกช่องเพื่อเป็นโฮสต์ การตั้งค่าเซิร์ฟเวอร์สาธารณะ สาธารณะ - ตั้งค่า [ช่องประกาศ](%1$s) ให้ส่งข้อมูลการอัปเดตออกไปนอกเซิร์ฟเวอร์ของคุณ - *เสียงแตรลมประกอบฉาก* ตรวจสอบว่าคุณผ่านเกณฑ์เพื่อเข้าร่วมการค้นพบเซิร์ฟเวอร์หรือไม่ เพื่อให้คนมากมายค้นหาคุณได้ เซิร์ฟเวอร์ของคุณเปิดสาธารณะแล้ว! ข้อความเหล่านี้จะถูกส่งถึงเซิร์ฟเวอร์ทั้งหมดที่ติดตามช่องนี้ คุณสามารถแก้ไขหรือลบข้อความนี้ภายหลัง และคุณจะอัพเดทแต่ละเซิร์ฟเวอร์ตามลำดับต่อไป @@ -4709,7 +4707,6 @@ Discord Client เพื่อเริ่มพูดคุยได้ตอ ขณะติดตั้งเกมจากร้านค้าของ Discord ทำให้เกมของคุณสามารถค้นหาได้ผ่านแถบค้นหาของ Windows แอกชัน ปุ่ม - [เรียนรู้เพิ่มเติมเกี่ยวกับ Krisp](%1$s) รหัสผ่านปัจจุบัน ตัวแบ่งแยก อีเมล diff --git a/com.discord/res/values-tr/strings.xml b/com.discord/res/values-tr/strings.xml index 73200e7c4e..5695485618 100644 --- a/com.discord/res/values-tr/strings.xml +++ b/com.discord/res/values-tr/strings.xml @@ -3710,8 +3710,6 @@ algılamasını etkinleştirmek için lütfen oyun odakta iken Discord'u yöneti Herkese açık sunucularda üyeler için sunucu kuralları ve/veya ilkeleri görünür bir biçimde paylaşılmalıdır. Lütfen buna sahip kanalı seç. Herkese Açık Sunucu Ayarları Herkese Açık - Güncellemeleri sunucunun dışına da göndermek için [Duyuru Kanallarını](%1$s) ayarla. - *Havalı korna efekti* Daha fazla insanın seni bulabilmesi için Sunucu Keşfi şartlarını sağlayıp sağlamadığına bak. Sunucun artık herkese açık! Bu mesaj, bu kanalı takip eden tüm sunuculara gönderilecektir. Bu mesajı daha sonra düzenleyebilir veya silebilirsin ve ilgili mesaj her sunucuda gerekli şekilde güncellenir. @@ -4695,7 +4693,6 @@ Doğrudan yüklemek için shift basılı tutun." "Oyunları Discord Mağazası'ndan kurarken. Oyunlarının Windows aramasında da çıkmasını sağlar." Eylem Tuş Ataması - [Krisp hakkında daha fazla bilgi al](%1$s) Mevcut Şifren Diskriminatör E-posta diff --git a/com.discord/res/values-uk/strings.xml b/com.discord/res/values-uk/strings.xml index fff0f8e415..bc79c91746 100644 --- a/com.discord/res/values-uk/strings.xml +++ b/com.discord/res/values-uk/strings.xml @@ -3745,8 +3745,6 @@ AFK. Це не впливає на браузери." Публічні сервери повинні мати чітко опубліковані правила сервера та (або) поради для учасників. Вибери канал, який містить таку інформацію. Налаштування публічного сервера Публічний - Налаштувати [канали оголошень](%1$s), щоб повідомляти про новини за межами твого сервера. - *Звукові ефекти з гучномовця* Дізнайся, чи відповідаєш ти вимогам, щоб увійти до категорії «Знайомство з серверами», і щоб тебе могло знайти більше людей. Твій сервер тепер публічний! Це повідомлення буде відправлено на всі сервери, які підписані на цей канал. Ти можеш редагувати або видалити це повідомлення пізніше, і такі зміни відобразяться на всіх підписаних серверах. @@ -4733,7 +4731,6 @@ AFK. Це не впливає на браузери." Коли встановлюєш ігри з магазину Discord. Також дозволяє шукати твої ігри через пошук Windows. Дія Гаряча клавіша - [Дізнатися більше про Krisp](%1$s) Поточний пароль Дискримінатор Електронна пошта diff --git a/com.discord/res/values-vi/strings.xml b/com.discord/res/values-vi/strings.xml index bad2fe336c..9b1d34c0dc 100644 --- a/com.discord/res/values-vi/strings.xml +++ b/com.discord/res/values-vi/strings.xml @@ -3706,8 +3706,6 @@ phát hiện Nhấn để Nói trong khi chơi game." Máy chủ công khai phải có các quy tắc và/hoặc hướng dẫn đăng một cách rõ ràng cho các thành viên tuân theo. Hãy chọn kênh đang đăng tải nội dung này. Cài Đặt Máy Chủ Công Khai Công Khai - Cài đặt [Các Kênh Thông Báo](%1$s) để truyền tải các bản cập nhật ra bên ngoài máy chủ của bạn. - *Hiệu ứng âm thanh tù và* Hãy kiểm tra xem bạn có đủ điều kiện xuất hiện trong mục Khám Phá Máy Chủ để nhiều người có thể tìm thấy bạn hơn hay không. Máy chủ của bạn giờ đã được công khai! Tin nhắn này sẽ được gửi đến tất cả các máy chủ đang theo dõi kênh này. Bạn có thể sửa hoặc xóa tin nhắn này sau, và nó cũng sẽ được cập nhật tương ứng trên từng máy chủ theo dõi kênh. @@ -4685,7 +4683,6 @@ Nhấn giữ shift để tải lên trực tiếp." Khi cài đặt trò chơi từ Cửa Hàng Discord. Đồng thời hiển thị trò chơi trên mục tìm kiếm của windows. Hành động Phím nóng - [Tìm hiểu thêm về Krisp](%1$s) Mật Khẩu Hiện Tại Bộ phân biệt Mật Khẩu Mới diff --git a/com.discord/res/values-zh-rCN/strings.xml b/com.discord/res/values-zh-rCN/strings.xml index 725244db71..e62ba84dce 100644 --- a/com.discord/res/values-zh-rCN/strings.xml +++ b/com.discord/res/values-zh-rCN/strings.xml @@ -3737,8 +3737,6 @@ 公开服务器必须为其成员清晰可见地公示服务器规则以及/或者使用指南。请选择进行发布的频道。 公开服务器设置 公开 - 设置[公告频道](%1$s)向服务器外发布更新内容。 - *气笛音效* 请检查您的资质是否可以加入“发现服务器”，加入之后便能有更多人找到您。 您的服务器已公开！ 该消息会发送至所有关注此频道的服务器中。您可以在晚些时候编辑或删除此消息，随后每个关注的服务器中都会进行相应的更新。 @@ -4727,7 +4725,6 @@ Discord客户端，和他们一起畅所欲言吧！" 从 Discord 商店中安装游戏时，在 Windows 搜索中也可以找到您的游戏。 动作 热键 - [了解 Krisp 详情](%1$s) 当前密码 鉴别码 电子邮件 diff --git a/com.discord/res/values-zh-rTW/strings.xml b/com.discord/res/values-zh-rTW/strings.xml index c476770a1d..29b2f14a4d 100644 --- a/com.discord/res/values-zh-rTW/strings.xml +++ b/com.discord/res/values-zh-rTW/strings.xml @@ -3737,8 +3737,6 @@ 公開伺服器必須清楚張貼伺服器成員規則及/或守則。請選擇要負責張貼的頻道。 公開伺服器設定 公開 - 設置[公告頻道](%1$s)即可於伺服器外發布更新。 - *喇叭音效* 請確認你是否符合加入探索伺服器的資格，讓更多人可以找到你。 你的伺服器已經公開了！ 系統將傳送此訊息至所有追蹤此頻道的伺服器。您之後可以編輯或刪除此訊息，在追蹤的所有伺服器中，訊息也將隨之更新。 @@ -4730,7 +4728,6 @@ Server Insights 是實驗性功能，未來有可能變更或移除。" 從 Discord 商店安裝遊戲時。也可用 Windows 搜尋功能尋找您的遊戲。 動作 快速鍵 - [進一步了解 Krisp](%1$s) 目前密碼 鑑別子 電子郵件 diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml index 5e690ec5af..6e8346f013 100644 --- a/com.discord/res/values/strings.xml +++ b/com.discord/res/values/strings.xml @@ -1006,7 +1006,7 @@ ONE MORE THING {fixed} OR Collapse Collapse Category - d0d6e9a5-e073-464c-864c-4ac3eb980073 + 1ee9f684-7ed0-43ac-9f01-7dc57c512d1e Coming Soon Search Animated GIFs on the Web Displays text with emphasis. diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali index 94b014ae3d..574af70fe2 100644 --- a/com.discord/smali/com/discord/BuildConfig.smali +++ b/com.discord/smali/com/discord/BuildConfig.smali @@ -38,11 +38,11 @@ .field public static final SAMSUNGxDISCORD_CLIENT_ID:Ljava/lang/String; = "97t47j218f" -.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1044" +.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1045" -.field public static final VERSION_CODE:I = 0x414 +.field public static final VERSION_CODE:I = 0x415 -.field public static final VERSION_NAME:Ljava/lang/String; = "11.3" +.field public static final VERSION_NAME:Ljava/lang/String; = "11.4" # direct methods diff --git a/com.discord/smali/com/discord/models/domain/activity/ModelActivityParty$Size.smali b/com.discord/smali/com/discord/models/domain/activity/ModelActivityParty$Size.smali index 97fbdef197..944380e71b 100644 --- a/com.discord/smali/com/discord/models/domain/activity/ModelActivityParty$Size.smali +++ b/com.discord/smali/com/discord/models/domain/activity/ModelActivityParty$Size.smali @@ -18,28 +18,28 @@ # instance fields -.field public current:I +.field public current:J -.field public max:I +.field public max:J # direct methods .method public constructor ()V - .locals 1 + .locals 2 invoke-direct {p0}, Ljava/lang/Object;->()V - const/4 v0, 0x0 + const-wide/16 v0, 0x0 - iput v0, p0, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->current:I + iput-wide v0, p0, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->current:J - iput v0, p0, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->max:I + iput-wide v0, p0, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->max:J return-void .end method .method public constructor (Ljava/util/List;)V - .locals 4 + .locals 6 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -51,43 +51,47 @@ invoke-direct {p0}, Ljava/lang/Object;->()V - const/4 v0, 0x0 + const-wide/16 v0, 0x0 - iput v0, p0, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->current:I + iput-wide v0, p0, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->current:J - iput v0, p0, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->max:I + iput-wide v0, p0, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->max:J invoke-interface {p1}, Ljava/util/List;->size()I - move-result v1 + move-result v2 - const/4 v2, 0x1 + const/4 v3, 0x1 - if-le v1, v2, :cond_0 + if-le v2, v3, :cond_0 - invoke-interface {p1, v0}, Ljava/util/List;->get(I)Ljava/lang/Object; + const/4 v4, 0x0 - move-result-object v3 + invoke-interface {p1, v4}, Ljava/util/List;->get(I)Ljava/lang/Object; - check-cast v3, Ljava/lang/Integer; + move-result-object v4 - invoke-virtual {v3}, Ljava/lang/Integer;->intValue()I + check-cast v4, Ljava/lang/Integer; - move-result v3 + invoke-virtual {v4}, Ljava/lang/Integer;->intValue()I + + move-result v4 + + int-to-long v4, v4 goto :goto_0 :cond_0 - const/4 v3, 0x0 + move-wide v4, v0 :goto_0 - iput v3, p0, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->current:I + iput-wide v4, p0, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->current:J - if-lez v1, :cond_1 + if-lez v2, :cond_1 - sub-int/2addr v1, v2 + sub-int/2addr v2, v3 - invoke-interface {p1, v1}, Ljava/util/List;->get(I)Ljava/lang/Object; + invoke-interface {p1, v2}, Ljava/util/List;->get(I)Ljava/lang/Object; move-result-object p1 @@ -95,10 +99,12 @@ invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I - move-result v0 + move-result p1 + + int-to-long v0, p1 :cond_1 - iput v0, p0, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->max:I + iput-wide v0, p0, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->max:J return-void .end method @@ -179,7 +185,9 @@ move-result p1 - iput p1, p0, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->max:I + int-to-long v0, p1 + + iput-wide v0, p0, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->max:J goto :goto_2 @@ -188,7 +196,9 @@ move-result p1 - iput p1, p0, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->current:I + int-to-long v0, p1 + + iput-wide v0, p0, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->current:J :goto_2 return-void @@ -203,7 +213,7 @@ .end method .method public equals(Ljava/lang/Object;)Z - .locals 4 + .locals 7 const/4 v0, 0x1 @@ -232,28 +242,32 @@ return v2 :cond_2 - invoke-virtual {p0}, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->getCurrent()I + invoke-virtual {p0}, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->getCurrent()J - move-result v1 + move-result-wide v3 - invoke-virtual {p1}, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->getCurrent()I + invoke-virtual {p1}, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->getCurrent()J - move-result v3 + move-result-wide v5 - if-eq v1, v3, :cond_3 + cmp-long v1, v3, v5 + + if-eqz v1, :cond_3 return v2 :cond_3 - invoke-virtual {p0}, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->getMax()I + invoke-virtual {p0}, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->getMax()J - move-result v1 + move-result-wide v3 - invoke-virtual {p1}, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->getMax()I + invoke-virtual {p1}, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->getMax()J - move-result p1 + move-result-wide v5 - if-eq v1, p1, :cond_4 + cmp-long p1, v3, v5 + + if-eqz p1, :cond_4 return v2 @@ -261,36 +275,52 @@ return v0 .end method -.method public getCurrent()I - .locals 1 +.method public getCurrent()J + .locals 2 - iget v0, p0, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->current:I + iget-wide v0, p0, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->current:J - return v0 + return-wide v0 .end method -.method public getMax()I - .locals 1 +.method public getMax()J + .locals 2 - iget v0, p0, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->max:I + iget-wide v0, p0, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->max:J - return v0 + return-wide v0 .end method .method public hashCode()I - .locals 2 + .locals 7 - invoke-virtual {p0}, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->getCurrent()I + invoke-virtual {p0}, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->getCurrent()J - move-result v0 + move-result-wide v0 - add-int/lit8 v0, v0, 0x3b + const/16 v2, 0x20 - mul-int/lit8 v0, v0, 0x3b + ushr-long v3, v0, v2 - invoke-virtual {p0}, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->getMax()I + xor-long/2addr v0, v3 - move-result v1 + long-to-int v1, v0 + + const/16 v0, 0x3b + + add-int/2addr v1, v0 + + invoke-virtual {p0}, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->getMax()J + + move-result-wide v3 + + mul-int/lit8 v1, v1, 0x3b + + ushr-long v5, v3, v2 + + xor-long v2, v5, v3 + + long-to-int v0, v2 add-int/2addr v1, v0 @@ -298,7 +328,7 @@ .end method .method public toString()Ljava/lang/String; - .locals 2 + .locals 3 const-string v0, "ModelActivityParty.Size(current=" @@ -306,21 +336,21 @@ move-result-object v0 - invoke-virtual {p0}, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->getCurrent()I + invoke-virtual {p0}, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->getCurrent()J - move-result v1 + move-result-wide v1 - invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; + invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder; const-string v1, ", max=" invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {p0}, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->getMax()I + invoke-virtual {p0}, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->getMax()J - move-result v1 + move-result-wide v1 - invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; + invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder; const-string v1, ")" diff --git a/com.discord/smali/com/discord/models/domain/activity/ModelActivityParty.smali b/com.discord/smali/com/discord/models/domain/activity/ModelActivityParty.smali index d156725ebe..96deb9a239 100644 --- a/com.discord/smali/com/discord/models/domain/activity/ModelActivityParty.smali +++ b/com.discord/smali/com/discord/models/domain/activity/ModelActivityParty.smali @@ -271,22 +271,22 @@ return v0 .end method -.method public getCurrentSize()I - .locals 1 +.method public getCurrentSize()J + .locals 2 iget-object v0, p0, Lcom/discord/models/domain/activity/ModelActivityParty;->size:Lcom/discord/models/domain/activity/ModelActivityParty$Size; if-eqz v0, :cond_0 - iget v0, v0, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->current:I + iget-wide v0, v0, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->current:J goto :goto_0 :cond_0 - const/4 v0, 0x0 + const-wide/16 v0, 0x0 :goto_0 - return v0 + return-wide v0 .end method .method public getId()Ljava/lang/String; @@ -297,43 +297,43 @@ return-object v0 .end method -.method public getMaxSize()I - .locals 1 - - iget-object v0, p0, Lcom/discord/models/domain/activity/ModelActivityParty;->size:Lcom/discord/models/domain/activity/ModelActivityParty$Size; - - if-eqz v0, :cond_0 - - iget v0, v0, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->max:I - - goto :goto_0 - - :cond_0 - const/4 v0, 0x0 - - :goto_0 - return v0 -.end method - -.method public getOpenSlots()I +.method public getMaxSize()J .locals 2 iget-object v0, p0, Lcom/discord/models/domain/activity/ModelActivityParty;->size:Lcom/discord/models/domain/activity/ModelActivityParty$Size; if-eqz v0, :cond_0 - iget v1, v0, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->max:I + iget-wide v0, v0, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->max:J - iget v0, v0, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->current:I - - sub-int/2addr v1, v0 - - return v1 + goto :goto_0 :cond_0 - const/4 v0, 0x0 + const-wide/16 v0, 0x0 - return v0 + :goto_0 + return-wide v0 +.end method + +.method public getOpenSlots()J + .locals 5 + + iget-object v0, p0, Lcom/discord/models/domain/activity/ModelActivityParty;->size:Lcom/discord/models/domain/activity/ModelActivityParty$Size; + + if-eqz v0, :cond_0 + + iget-wide v1, v0, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->max:J + + iget-wide v3, v0, Lcom/discord/models/domain/activity/ModelActivityParty$Size;->current:J + + sub-long/2addr v1, v3 + + return-wide v1 + + :cond_0 + const-wide/16 v0, 0x0 + + return-wide v0 .end method .method public getSize()Lcom/discord/models/domain/activity/ModelActivityParty$Size; diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali index b3646369d4..20609401ad 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, 0x414 + const/16 v0, 0x415 iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I diff --git a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$RangeComputer.smali b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$RangeComputer.smali index 266c618683..0b8f37cead 100644 --- a/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$RangeComputer.smali +++ b/com.discord/smali/com/discord/stores/StoreGuildSubscriptions$RangeComputer.smali @@ -90,18 +90,18 @@ const/4 v1, 0x0 - invoke-static {v1, p3}, Lw/x/c;->until(II)Lkotlin/ranges/IntRange; + invoke-static {v1, p3}, Lw/x/f;->until(II)Lkotlin/ranges/IntRange; move-result-object v1 invoke-virtual {v0, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z :cond_0 - invoke-static {p1, p2}, Lw/x/c;->until(II)Lkotlin/ranges/IntRange; + invoke-static {p1, p2}, Lw/x/f;->until(II)Lkotlin/ranges/IntRange; move-result-object p1 - invoke-static {p1, p3}, Lw/x/c;->step(Lkotlin/ranges/IntProgression;I)Lkotlin/ranges/IntProgression; + invoke-static {p1, p3}, Lw/x/f;->step(Lkotlin/ranges/IntProgression;I)Lkotlin/ranges/IntProgression; move-result-object p1 @@ -129,7 +129,7 @@ :goto_0 add-int v2, p2, p3 - invoke-static {p2, v2}, Lw/x/c;->until(II)Lkotlin/ranges/IntRange; + invoke-static {p2, v2}, Lw/x/f;->until(II)Lkotlin/ranges/IntRange; move-result-object v2 diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali index 9c67672ee5..f1ce87cdf4 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/1044" + const-string v4, "Discord-Android/1045" 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, 0x414 + const/16 v2, 0x415 invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -201,7 +201,7 @@ const/4 v1, 0x3 - const-string v2, "11.3" + const-string v2, "11.4" const-string v3, "" diff --git a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection$Companion.smali b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection$Companion.smali index 9a136cc026..2edade372c 100644 --- a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection$Companion.smali +++ b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection$Companion.smali @@ -72,7 +72,7 @@ const/4 v0, 0x0 - invoke-static {v0, p1}, Lw/x/c;->until(II)Lkotlin/ranges/IntRange; + invoke-static {v0, p1}, Lw/x/f;->until(II)Lkotlin/ranges/IntRange; move-result-object p1 diff --git a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap.smali b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap.smali index 8ebcf43ec7..ae83ff3407 100644 --- a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap.smali +++ b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionMap.smali @@ -73,7 +73,7 @@ const/4 v0, 0x0 - invoke-static {v0, p1}, Lw/x/c;->until(II)Lkotlin/ranges/IntRange; + invoke-static {v0, p1}, Lw/x/f;->until(II)Lkotlin/ranges/IntRange; move-result-object p1 diff --git a/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap.smali b/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap.smali index d4e9b37406..d63b2ce536 100644 --- a/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap.smali +++ b/com.discord/smali/com/discord/utilities/collections/SnowflakePartitionMap.smali @@ -64,7 +64,7 @@ const/4 v0, 0x0 - invoke-static {v0, p1}, Lw/x/c;->until(II)Lkotlin/ranges/IntRange; + invoke-static {v0, p1}, Lw/x/f;->until(II)Lkotlin/ranges/IntRange; move-result-object p1 diff --git a/com.discord/smali/com/discord/utilities/kryo/LeastRecentlyAddedSetSerializer.smali b/com.discord/smali/com/discord/utilities/kryo/LeastRecentlyAddedSetSerializer.smali index eb374bd4d0..31d4c31c24 100644 --- a/com.discord/smali/com/discord/utilities/kryo/LeastRecentlyAddedSetSerializer.smali +++ b/com.discord/smali/com/discord/utilities/kryo/LeastRecentlyAddedSetSerializer.smali @@ -65,7 +65,7 @@ const/4 v0, 0x0 - invoke-static {v0, p3}, Lw/x/c;->until(II)Lkotlin/ranges/IntRange; + invoke-static {v0, p3}, Lw/x/f;->until(II)Lkotlin/ranges/IntRange; move-result-object p3 diff --git a/com.discord/smali/com/discord/utilities/kryo/SnowflakePartitionMapSerializer.smali b/com.discord/smali/com/discord/utilities/kryo/SnowflakePartitionMapSerializer.smali index 22547a5731..f3f905735c 100644 --- a/com.discord/smali/com/discord/utilities/kryo/SnowflakePartitionMapSerializer.smali +++ b/com.discord/smali/com/discord/utilities/kryo/SnowflakePartitionMapSerializer.smali @@ -63,7 +63,7 @@ const/4 v0, 0x0 - invoke-static {v0, p3}, Lw/x/c;->until(II)Lkotlin/ranges/IntRange; + invoke-static {v0, p3}, Lw/x/f;->until(II)Lkotlin/ranges/IntRange; move-result-object p3 diff --git a/com.discord/smali/com/discord/utilities/mg_recycler/DragAndDropAdapter.smali b/com.discord/smali/com/discord/utilities/mg_recycler/DragAndDropAdapter.smali index 676c19c473..df134fdd34 100644 --- a/com.discord/smali/com/discord/utilities/mg_recycler/DragAndDropAdapter.smali +++ b/com.discord/smali/com/discord/utilities/mg_recycler/DragAndDropAdapter.smali @@ -90,7 +90,7 @@ const/4 v1, 0x0 - invoke-static {v1, v0}, Lw/x/c;->until(II)Lkotlin/ranges/IntRange; + invoke-static {v1, v0}, Lw/x/f;->until(II)Lkotlin/ranges/IntRange; move-result-object v0 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 fb417b8f10..e8e2ee5cd6 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/1044" + const-string v0, "Discord-Android/1045" return-object v0 .end method diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali index 36655aaf34..609b4e1031 100644 --- a/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali +++ b/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali @@ -212,7 +212,7 @@ move-result p1 - invoke-static {v2, p1}, Lw/x/c;->until(II)Lkotlin/ranges/IntRange; + invoke-static {v2, p1}, Lw/x/f;->until(II)Lkotlin/ranges/IntRange; move-result-object p1 diff --git a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout.smali b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout.smali index 2dd6ed6235..1acccfba71 100644 --- a/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout.smali +++ b/com.discord/smali/com/discord/utilities/view/grid/FrameGridLayout.smali @@ -249,7 +249,7 @@ move-result v1 - invoke-static {v0, v1}, Lw/x/c;->until(II)Lkotlin/ranges/IntRange; + invoke-static {v0, v1}, Lw/x/f;->until(II)Lkotlin/ranges/IntRange; move-result-object v0 @@ -514,7 +514,7 @@ const/4 v3, 0x0 - invoke-static {v3, v2}, Lw/x/c;->until(II)Lkotlin/ranges/IntRange; + invoke-static {v3, v2}, Lw/x/f;->until(II)Lkotlin/ranges/IntRange; move-result-object v2 @@ -714,7 +714,7 @@ const/4 v2, 0x0 - invoke-static {v1, v2}, Lw/x/c;->downTo(II)Lkotlin/ranges/IntProgression; + invoke-static {v1, v2}, Lw/x/f;->downTo(II)Lkotlin/ranges/IntProgression; move-result-object v1 @@ -796,7 +796,7 @@ const/4 v1, 0x0 - invoke-static {v1, v0}, Lw/x/c;->until(II)Lkotlin/ranges/IntRange; + invoke-static {v1, v0}, Lw/x/f;->until(II)Lkotlin/ranges/IntRange; move-result-object v0 diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Companion.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Companion.smali index 4a25f33d6c..de514b3357 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Companion.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads$Model$Companion.smali @@ -290,7 +290,7 @@ move-result v4 - invoke-static {v2, v4}, Lw/x/c;->until(II)Lkotlin/ranges/IntRange; + invoke-static {v2, v4}, Lw/x/f;->until(II)Lkotlin/ranges/IntRange; move-result-object v2 @@ -308,7 +308,7 @@ add-int/2addr p1, v1 - invoke-static {v4, p1}, Lw/x/c;->downTo(II)Lkotlin/ranges/IntProgression; + invoke-static {v4, p1}, Lw/x/f;->downTo(II)Lkotlin/ranges/IntProgression; move-result-object p1 diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions.smali index 8151ba2725..9a80565189 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions.smali @@ -382,413 +382,417 @@ .end method .method private final configureUI(Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;)V - .locals 14 + .locals 17 - if-nez p1, :cond_0 + move-object/from16 v0, p0 - invoke-virtual {p0}, Lcom/discord/app/AppBottomSheet;->dismiss()V + move-object/from16 v1, p1 + + if-nez v1, :cond_0 + + invoke-virtual/range {p0 .. p0}, Lcom/discord/app/AppBottomSheet;->dismiss()V return-void :cond_0 - invoke-virtual {p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->getGuild()Lcom/discord/models/domain/ModelGuild; + invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->getGuild()Lcom/discord/models/domain/ModelGuild; - move-result-object v0 + move-result-object v2 - if-eqz v0, :cond_1 + if-eqz v2, :cond_1 - invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->getIcon()Landroid/widget/ImageView; + invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->getIcon()Landroid/widget/ImageView; - move-result-object v1 + move-result-object v3 - invoke-virtual {p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->getGuild()Lcom/discord/models/domain/ModelGuild; + invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->getGuild()Lcom/discord/models/domain/ModelGuild; + + move-result-object v4 + + const/4 v5, 0x0 + + const/4 v6, 0x0 + + const/4 v7, 0x0 + + const/16 v8, 0x1c + + const/4 v9, 0x0 + + invoke-static/range {v3 .. v9}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Lcom/discord/models/domain/ModelGuild;ILcom/discord/utilities/images/MGImages$ChangeDetector;ZILjava/lang/Object;)V + + goto :goto_0 + + :cond_1 + invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->getIcon()Landroid/widget/ImageView; + + move-result-object v10 + + invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->getChannel()Lcom/discord/models/domain/ModelChannel; + + move-result-object v11 + + const/4 v12, 0x0 + + const/4 v13, 0x0 + + const/16 v14, 0xc + + const/4 v15, 0x0 + + invoke-static/range {v10 .. v15}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Lcom/discord/models/domain/ModelChannel;ILcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V + + :goto_0 + invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->getHeader()Landroid/widget/TextView; + + move-result-object v2 + + invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->getChannel()Lcom/discord/models/domain/ModelChannel; + + move-result-object v3 + + invoke-virtual {v3}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String; + + move-result-object v3 + + invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + + invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->getConnect()Landroid/widget/TextView; + + move-result-object v2 + + invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->getCanConnect()Z + + move-result v3 + + const/4 v4, 0x1 + + const/4 v5, 0x0 + + if-eqz v3, :cond_2 + + invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->isConnected()Z + + move-result v3 + + if-nez v3, :cond_2 + + const/4 v3, 0x1 + + goto :goto_1 + + :cond_2 + const/4 v3, 0x0 + + :goto_1 + const/4 v6, 0x2 + + const/4 v7, 0x0 + + invoke-static {v2, v3, v5, v6, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V + + new-instance v3, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$1; + + invoke-direct {v3, v0, v1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$1;->(Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;)V + + invoke-virtual {v2, v3}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V + + invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->getDisconnect()Landroid/widget/TextView; + + move-result-object v2 + + invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->getCanConnect()Z + + move-result v3 + + if-eqz v3, :cond_3 + + invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->isConnected()Z + + move-result v3 + + if-eqz v3, :cond_3 + + const/4 v3, 0x1 + + goto :goto_2 + + :cond_3 + const/4 v3, 0x0 + + :goto_2 + invoke-static {v2, v3, v5, v6, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V + + new-instance v3, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$2; + + invoke-direct {v3, v0, v1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$2;->(Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;)V + + invoke-virtual {v2, v3}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V + + invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->getInvite()Landroid/view/View; + + move-result-object v2 + + invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->getCanInvite()Z + + move-result v3 + + invoke-static {v2, v3, v5, v6, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V + + new-instance v3, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$3; + + invoke-direct {v3, v2, v1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$3;->(Landroid/view/View;Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;)V + + invoke-virtual {v2, v3}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V + + invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->getSettings()Landroid/view/View; + + move-result-object v2 + + invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->getCanManage()Z + + move-result v3 + + invoke-static {v2, v3, v5, v6, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V + + new-instance v3, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$4; + + invoke-direct {v3, v2, v0, v1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$4;->(Landroid/view/View;Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;)V + + invoke-virtual {v2, v3}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V + + invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->getSettingsDivider()Landroid/view/View; + + move-result-object v2 + + invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->getCanManage()Z + + move-result v3 + + invoke-static {v2, v3, v5, v6, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V + + invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->getConnectedUsers()Ljava/util/Map; + + move-result-object v2 + + invoke-interface {v2}, Ljava/util/Map;->values()Ljava/util/Collection; + + move-result-object v2 + + invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; move-result-object v2 const/4 v3, 0x0 - const/4 v4, 0x0 + :cond_4 + :goto_3 + invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z - const/4 v5, 0x0 + move-result v8 - const/16 v6, 0x1c + if-eqz v8, :cond_5 - const/4 v7, 0x0 - - invoke-static/range {v1 .. v7}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Lcom/discord/models/domain/ModelGuild;ILcom/discord/utilities/images/MGImages$ChangeDetector;ZILjava/lang/Object;)V - - goto :goto_0 - - :cond_1 - invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->getIcon()Landroid/widget/ImageView; + invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object; move-result-object v8 - invoke-virtual {p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->getChannel()Lcom/discord/models/domain/ModelChannel; + check-cast v8, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser; - move-result-object v9 + invoke-virtual {v8}, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->getVoiceState()Lcom/discord/models/domain/ModelVoice$State; - const/4 v10, 0x0 + move-result-object v8 - const/4 v11, 0x0 + if-eqz v8, :cond_4 - const/16 v12, 0xc - - const/4 v13, 0x0 - - invoke-static/range {v8 .. v13}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Lcom/discord/models/domain/ModelChannel;ILcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V - - :goto_0 - invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->getHeader()Landroid/widget/TextView; - - move-result-object v0 - - invoke-virtual {p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->getChannel()Lcom/discord/models/domain/ModelChannel; - - move-result-object v1 - - invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getName()Ljava/lang/String; - - move-result-object v1 - - invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V - - invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->getConnect()Landroid/widget/TextView; - - move-result-object v0 - - invoke-virtual {p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->getCanConnect()Z - - move-result v1 - - const/4 v2, 0x1 - - const/4 v3, 0x0 - - if-eqz v1, :cond_2 - - invoke-virtual {p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->isConnected()Z - - move-result v1 - - if-nez v1, :cond_2 - - const/4 v1, 0x1 - - goto :goto_1 - - :cond_2 - const/4 v1, 0x0 - - :goto_1 - const/4 v4, 0x2 - - const/4 v5, 0x0 - - invoke-static {v0, v1, v3, v4, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V - - new-instance v1, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$1; - - invoke-direct {v1, p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$1;->(Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;)V - - invoke-virtual {v0, v1}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V - - invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->getDisconnect()Landroid/widget/TextView; - - move-result-object v0 - - invoke-virtual {p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->getCanConnect()Z - - move-result v1 - - if-eqz v1, :cond_3 - - invoke-virtual {p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->isConnected()Z - - move-result v1 - - if-eqz v1, :cond_3 - - const/4 v1, 0x1 - - goto :goto_2 - - :cond_3 - const/4 v1, 0x0 - - :goto_2 - invoke-static {v0, v1, v3, v4, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V - - new-instance v1, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$2; - - invoke-direct {v1, p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$2;->(Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;)V - - invoke-virtual {v0, v1}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V - - invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->getInvite()Landroid/view/View; - - move-result-object v0 - - invoke-virtual {p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->getCanInvite()Z - - move-result v1 - - invoke-static {v0, v1, v3, v4, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V - - new-instance v1, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$3; - - invoke-direct {v1, v0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$3;->(Landroid/view/View;Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;)V - - invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V - - invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->getSettings()Landroid/view/View; - - move-result-object v0 - - invoke-virtual {p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->getCanManage()Z - - move-result v1 - - invoke-static {v0, v1, v3, v4, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V - - new-instance v1, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$4; - - invoke-direct {v1, v0, p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$$inlined$apply$lambda$4;->(Landroid/view/View;Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;)V - - invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V - - invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->getSettingsDivider()Landroid/view/View; - - move-result-object v0 - - invoke-virtual {p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->getCanManage()Z - - move-result v1 - - invoke-static {v0, v1, v3, v4, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V - - invoke-virtual {p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->getConnectedUsers()Ljava/util/Map; - - move-result-object v0 - - invoke-interface {v0}, Ljava/util/Map;->values()Ljava/util/Collection; - - move-result-object v0 - - invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; - - move-result-object v0 - - const/4 v1, 0x0 - - :cond_4 - :goto_3 - invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z - - move-result v6 - - if-eqz v6, :cond_5 - - invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object; - - move-result-object v6 - - check-cast v6, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser; - - invoke-virtual {v6}, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->getVoiceState()Lcom/discord/models/domain/ModelVoice$State; - - move-result-object v6 - - if-eqz v6, :cond_4 - - add-int/lit8 v1, v1, 0x1 + add-int/lit8 v3, v3, 0x1 goto :goto_3 :cond_5 - invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->getUsercount()Landroid/widget/TextView; + invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->getUsercount()Landroid/widget/TextView; - move-result-object v0 + move-result-object v2 - invoke-virtual {p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->getChannel()Lcom/discord/models/domain/ModelChannel; + invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->getChannel()Lcom/discord/models/domain/ModelChannel; - move-result-object v6 + move-result-object v8 - invoke-virtual {v6}, Lcom/discord/models/domain/ModelChannel;->getUserLimit()I + invoke-virtual {v8}, Lcom/discord/models/domain/ModelChannel;->getUserLimit()I - move-result v6 + move-result v8 - if-eqz v6, :cond_6 + if-eqz v8, :cond_6 - invoke-virtual {p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->getCanConnect()Z + invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->getCanConnect()Z - move-result v6 + move-result v8 - if-eqz v6, :cond_6 + if-eqz v8, :cond_6 - const/4 v6, 0x1 + const/4 v8, 0x1 goto :goto_4 :cond_6 - const/4 v6, 0x0 + const/4 v8, 0x0 :goto_4 - invoke-static {v0, v6, v3, v4, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V + invoke-static {v2, v8, v5, v6, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V - new-array v6, v4, [Ljava/lang/Object; + new-array v8, v6, [Ljava/lang/Object; - invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - move-result-object v1 + move-result-object v3 - aput-object v1, v6, v3 + aput-object v3, v8, v5 - invoke-virtual {p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->getChannel()Lcom/discord/models/domain/ModelChannel; + invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->getChannel()Lcom/discord/models/domain/ModelChannel; - move-result-object v1 + move-result-object v3 - invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getUserLimit()I + invoke-virtual {v3}, Lcom/discord/models/domain/ModelChannel;->getUserLimit()I - move-result v1 + move-result v3 - invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - move-result-object v1 + move-result-object v3 - aput-object v1, v6, v2 + aput-object v3, v8, v4 - array-length v1, v6 + array-length v3, v8 - invoke-static {v6, v1}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object; + invoke-static {v8, v3}, Ljava/util/Arrays;->copyOf([Ljava/lang/Object;I)[Ljava/lang/Object; - move-result-object v1 + move-result-object v3 - const-string v6, "%1s/%2s" + const-string v8, "%1s/%2s" - invoke-static {v6, v1}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String; + invoke-static {v8, v3}, Ljava/lang/String;->format(Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/String; - move-result-object v1 + move-result-object v3 - const-string v6, "java.lang.String.format(format, *args)" + const-string v8, "java.lang.String.format(format, *args)" - invoke-static {v1, v6}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v3, v8}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + invoke-virtual {v2, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V - invoke-virtual {p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->getConnectedUsers()Ljava/util/Map; + invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->getConnectedUsers()Ljava/util/Map; - move-result-object v0 + move-result-object v2 - invoke-interface {v0}, Ljava/util/Map;->values()Ljava/util/Collection; + invoke-interface {v2}, Ljava/util/Map;->values()Ljava/util/Collection; - move-result-object v0 + move-result-object v2 - new-instance v1, Ljava/util/ArrayList; + new-instance v3, Ljava/util/ArrayList; - invoke-direct {v1}, Ljava/util/ArrayList;->()V + invoke-direct {v3}, Ljava/util/ArrayList;->()V - invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; + invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; - move-result-object v0 + move-result-object v2 :cond_7 :goto_5 - invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z + invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z - move-result v6 + move-result v8 - if-eqz v6, :cond_9 + if-eqz v8, :cond_9 - invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object; + invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object; - move-result-object v6 + move-result-object v8 - check-cast v6, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser; + check-cast v8, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser; - invoke-virtual {v6}, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->getVoiceState()Lcom/discord/models/domain/ModelVoice$State; - - move-result-object v7 - - if-eqz v7, :cond_8 - - new-instance v7, Lcom/discord/widgets/channels/list/items/CollapsedUser; - - invoke-virtual {v6}, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->getUser()Lcom/discord/models/domain/ModelUser; + invoke-virtual {v8}, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->getVoiceState()Lcom/discord/models/domain/ModelVoice$State; move-result-object v9 - const/4 v10, 0x0 + if-eqz v9, :cond_8 - const/4 v11, 0x0 + new-instance v9, Lcom/discord/widgets/channels/list/items/CollapsedUser; - const/4 v12, 0x6 + invoke-virtual {v8}, Lcom/discord/stores/StoreVoiceParticipants$VoiceUser;->getUser()Lcom/discord/models/domain/ModelUser; - const/4 v13, 0x0 + move-result-object v11 - move-object v8, v7 + const/4 v12, 0x0 - invoke-direct/range {v8 .. v13}, Lcom/discord/widgets/channels/list/items/CollapsedUser;->(Lcom/discord/models/domain/ModelUser;ZIILkotlin/jvm/internal/DefaultConstructorMarker;)V + const-wide/16 v13, 0x0 + + const/4 v15, 0x6 + + const/16 v16, 0x0 + + move-object v10, v9 + + invoke-direct/range {v10 .. v16}, Lcom/discord/widgets/channels/list/items/CollapsedUser;->(Lcom/discord/models/domain/ModelUser;ZJILkotlin/jvm/internal/DefaultConstructorMarker;)V goto :goto_6 :cond_8 - move-object v7, v5 + move-object v9, v7 :goto_6 - if-eqz v7, :cond_7 + if-eqz v9, :cond_7 - invoke-interface {v1, v7}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z + invoke-interface {v3, v9}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z goto :goto_5 :cond_9 - invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->getCopyId()Landroid/view/View; + invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->getCopyId()Landroid/view/View; - move-result-object v0 + move-result-object v2 - invoke-virtual {p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->isDeveloper()Z + invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;->isDeveloper()Z - move-result v6 + move-result v8 - invoke-static {v0, v6, v3, v4, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V + invoke-static {v2, v8, v5, v6, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V - invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->getCopyId()Landroid/view/View; + invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->getCopyId()Landroid/view/View; - move-result-object v0 + move-result-object v2 - new-instance v6, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$7; + new-instance v8, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$7; - invoke-direct {v6, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$7;->(Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;)V + invoke-direct {v8, v1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$configureUI$7;->(Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions$Model;)V - invoke-virtual {p0, v0, v6}, Lcom/discord/app/AppBottomSheet;->setOnClickAndDismissListener(Landroid/view/View;Lkotlin/jvm/functions/Function1;)V + invoke-virtual {v0, v2, v8}, Lcom/discord/app/AppBottomSheet;->setOnClickAndDismissListener(Landroid/view/View;Lkotlin/jvm/functions/Function1;)V - iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->adapter:Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter; + iget-object v1, v0, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->adapter:Lcom/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter; - if-eqz p1, :cond_a + if-eqz v1, :cond_a - invoke-virtual {p1, v1}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;->setData(Ljava/util/List;)V + invoke-virtual {v1, v3}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;->setData(Ljava/util/List;)V - invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->getRecyclerview()Landroidx/recyclerview/widget/RecyclerView; + invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemVoiceActions;->getRecyclerview()Landroidx/recyclerview/widget/RecyclerView; - move-result-object p1 + move-result-object v1 - invoke-interface {v1}, Ljava/util/Collection;->isEmpty()Z + invoke-interface {v3}, Ljava/util/Collection;->isEmpty()Z - move-result v0 + move-result v2 - xor-int/2addr v0, v2 + xor-int/2addr v2, v4 - invoke-static {p1, v0, v3, v4, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V + invoke-static {v1, v2, v5, v6, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V return-void :cond_a - const-string p1, "adapter" + const-string v1, "adapter" - invoke-static {p1}, Lw/u/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V + invoke-static {v1}, Lw/u/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V - throw v5 + throw v7 .end method .method private final getConnect()Landroid/widget/TextView; diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$WidgetCollapsedUserListItem.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$WidgetCollapsedUserListItem.smali index 21c8a67096..ae54d56ecf 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$WidgetCollapsedUserListItem.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetCollapsedUsersListAdapter$WidgetCollapsedUserListItem.smali @@ -176,9 +176,13 @@ if-eqz p2, :cond_1 - invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/CollapsedUser;->getExtraCount()I + invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/CollapsedUser;->getExtraCount()J - move-result p1 + move-result-wide v0 + + const-wide/16 v2, 0x0 + + cmp-long p1, v0, v2 if-lez p1, :cond_0 @@ -192,11 +196,11 @@ move-result-object v0 - invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/CollapsedUser;->getExtraCount()I + invoke-virtual {p2}, Lcom/discord/widgets/channels/list/items/CollapsedUser;->getExtraCount()J - move-result p2 + move-result-wide v1 - invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; + invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder; invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser$Companion.smali b/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser$Companion.smali index 2bfb8dede6..a42ec74b42 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser$Companion.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser$Companion.smali @@ -31,17 +31,17 @@ return-void .end method -.method public static synthetic createEmptyUser$default(Lcom/discord/widgets/channels/list/items/CollapsedUser$Companion;IILjava/lang/Object;)Lcom/discord/widgets/channels/list/items/CollapsedUser; +.method public static synthetic createEmptyUser$default(Lcom/discord/widgets/channels/list/items/CollapsedUser$Companion;JILjava/lang/Object;)Lcom/discord/widgets/channels/list/items/CollapsedUser; .locals 0 - and-int/lit8 p2, p2, 0x1 + and-int/lit8 p3, p3, 0x1 - if-eqz p2, :cond_0 + if-eqz p3, :cond_0 - const/4 p1, 0x0 + const-wide/16 p1, 0x0 :cond_0 - invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/list/items/CollapsedUser$Companion;->createEmptyUser(I)Lcom/discord/widgets/channels/list/items/CollapsedUser; + invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/channels/list/items/CollapsedUser$Companion;->createEmptyUser(J)Lcom/discord/widgets/channels/list/items/CollapsedUser; move-result-object p0 @@ -50,24 +50,24 @@ # virtual methods -.method public final createEmptyUser(I)Lcom/discord/widgets/channels/list/items/CollapsedUser; +.method public final createEmptyUser(J)Lcom/discord/widgets/channels/list/items/CollapsedUser; .locals 3 - new-instance v0, Lcom/discord/widgets/channels/list/items/CollapsedUser; + new-instance v0, Lcom/discord/models/domain/ModelUser; - new-instance v1, Lcom/discord/models/domain/ModelUser; + invoke-direct {v0}, Lcom/discord/models/domain/ModelUser;->()V - invoke-direct {v1}, Lcom/discord/models/domain/ModelUser;->()V + const-wide/16 v1, 0x63 - const/16 v2, 0x63 + invoke-static {v1, v2, p1, p2}, Ljava/lang/Math;->min(JJ)J - invoke-static {v2, p1}, Ljava/lang/Math;->min(II)I + move-result-wide p1 - move-result p1 + new-instance v1, Lcom/discord/widgets/channels/list/items/CollapsedUser; const/4 v2, 0x1 - invoke-direct {v0, v1, v2, p1}, Lcom/discord/widgets/channels/list/items/CollapsedUser;->(Lcom/discord/models/domain/ModelUser;ZI)V + invoke-direct {v1, v0, v2, p1, p2}, Lcom/discord/widgets/channels/list/items/CollapsedUser;->(Lcom/discord/models/domain/ModelUser;ZJ)V - return-object v0 + return-object v1 .end method diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser$userId$2.smali b/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser$userId$2.smali index e24fc2887f..82d7a488a1 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser$userId$2.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser$userId$2.smali @@ -8,7 +8,7 @@ # annotations .annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/widgets/channels/list/items/CollapsedUser;->(Lcom/discord/models/domain/ModelUser;ZI)V + value = Lcom/discord/widgets/channels/list/items/CollapsedUser;->(Lcom/discord/models/domain/ModelUser;ZJ)V .end annotation .annotation system Ldalvik/annotation/InnerClass; diff --git a/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser.smali b/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser.smali index fa4af45cf4..0357728e7d 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/items/CollapsedUser.smali @@ -23,7 +23,7 @@ # instance fields .field public final emptySlot:Z -.field public final extraCount:I +.field public final extraCount:J .field public final user:Lcom/discord/models/domain/ModelUser; @@ -73,7 +73,7 @@ return-void .end method -.method public constructor (Lcom/discord/models/domain/ModelUser;ZI)V +.method public constructor (Lcom/discord/models/domain/ModelUser;ZJ)V .locals 0 if-eqz p1, :cond_0 @@ -84,7 +84,7 @@ iput-boolean p2, p0, Lcom/discord/widgets/channels/list/items/CollapsedUser;->emptySlot:Z - iput p3, p0, Lcom/discord/widgets/channels/list/items/CollapsedUser;->extraCount:I + iput-wide p3, p0, Lcom/discord/widgets/channels/list/items/CollapsedUser;->extraCount:J new-instance p1, Lcom/discord/widgets/channels/list/items/CollapsedUser$userId$2; @@ -108,55 +108,53 @@ throw p1 .end method -.method public synthetic constructor (Lcom/discord/models/domain/ModelUser;ZIILkotlin/jvm/internal/DefaultConstructorMarker;)V - .locals 1 +.method public synthetic constructor (Lcom/discord/models/domain/ModelUser;ZJILkotlin/jvm/internal/DefaultConstructorMarker;)V + .locals 0 - and-int/lit8 p5, p4, 0x2 + and-int/lit8 p6, p5, 0x2 - const/4 v0, 0x0 - - if-eqz p5, :cond_0 + if-eqz p6, :cond_0 const/4 p2, 0x0 :cond_0 - and-int/lit8 p4, p4, 0x4 + and-int/lit8 p5, p5, 0x4 - if-eqz p4, :cond_1 + if-eqz p5, :cond_1 - const/4 p3, 0x0 + const-wide/16 p3, 0x0 :cond_1 - invoke-direct {p0, p1, p2, p3}, Lcom/discord/widgets/channels/list/items/CollapsedUser;->(Lcom/discord/models/domain/ModelUser;ZI)V + invoke-direct {p0, p1, p2, p3, p4}, Lcom/discord/widgets/channels/list/items/CollapsedUser;->(Lcom/discord/models/domain/ModelUser;ZJ)V return-void .end method -.method public static synthetic copy$default(Lcom/discord/widgets/channels/list/items/CollapsedUser;Lcom/discord/models/domain/ModelUser;ZIILjava/lang/Object;)Lcom/discord/widgets/channels/list/items/CollapsedUser; +.method public static synthetic copy$default(Lcom/discord/widgets/channels/list/items/CollapsedUser;Lcom/discord/models/domain/ModelUser;ZJILjava/lang/Object;)Lcom/discord/widgets/channels/list/items/CollapsedUser; .locals 0 - and-int/lit8 p5, p4, 0x1 + and-int/lit8 p6, p5, 0x1 - if-eqz p5, :cond_0 + if-eqz p6, :cond_0 iget-object p1, p0, Lcom/discord/widgets/channels/list/items/CollapsedUser;->user:Lcom/discord/models/domain/ModelUser; :cond_0 - and-int/lit8 p5, p4, 0x2 + and-int/lit8 p6, p5, 0x2 - if-eqz p5, :cond_1 + if-eqz p6, :cond_1 iget-boolean p2, p0, Lcom/discord/widgets/channels/list/items/CollapsedUser;->emptySlot:Z :cond_1 - and-int/lit8 p4, p4, 0x4 + and-int/lit8 p5, p5, 0x4 - if-eqz p4, :cond_2 + if-eqz p5, :cond_2 - iget p3, p0, Lcom/discord/widgets/channels/list/items/CollapsedUser;->extraCount:I + iget-wide p3, p0, Lcom/discord/widgets/channels/list/items/CollapsedUser;->extraCount:J :cond_2 - invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/channels/list/items/CollapsedUser;->copy(Lcom/discord/models/domain/ModelUser;ZI)Lcom/discord/widgets/channels/list/items/CollapsedUser; + invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/widgets/channels/list/items/CollapsedUser;->copy(Lcom/discord/models/domain/ModelUser;ZJ)Lcom/discord/widgets/channels/list/items/CollapsedUser; move-result-object p0 @@ -201,22 +199,22 @@ return v0 .end method -.method public final component3()I - .locals 1 +.method public final component3()J + .locals 2 - iget v0, p0, Lcom/discord/widgets/channels/list/items/CollapsedUser;->extraCount:I + iget-wide v0, p0, Lcom/discord/widgets/channels/list/items/CollapsedUser;->extraCount:J - return v0 + return-wide v0 .end method -.method public final copy(Lcom/discord/models/domain/ModelUser;ZI)Lcom/discord/widgets/channels/list/items/CollapsedUser; +.method public final copy(Lcom/discord/models/domain/ModelUser;ZJ)Lcom/discord/widgets/channels/list/items/CollapsedUser; .locals 1 if-eqz p1, :cond_0 new-instance v0, Lcom/discord/widgets/channels/list/items/CollapsedUser; - invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/channels/list/items/CollapsedUser;->(Lcom/discord/models/domain/ModelUser;ZI)V + invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/channels/list/items/CollapsedUser;->(Lcom/discord/models/domain/ModelUser;ZJ)V return-object v0 @@ -231,7 +229,7 @@ .end method .method public equals(Ljava/lang/Object;)Z - .locals 2 + .locals 4 if-eq p0, p1, :cond_1 @@ -257,11 +255,13 @@ if-ne v0, v1, :cond_0 - iget v0, p0, Lcom/discord/widgets/channels/list/items/CollapsedUser;->extraCount:I + iget-wide v0, p0, Lcom/discord/widgets/channels/list/items/CollapsedUser;->extraCount:J - iget p1, p1, Lcom/discord/widgets/channels/list/items/CollapsedUser;->extraCount:I + iget-wide v2, p1, Lcom/discord/widgets/channels/list/items/CollapsedUser;->extraCount:J - if-ne v0, p1, :cond_0 + cmp-long p1, v0, v2 + + if-nez p1, :cond_0 goto :goto_0 @@ -285,12 +285,12 @@ return v0 .end method -.method public final getExtraCount()I - .locals 1 +.method public final getExtraCount()J + .locals 2 - iget v0, p0, Lcom/discord/widgets/channels/list/items/CollapsedUser;->extraCount:I + iget-wide v0, p0, Lcom/discord/widgets/channels/list/items/CollapsedUser;->extraCount:J - return v0 + return-wide v0 .end method .method public getKey()Ljava/lang/String; @@ -320,7 +320,7 @@ .end method .method public hashCode()I - .locals 2 + .locals 3 iget-object v0, p0, Lcom/discord/widgets/channels/list/items/CollapsedUser;->user:Lcom/discord/models/domain/ModelUser; @@ -349,9 +349,9 @@ mul-int/lit8 v0, v0, 0x1f - iget v1, p0, Lcom/discord/widgets/channels/list/items/CollapsedUser;->extraCount:I + iget-wide v1, p0, Lcom/discord/widgets/channels/list/items/CollapsedUser;->extraCount:J - invoke-static {v1}, Lc;->a(I)I + invoke-static {v1, v2}, Ld;->a(J)I move-result v1 @@ -361,7 +361,7 @@ .end method .method public toString()Ljava/lang/String; - .locals 3 + .locals 4 const-string v0, "CollapsedUser(user=" @@ -385,11 +385,11 @@ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - iget v1, p0, Lcom/discord/widgets/channels/list/items/CollapsedUser;->extraCount:I + iget-wide v1, p0, Lcom/discord/widgets/channels/list/items/CollapsedUser;->extraCount:J - const-string v2, ")" + const-string v3, ")" - invoke-static {v0, v1, v2}, Le/e/b/a/a;->a(Ljava/lang/StringBuilder;ILjava/lang/String;)Ljava/lang/String; + invoke-static {v0, v1, v2, v3}, Le/e/b/a/a;->a(Ljava/lang/StringBuilder;JLjava/lang/String;)Ljava/lang/String; move-result-object v0 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 b8a77390a6..24b28fd64d 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 @@ -244,7 +244,7 @@ .end method .method private final createPartyUsers(Ljava/util/Map;Lcom/discord/models/domain/activity/ModelActivity;)Ljava/util/ArrayList; - .locals 9 + .locals 11 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -292,22 +292,22 @@ const/4 v5, 0x0 - const/4 v6, 0x0 + const-wide/16 v6, 0x0 - const/4 v7, 0x6 + const/4 v8, 0x6 - const/4 v8, 0x0 + const/4 v9, 0x0 move-object v3, v2 - invoke-direct/range {v3 .. v8}, Lcom/discord/widgets/channels/list/items/CollapsedUser;->(Lcom/discord/models/domain/ModelUser;ZIILkotlin/jvm/internal/DefaultConstructorMarker;)V + invoke-direct/range {v3 .. v9}, Lcom/discord/widgets/channels/list/items/CollapsedUser;->(Lcom/discord/models/domain/ModelUser;ZJILkotlin/jvm/internal/DefaultConstructorMarker;)V invoke-interface {v0, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z goto :goto_0 :cond_0 - const/4 v1, 0x0 + const-wide/16 v1, 0x0 if-eqz p2, :cond_1 @@ -317,27 +317,27 @@ if-eqz p2, :cond_1 - invoke-virtual {p2}, Lcom/discord/models/domain/activity/ModelActivityParty;->getMaxSize()I + invoke-virtual {p2}, Lcom/discord/models/domain/activity/ModelActivityParty;->getMaxSize()J - move-result p2 + move-result-wide v3 goto :goto_1 :cond_1 - const/4 p2, 0x0 + move-wide v3, v1 :goto_1 invoke-interface {p1}, Ljava/util/Map;->size()I move-result p1 - const/4 v2, 0x4 + const-wide/16 v5, 0x4 - invoke-static {v2, p2}, Ljava/lang/Math;->min(II)I + invoke-static {v5, v6, v3, v4}, Ljava/lang/Math;->min(JJ)J - move-result v3 + move-result-wide v7 - invoke-static {p1, v3}, Lw/x/c;->until(II)Lkotlin/ranges/IntRange; + invoke-static {p1, v7, v8}, Lw/x/f;->until(IJ)Lw/x/e; move-result-object p1 @@ -348,37 +348,39 @@ :goto_2 invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z - move-result v3 + move-result p2 - if-eqz v3, :cond_3 + if-eqz p2, :cond_3 - move-object v3, p1 + move-object p2, p1 - check-cast v3, Lw/q/r; + check-cast p2, Lw/q/s; - invoke-virtual {v3}, Lw/q/r;->nextInt()I + invoke-virtual {p2}, Lw/q/s;->nextLong()J - move-result v3 + move-result-wide v7 - const/4 v4, 0x3 + const-wide/16 v9, 0x3 - if-ne v3, v4, :cond_2 + cmp-long p2, v7, v9 - add-int/lit8 v3, p2, -0x4 + if-nez p2, :cond_2 + + sub-long v7, v3, v5 goto :goto_3 :cond_2 - const/4 v3, 0x0 + move-wide v7, v1 :goto_3 - sget-object v4, Lcom/discord/widgets/channels/list/items/CollapsedUser;->Companion:Lcom/discord/widgets/channels/list/items/CollapsedUser$Companion; + sget-object p2, Lcom/discord/widgets/channels/list/items/CollapsedUser;->Companion:Lcom/discord/widgets/channels/list/items/CollapsedUser$Companion; - invoke-virtual {v4, v3}, Lcom/discord/widgets/channels/list/items/CollapsedUser$Companion;->createEmptyUser(I)Lcom/discord/widgets/channels/list/items/CollapsedUser; + invoke-virtual {p2, v7, v8}, Lcom/discord/widgets/channels/list/items/CollapsedUser$Companion;->createEmptyUser(J)Lcom/discord/widgets/channels/list/items/CollapsedUser; - move-result-object v3 + move-result-object p2 - invoke-virtual {v0, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + invoke-virtual {v0, p2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z goto :goto_2 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 11bc3c91b1..5fd1715724 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/ViewEmbedGameInvite.smali @@ -17,7 +17,7 @@ .field public static final EMBED_LIFETIME_MILLIS:J = 0x6ddd00L -.field public static final MAX_USERS_SHOWN:I = 0x4 +.field public static final MAX_USERS_SHOWN:J = 0x4L # instance fields @@ -1070,7 +1070,7 @@ .end method .method private final configureUI(Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;Lcom/discord/utilities/time/Clock;)V - .locals 6 + .locals 7 invoke-interface {p2}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J @@ -1123,34 +1123,38 @@ invoke-virtual {v0, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V - const/4 v0, 0x0 + const-wide/16 v2, 0x0 if-eqz p2, :cond_3 :cond_2 - const/4 v2, 0x0 + move-wide v4, v2 goto :goto_1 :cond_3 invoke-virtual {p1}, Lcom/discord/widgets/chat/list/ViewEmbedGameInvite$Model;->getActivity()Lcom/discord/models/domain/activity/ModelActivity; - move-result-object v2 + move-result-object v0 - if-eqz v2, :cond_2 + if-eqz v0, :cond_2 - invoke-virtual {v2}, Lcom/discord/models/domain/activity/ModelActivity;->getParty()Lcom/discord/models/domain/activity/ModelActivityParty; + invoke-virtual {v0}, Lcom/discord/models/domain/activity/ModelActivity;->getParty()Lcom/discord/models/domain/activity/ModelActivityParty; - move-result-object v2 + move-result-object v0 - if-eqz v2, :cond_2 + if-eqz v0, :cond_2 - invoke-virtual {v2}, Lcom/discord/models/domain/activity/ModelActivityParty;->getOpenSlots()I + invoke-virtual {v0}, Lcom/discord/models/domain/activity/ModelActivityParty;->getOpenSlots()J - move-result v2 + move-result-wide v4 :goto_1 - if-gtz v2, :cond_4 + const/4 v0, 0x0 + + cmp-long v6, v4, v2 + + if-gtz v6, :cond_4 const/4 v2, 0x1 diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight.smali index 1eeb1c5b59..80e7aeb8ad 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight.smali @@ -323,7 +323,7 @@ move-result v3 :cond_a - invoke-static {v3, v5}, Lw/x/c;->downTo(II)Lkotlin/ranges/IntProgression; + invoke-static {v3, v5}, Lw/x/f;->downTo(II)Lkotlin/ranges/IntProgression; move-result-object v0 diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model$Companion.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model$Companion.smali index 995de11f51..d9a5276307 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model$Companion.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model$Companion.smali @@ -42,7 +42,7 @@ .end method .method private final create(Lcom/discord/models/domain/ModelPresence;Ljava/util/Map;Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;Z)Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model; - .locals 9 + .locals 15 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -58,145 +58,153 @@ } .end annotation - new-instance v0, Ljava/util/ArrayList; + move-object/from16 v0, p1 - invoke-direct {v0}, Ljava/util/ArrayList;->()V + new-instance v1, Ljava/util/ArrayList; - invoke-interface {p2}, Ljava/util/Map;->values()Ljava/util/Collection; + invoke-direct {v1}, Ljava/util/ArrayList;->()V - move-result-object v1 - - invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; - - move-result-object v1 - - :goto_0 - invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z - - move-result v2 - - if-eqz v2, :cond_0 - - invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object; + invoke-interface/range {p2 .. p2}, Ljava/util/Map;->values()Ljava/util/Collection; move-result-object v2 - move-object v4, v2 + invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; - check-cast v4, Lcom/discord/models/domain/ModelUser; + move-result-object v2 - new-instance v2, Lcom/discord/widgets/channels/list/items/CollapsedUser; + :goto_0 + invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z - const/4 v5, 0x0 + move-result v3 + + if-eqz v3, :cond_0 + + invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object; + + move-result-object v3 + + move-object v5, v3 + + check-cast v5, Lcom/discord/models/domain/ModelUser; + + new-instance v3, Lcom/discord/widgets/channels/list/items/CollapsedUser; const/4 v6, 0x0 - const/4 v7, 0x6 + const-wide/16 v7, 0x0 - const/4 v8, 0x0 + const/4 v9, 0x6 - move-object v3, v2 + const/4 v10, 0x0 - invoke-direct/range {v3 .. v8}, Lcom/discord/widgets/channels/list/items/CollapsedUser;->(Lcom/discord/models/domain/ModelUser;ZIILkotlin/jvm/internal/DefaultConstructorMarker;)V + move-object v4, v3 - invoke-virtual {v0, v2}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + invoke-direct/range {v4 .. v10}, Lcom/discord/widgets/channels/list/items/CollapsedUser;->(Lcom/discord/models/domain/ModelUser;ZJILkotlin/jvm/internal/DefaultConstructorMarker;)V + + invoke-virtual {v1, v3}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z goto :goto_0 :cond_0 - if-eqz p1, :cond_1 + if-eqz v0, :cond_1 - invoke-virtual {p1}, Lcom/discord/models/domain/ModelPresence;->getListeningActivity()Lcom/discord/models/domain/activity/ModelActivity; + invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelPresence;->getListeningActivity()Lcom/discord/models/domain/activity/ModelActivity; - move-result-object v1 + move-result-object v2 goto :goto_1 :cond_1 - const/4 v1, 0x0 - - :goto_1 const/4 v2, 0x0 - if-eqz v1, :cond_2 + :goto_1 + const-wide/16 v3, 0x0 - invoke-virtual {v1}, Lcom/discord/models/domain/activity/ModelActivity;->getParty()Lcom/discord/models/domain/activity/ModelActivityParty; + if-eqz v2, :cond_2 - move-result-object v1 + invoke-virtual {v2}, Lcom/discord/models/domain/activity/ModelActivity;->getParty()Lcom/discord/models/domain/activity/ModelActivityParty; - if-eqz v1, :cond_2 + move-result-object v2 - invoke-virtual {v1}, Lcom/discord/models/domain/activity/ModelActivityParty;->getMaxSize()I + if-eqz v2, :cond_2 - move-result v1 + invoke-virtual {v2}, Lcom/discord/models/domain/activity/ModelActivityParty;->getMaxSize()J + + move-result-wide v5 goto :goto_2 :cond_2 - const/4 v1, 0x0 + move-wide v5, v3 :goto_2 - invoke-interface {p2}, Ljava/util/Map;->size()I + invoke-interface/range {p2 .. p2}, Ljava/util/Map;->size()I - move-result p2 + move-result v2 - const/4 v3, 0x6 + const-wide/16 v7, 0x6 - invoke-static {v3, v1}, Ljava/lang/Math;->min(II)I + invoke-static {v7, v8, v5, v6}, Ljava/lang/Math;->min(JJ)J - move-result v4 + move-result-wide v9 - invoke-static {p2, v4}, Lw/x/c;->until(II)Lkotlin/ranges/IntRange; + invoke-static {v2, v9, v10}, Lw/x/f;->until(IJ)Lw/x/e; - move-result-object p2 + move-result-object v2 - invoke-interface {p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; + invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; - move-result-object p2 + move-result-object v2 :goto_3 - invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z + invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z - move-result v4 + move-result v9 - if-eqz v4, :cond_4 + if-eqz v9, :cond_4 - move-object v4, p2 + move-object v9, v2 - check-cast v4, Lw/q/r; + check-cast v9, Lw/q/s; - invoke-virtual {v4}, Lw/q/r;->nextInt()I + invoke-virtual {v9}, Lw/q/s;->nextLong()J - move-result v4 + move-result-wide v9 - sget-object v5, Lcom/discord/widgets/channels/list/items/CollapsedUser;->Companion:Lcom/discord/widgets/channels/list/items/CollapsedUser$Companion; + sget-object v11, Lcom/discord/widgets/channels/list/items/CollapsedUser;->Companion:Lcom/discord/widgets/channels/list/items/CollapsedUser$Companion; - const/4 v6, 0x5 + const-wide/16 v12, 0x5 - if-ne v4, v6, :cond_3 + cmp-long v14, v9, v12 - add-int/lit8 v4, v1, -0x6 + if-nez v14, :cond_3 + + sub-long v9, v5, v7 goto :goto_4 :cond_3 - const/4 v4, 0x0 + move-wide v9, v3 :goto_4 - invoke-virtual {v5, v4}, Lcom/discord/widgets/channels/list/items/CollapsedUser$Companion;->createEmptyUser(I)Lcom/discord/widgets/channels/list/items/CollapsedUser; + invoke-virtual {v11, v9, v10}, Lcom/discord/widgets/channels/list/items/CollapsedUser$Companion;->createEmptyUser(J)Lcom/discord/widgets/channels/list/items/CollapsedUser; - move-result-object v4 + move-result-object v9 - invoke-virtual {v0, v4}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + invoke-virtual {v1, v9}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z goto :goto_3 :cond_4 - new-instance p2, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model; + new-instance v2, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model; - invoke-direct {p2, p1, v0, p3, p4}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;->(Lcom/discord/models/domain/ModelPresence;Ljava/util/List;Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;Z)V + move-object/from16 v3, p3 - return-object p2 + move/from16 v4, p4 + + invoke-direct {v2, v0, v1, v3, v4}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether$Model;->(Lcom/discord/models/domain/ModelPresence;Ljava/util/List;Lcom/discord/widgets/chat/list/entries/ListenTogetherEntry;Z)V + + return-object v2 .end method 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 83ddeddf60..e7819f8330 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali @@ -19,7 +19,7 @@ .field public static final EMBED_LIFETIME_MILLIS:J = 0x6ddd00L -.field public static final MAX_USERS_SHOWN:I = 0x6 +.field public static final MAX_USERS_SHOWN:J = 0x6L .field public static final SPOTIFY_NAME:Ljava/lang/String; = "Spotify" diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali index 3ac592bf07..6f55712a24 100644 --- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali +++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali @@ -492,7 +492,7 @@ new-array v1, v2, [Ljava/lang/Object; - const-string v3, "11.3" + const-string v3, "11.4" aput-object v3, v1, v4 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 162593c851..91e9115a4a 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.smali @@ -1247,7 +1247,7 @@ move-result v1 - invoke-static {v3, v1}, Lw/x/c;->until(II)Lkotlin/ranges/IntRange; + invoke-static {v3, v1}, Lw/x/f;->until(II)Lkotlin/ranges/IntRange; move-result-object v1 @@ -1380,7 +1380,7 @@ move-result v1 - invoke-static {v3, v1}, Lw/x/c;->until(II)Lkotlin/ranges/IntRange; + invoke-static {v3, v1}, Lw/x/f;->until(II)Lkotlin/ranges/IntRange; move-result-object v1 diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali index f1423b9332..f8333ffa98 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali @@ -1653,7 +1653,7 @@ invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v0, " - 11.3 (1044)" + const-string v0, " - 11.4 (1045)" invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; 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 d53a6b4cc9..9a9299e17c 100644 --- a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderGameRichPresence.smali +++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderGameRichPresence.smali @@ -34,9 +34,9 @@ # virtual methods .method public configureTextUi(Lcom/discord/models/domain/activity/ModelActivity;Lcom/discord/utilities/streams/StreamContext;)V - .locals 7 + .locals 8 - if-eqz p1, :cond_5 + if-eqz p1, :cond_6 invoke-virtual {p1}, Lcom/discord/models/domain/activity/ModelActivity;->getState()Ljava/lang/String; @@ -44,20 +44,30 @@ const/4 v0, 0x0 - if-eqz p2, :cond_3 + if-eqz p2, :cond_4 invoke-virtual {p1}, Lcom/discord/models/domain/activity/ModelActivity;->getParty()Lcom/discord/models/domain/activity/ModelActivityParty; move-result-object v1 - if-eqz v1, :cond_1 + if-eqz v1, :cond_2 - invoke-virtual {v1}, Lcom/discord/models/domain/activity/ModelActivityParty;->getMaxSize()I + invoke-virtual {v1}, Lcom/discord/models/domain/activity/ModelActivityParty;->getMaxSize()J - move-result v2 + move-result-wide v2 - if-eqz v2, :cond_0 + const-wide/16 v4, 0x0 + cmp-long v6, v2, v4 + + if-nez v6, :cond_1 + + :cond_0 + move-object v1, v0 + + goto :goto_0 + + :cond_1 iget-object v2, p0, Lcom/discord/widgets/user/presence/ViewHolderGameRichPresence;->containerView:Landroid/view/View; invoke-virtual {v2}, Landroid/view/View;->getContext()Landroid/content/Context; @@ -74,11 +84,11 @@ const/4 v5, 0x0 - invoke-virtual {v1}, Lcom/discord/models/domain/activity/ModelActivityParty;->getCurrentSize()I + invoke-virtual {v1}, Lcom/discord/models/domain/activity/ModelActivityParty;->getCurrentSize()J - move-result v6 + move-result-wide v6 - invoke-static {v6}, Ljava/lang/String;->valueOf(I)Ljava/lang/String; + invoke-static {v6, v7}, Ljava/lang/String;->valueOf(J)Ljava/lang/String; move-result-object v6 @@ -86,11 +96,11 @@ const/4 v5, 0x1 - invoke-virtual {v1}, Lcom/discord/models/domain/activity/ModelActivityParty;->getMaxSize()I + invoke-virtual {v1}, Lcom/discord/models/domain/activity/ModelActivityParty;->getMaxSize()J - move-result v1 + move-result-wide v6 - invoke-static {v1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String; + invoke-static {v6, v7}, Ljava/lang/String;->valueOf(J)Ljava/lang/String; move-result-object v1 @@ -100,17 +110,12 @@ move-result-object v1 - goto :goto_0 - - :cond_0 - move-object v1, v0 - :goto_0 - if-eqz v1, :cond_1 + if-eqz v1, :cond_2 goto :goto_1 - :cond_1 + :cond_2 const-string v1, "" :goto_1 @@ -134,7 +139,7 @@ move-result-object p2 - if-eqz p2, :cond_2 + if-eqz p2, :cond_3 invoke-static {p2}, Lw/a0/s;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence; @@ -146,7 +151,7 @@ goto :goto_2 - :cond_2 + :cond_3 new-instance p1, Lw/l; const-string p2, "null cannot be cast to non-null type kotlin.CharSequence" @@ -155,7 +160,7 @@ throw p1 - :cond_3 + :cond_4 move-object p2, v0 :goto_2 @@ -237,18 +242,18 @@ move-result-object p1 - if-eqz p1, :cond_4 + if-eqz p1, :cond_5 invoke-virtual {p0, p1}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->friendlyTime(Lcom/discord/models/domain/activity/ModelActivityTimestamps;)Ljava/lang/CharSequence; move-result-object v0 - :cond_4 + :cond_5 invoke-static {p2, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V return-void - :cond_5 + :cond_6 new-instance p1, Ljava/lang/IllegalArgumentException; const-string p2, "model must not be null" 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 a61c0a881a..069eded4f3 100644 --- a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.smali +++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderStreamRichPresence.smali @@ -93,7 +93,7 @@ .end method .method private final getRichPresenceStateText(Ljava/lang/String;Lcom/discord/models/domain/activity/ModelActivityParty;)Ljava/lang/String; - .locals 5 + .locals 6 const/4 v0, 0x0 @@ -102,21 +102,28 @@ return-object v0 :cond_0 - if-eqz p2, :cond_2 + if-eqz p2, :cond_3 - invoke-virtual {p2}, Lcom/discord/models/domain/activity/ModelActivityParty;->getMaxSize()I + invoke-virtual {p2}, Lcom/discord/models/domain/activity/ModelActivityParty;->getMaxSize()J - move-result v1 + move-result-wide v1 - if-eqz v1, :cond_1 + const-wide/16 v3, 0x0 + cmp-long v5, v1, v3 + + if-nez v5, :cond_1 + + goto :goto_0 + + :cond_1 iget-object v1, p0, Lcom/discord/widgets/user/presence/ViewHolderStreamRichPresence;->containerView:Landroid/view/View; invoke-virtual {v1}, Landroid/view/View;->getContext()Landroid/content/Context; move-result-object v1 - if-eqz v1, :cond_1 + if-eqz v1, :cond_2 const v0, 0x7f1213d1 @@ -126,11 +133,11 @@ const/4 v3, 0x0 - invoke-virtual {p2}, Lcom/discord/models/domain/activity/ModelActivityParty;->getCurrentSize()I + invoke-virtual {p2}, Lcom/discord/models/domain/activity/ModelActivityParty;->getCurrentSize()J - move-result v4 + move-result-wide v4 - invoke-static {v4}, Ljava/lang/String;->valueOf(I)Ljava/lang/String; + invoke-static {v4, v5}, Ljava/lang/String;->valueOf(J)Ljava/lang/String; move-result-object v4 @@ -138,11 +145,11 @@ const/4 v3, 0x1 - invoke-virtual {p2}, Lcom/discord/models/domain/activity/ModelActivityParty;->getMaxSize()I + invoke-virtual {p2}, Lcom/discord/models/domain/activity/ModelActivityParty;->getMaxSize()J - move-result p2 + move-result-wide v4 - invoke-static {p2}, Ljava/lang/String;->valueOf(I)Ljava/lang/String; + invoke-static {v4, v5}, Ljava/lang/String;->valueOf(J)Ljava/lang/String; move-result-object p2 @@ -152,15 +159,16 @@ move-result-object v0 - :cond_1 - if-eqz v0, :cond_2 - - goto :goto_0 - :cond_2 + :goto_0 + if-eqz v0, :cond_3 + + goto :goto_1 + + :cond_3 const-string v0, "" - :goto_0 + :goto_1 const-string p2, "party?.run {\n when \u2026 )\n }\n } ?: \"\"" invoke-static {v0, p2}, Lw/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V @@ -181,7 +189,7 @@ move-result-object p1 - if-eqz p1, :cond_3 + if-eqz p1, :cond_4 invoke-static {p1}, Lw/a0/s;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence; @@ -193,7 +201,7 @@ return-object p1 - :cond_3 + :cond_4 new-instance p1, Lw/l; const-string p2, "null cannot be cast to non-null type kotlin.CharSequence" 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 cf5100f271..ffd1c31d3b 100644 --- a/com.discord/smali/com/discord/widgets/user/presence/ViewHolderUserRichPresence.smali +++ b/com.discord/smali/com/discord/widgets/user/presence/ViewHolderUserRichPresence.smali @@ -450,7 +450,7 @@ .end method .method public configureTextUi(Lcom/discord/models/domain/activity/ModelActivity;Lcom/discord/utilities/streams/StreamContext;)V - .locals 7 + .locals 8 if-nez p1, :cond_0 @@ -463,20 +463,30 @@ const/4 v0, 0x0 - if-eqz p2, :cond_4 + if-eqz p2, :cond_5 invoke-virtual {p1}, Lcom/discord/models/domain/activity/ModelActivity;->getParty()Lcom/discord/models/domain/activity/ModelActivityParty; move-result-object v1 - if-eqz v1, :cond_2 + if-eqz v1, :cond_3 - invoke-virtual {v1}, Lcom/discord/models/domain/activity/ModelActivityParty;->getMaxSize()I + invoke-virtual {v1}, Lcom/discord/models/domain/activity/ModelActivityParty;->getMaxSize()J - move-result v2 + move-result-wide v2 - if-eqz v2, :cond_1 + const-wide/16 v4, 0x0 + cmp-long v6, v2, v4 + + if-nez v6, :cond_2 + + :cond_1 + move-object v1, v0 + + goto :goto_0 + + :cond_2 iget-object v2, p0, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->containerView:Landroid/view/View; invoke-virtual {v2}, Landroid/view/View;->getContext()Landroid/content/Context; @@ -493,11 +503,11 @@ const/4 v5, 0x0 - invoke-virtual {v1}, Lcom/discord/models/domain/activity/ModelActivityParty;->getCurrentSize()I + invoke-virtual {v1}, Lcom/discord/models/domain/activity/ModelActivityParty;->getCurrentSize()J - move-result v6 + move-result-wide v6 - invoke-static {v6}, Ljava/lang/String;->valueOf(I)Ljava/lang/String; + invoke-static {v6, v7}, Ljava/lang/String;->valueOf(J)Ljava/lang/String; move-result-object v6 @@ -505,11 +515,11 @@ const/4 v5, 0x1 - invoke-virtual {v1}, Lcom/discord/models/domain/activity/ModelActivityParty;->getMaxSize()I + invoke-virtual {v1}, Lcom/discord/models/domain/activity/ModelActivityParty;->getMaxSize()J - move-result v1 + move-result-wide v6 - invoke-static {v1}, Ljava/lang/String;->valueOf(I)Ljava/lang/String; + invoke-static {v6, v7}, Ljava/lang/String;->valueOf(J)Ljava/lang/String; move-result-object v1 @@ -519,17 +529,12 @@ move-result-object v1 - goto :goto_0 - - :cond_1 - move-object v1, v0 - :goto_0 - if-eqz v1, :cond_2 + if-eqz v1, :cond_3 goto :goto_1 - :cond_2 + :cond_3 const-string v1, "" :goto_1 @@ -553,7 +558,7 @@ move-result-object p2 - if-eqz p2, :cond_3 + if-eqz p2, :cond_4 invoke-static {p2}, Lw/a0/s;->trim(Ljava/lang/CharSequence;)Ljava/lang/CharSequence; @@ -565,7 +570,7 @@ goto :goto_2 - :cond_3 + :cond_4 new-instance p1, Lw/l; const-string p2, "null cannot be cast to non-null type kotlin.CharSequence" @@ -574,7 +579,7 @@ throw p1 - :cond_4 + :cond_5 move-object p2, v0 :goto_2 @@ -632,7 +637,7 @@ move-result-object v1 - if-eqz v1, :cond_5 + if-eqz v1, :cond_6 invoke-virtual {v1}, Lcom/discord/models/domain/activity/ModelActivityAssets;->getLargeText()Ljava/lang/String; @@ -640,7 +645,7 @@ goto :goto_3 - :cond_5 + :cond_6 move-object v1, v0 :goto_3 @@ -656,13 +661,13 @@ move-result-object p1 - if-eqz p1, :cond_6 + if-eqz p1, :cond_7 invoke-virtual {p0, p1}, Lcom/discord/widgets/user/presence/ViewHolderUserRichPresence;->friendlyTime(Lcom/discord/models/domain/activity/ModelActivityTimestamps;)Ljava/lang/CharSequence; move-result-object v0 - :cond_6 + :cond_7 invoke-static {p2, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V return-void diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$1.smali index 3364ac2e45..0e3f9ef68d 100644 --- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$1.smali +++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall$initializeSystemUiListeners$1.smali @@ -90,7 +90,7 @@ move-result v1 - invoke-static {v0, v1}, Lw/x/c;->until(II)Lkotlin/ranges/IntRange; + invoke-static {v0, v1}, Lw/x/f;->until(II)Lkotlin/ranges/IntRange; move-result-object v0 diff --git a/com.discord/smali_classes2/a0/c0/a.smali b/com.discord/smali_classes2/a0/c0/a.smali index 2b39e96a3f..b445284beb 100644 --- a/com.discord/smali_classes2/a0/c0/a.smali +++ b/com.discord/smali_classes2/a0/c0/a.smali @@ -1111,7 +1111,7 @@ move-result v1 - invoke-static {v0, v1}, Lw/x/c;->until(II)Lkotlin/ranges/IntRange; + invoke-static {v0, v1}, Lw/x/f;->until(II)Lkotlin/ranges/IntRange; move-result-object v0 diff --git a/com.discord/smali_classes2/a0/c0/f/k.smali b/com.discord/smali_classes2/a0/c0/f/k.smali index 2da7e6456e..1c5f1a7c9c 100644 --- a/com.discord/smali_classes2/a0/c0/f/k.smali +++ b/com.discord/smali_classes2/a0/c0/f/k.smali @@ -1075,13 +1075,13 @@ const/4 v7, 0x0 - invoke-static {v7, v3}, Lw/x/c;->until(II)Lkotlin/ranges/IntRange; + invoke-static {v7, v3}, Lw/x/f;->until(II)Lkotlin/ranges/IntRange; move-result-object v3 const/4 v7, 0x6 - invoke-static {v3, v7}, Lw/x/c;->step(Lkotlin/ranges/IntProgression;I)Lkotlin/ranges/IntProgression; + invoke-static {v3, v7}, Lw/x/f;->step(Lkotlin/ranges/IntProgression;I)Lkotlin/ranges/IntProgression; move-result-object v3 diff --git a/com.discord/smali_classes2/a0/u$b.smali b/com.discord/smali_classes2/a0/u$b.smali index 9322513b26..8ec8a485a1 100644 --- a/com.discord/smali_classes2/a0/u$b.smali +++ b/com.discord/smali_classes2/a0/u$b.smali @@ -1111,13 +1111,13 @@ move-result v1 - invoke-static {v0, v1}, Lw/x/c;->until(II)Lkotlin/ranges/IntRange; + invoke-static {v0, v1}, Lw/x/f;->until(II)Lkotlin/ranges/IntRange; move-result-object v0 const/4 v1, 0x2 - invoke-static {v0, v1}, Lw/x/c;->step(Lkotlin/ranges/IntProgression;I)Lkotlin/ranges/IntProgression; + invoke-static {v0, v1}, Lw/x/f;->step(Lkotlin/ranges/IntProgression;I)Lkotlin/ranges/IntProgression; move-result-object v0 diff --git a/com.discord/smali_classes2/e/b/a/a/a.smali b/com.discord/smali_classes2/e/b/a/a/a.smali index 3f159d2791..cd795c71d6 100644 --- a/com.discord/smali_classes2/e/b/a/a/a.smali +++ b/com.discord/smali_classes2/e/b/a/a/a.smali @@ -660,7 +660,7 @@ move-result p3 - invoke-static {v0, p3}, Lw/x/c;->until(II)Lkotlin/ranges/IntRange; + invoke-static {v0, p3}, Lw/x/f;->until(II)Lkotlin/ranges/IntRange; move-result-object p3 diff --git a/com.discord/smali_classes2/e/k/a/c/e/p/g.smali b/com.discord/smali_classes2/e/k/a/c/e/p/g.smali index d51e44fcb0..c8dbe1e855 100644 --- a/com.discord/smali_classes2/e/k/a/c/e/p/g.smali +++ b/com.discord/smali_classes2/e/k/a/c/e/p/g.smali @@ -1868,28 +1868,42 @@ return-wide p0 .end method -.method public static a(JJJ)J +.method public static final a(JJ)J .locals 3 - xor-long/2addr p0, p2 + rem-long/2addr p0, p2 - mul-long p0, p0, p4 + const-wide/16 v0, 0x0 - const/16 v0, 0x2f + cmp-long v2, p0, v0 - ushr-long v1, p0, v0 + if-ltz v2, :cond_0 - xor-long/2addr p0, v1 + goto :goto_0 - xor-long/2addr p0, p2 + :cond_0 + add-long/2addr p0, p2 - mul-long p0, p0, p4 + :goto_0 + return-wide p0 +.end method - ushr-long p2, p0, v0 +.method public static final a(JJJ)J + .locals 0 - xor-long/2addr p0, p2 + invoke-static {p0, p1, p4, p5}, Le/k/a/c/e/p/g;->a(JJ)J - mul-long p0, p0, p4 + move-result-wide p0 + + invoke-static {p2, p3, p4, p5}, Le/k/a/c/e/p/g;->a(JJ)J + + move-result-wide p2 + + sub-long/2addr p0, p2 + + invoke-static {p0, p1, p4, p5}, Le/k/a/c/e/p/g;->a(JJ)J + + move-result-wide p0 return-wide p0 .end method @@ -1975,7 +1989,7 @@ move-wide v4, v0 - invoke-static/range {v4 .. v9}, Le/k/a/c/e/p/g;->a(JJJ)J + invoke-static/range {v4 .. v9}, Le/k/a/c/e/p/g;->b(JJJ)J move-result-wide v0 @@ -2026,7 +2040,7 @@ move-wide v7, v1 - invoke-static/range {v3 .. v8}, Le/k/a/c/e/p/g;->a(JJJ)J + invoke-static/range {v3 .. v8}, Le/k/a/c/e/p/g;->b(JJJ)J move-result-wide v0 @@ -2149,7 +2163,7 @@ move-wide v15, v0 - invoke-static/range {v15 .. v20}, Le/k/a/c/e/p/g;->a(JJJ)J + invoke-static/range {v15 .. v20}, Le/k/a/c/e/p/g;->b(JJJ)J move-result-wide v0 @@ -2226,7 +2240,7 @@ move-wide/from16 v19, v1 - invoke-static/range {v15 .. v20}, Le/k/a/c/e/p/g;->a(JJJ)J + invoke-static/range {v15 .. v20}, Le/k/a/c/e/p/g;->b(JJJ)J move-result-wide v8 @@ -2294,7 +2308,7 @@ move-wide v15, v3 - invoke-static/range {v15 .. v20}, Le/k/a/c/e/p/g;->a(JJJ)J + invoke-static/range {v15 .. v20}, Le/k/a/c/e/p/g;->b(JJJ)J move-result-wide v0 @@ -2614,7 +2628,7 @@ move-wide/from16 v8, v23 - invoke-static/range {v4 .. v9}, Le/k/a/c/e/p/g;->a(JJJ)J + invoke-static/range {v4 .. v9}, Le/k/a/c/e/p/g;->b(JJJ)J move-result-wide v0 @@ -2636,7 +2650,7 @@ aget-wide v6, v13, v17 - invoke-static/range {v4 .. v9}, Le/k/a/c/e/p/g;->a(JJJ)J + invoke-static/range {v4 .. v9}, Le/k/a/c/e/p/g;->b(JJJ)J move-result-wide v2 @@ -2644,7 +2658,7 @@ move-wide v4, v0 - invoke-static/range {v4 .. v9}, Le/k/a/c/e/p/g;->a(JJJ)J + invoke-static/range {v4 .. v9}, Le/k/a/c/e/p/g;->b(JJJ)J move-result-wide v0 @@ -12970,6 +12984,32 @@ return p1 .end method +.method public static b(JJJ)J + .locals 3 + + xor-long/2addr p0, p2 + + mul-long p0, p0, p4 + + const/16 v0, 0x2f + + ushr-long v1, p0, v0 + + xor-long/2addr p0, v1 + + xor-long/2addr p0, p2 + + mul-long p0, p0, p4 + + ushr-long p2, p0, v0 + + xor-long/2addr p0, p2 + + mul-long p0, p0, p4 + + return-wide p0 +.end method + .method public static b(Lcom/google/android/gms/tasks/Task;)Ljava/lang/Object; .locals 1 .annotation system Ldalvik/annotation/Signature; diff --git a/com.discord/smali/o.smali b/com.discord/smali_classes2/o.smali similarity index 100% rename from com.discord/smali/o.smali rename to com.discord/smali_classes2/o.smali diff --git a/com.discord/smali_classes2/okhttp3/Headers$b.smali b/com.discord/smali_classes2/okhttp3/Headers$b.smali index 5a7d262fb6..f71d191352 100644 --- a/com.discord/smali_classes2/okhttp3/Headers$b.smali +++ b/com.discord/smali_classes2/okhttp3/Headers$b.smali @@ -36,11 +36,11 @@ const/4 v2, 0x0 - invoke-static {v0, v2}, Lw/x/c;->downTo(II)Lkotlin/ranges/IntProgression; + invoke-static {v0, v2}, Lw/x/f;->downTo(II)Lkotlin/ranges/IntProgression; move-result-object v0 - invoke-static {v0, v1}, Lw/x/c;->step(Lkotlin/ranges/IntProgression;I)Lkotlin/ranges/IntProgression; + invoke-static {v0, v1}, Lw/x/f;->step(Lkotlin/ranges/IntProgression;I)Lkotlin/ranges/IntProgression; move-result-object v0 @@ -196,11 +196,11 @@ :cond_4 array-length v1, p1 - invoke-static {v4, v1}, Lw/x/c;->until(II)Lkotlin/ranges/IntRange; + invoke-static {v4, v1}, Lw/x/f;->until(II)Lkotlin/ranges/IntRange; move-result-object v1 - invoke-static {v1, v2}, Lw/x/c;->step(Lkotlin/ranges/IntProgression;I)Lkotlin/ranges/IntProgression; + invoke-static {v1, v2}, Lw/x/f;->step(Lkotlin/ranges/IntProgression;I)Lkotlin/ranges/IntProgression; move-result-object v1 diff --git a/com.discord/smali_classes2/w/a0/b$a.smali b/com.discord/smali_classes2/w/a0/b$a.smali index e3db524779..4fe51f0d18 100644 --- a/com.discord/smali_classes2/w/a0/b$a.smali +++ b/com.discord/smali_classes2/w/a0/b$a.smali @@ -69,7 +69,7 @@ move-result p1 - invoke-static {v0, v1, p1}, Lw/x/c;->coerceIn(III)I + invoke-static {v0, v1, p1}, Lw/x/f;->coerceIn(III)I move-result p1 @@ -220,7 +220,7 @@ iget v4, p0, Lw/a0/b$a;->e:I - invoke-static {v4, v2}, Lw/x/c;->until(II)Lkotlin/ranges/IntRange; + invoke-static {v4, v2}, Lw/x/f;->until(II)Lkotlin/ranges/IntRange; move-result-object v4 diff --git a/com.discord/smali_classes2/w/a0/g$b$a.smali b/com.discord/smali_classes2/w/a0/g$b$a.smali index de651cdac6..649d692c4b 100644 --- a/com.discord/smali_classes2/w/a0/g$b$a.smali +++ b/com.discord/smali_classes2/w/a0/g$b$a.smali @@ -79,7 +79,7 @@ move-result v1 - invoke-static {v2, v1}, Lw/x/c;->until(II)Lkotlin/ranges/IntRange; + invoke-static {v2, v1}, Lw/x/f;->until(II)Lkotlin/ranges/IntRange; move-result-object v1 diff --git a/com.discord/smali_classes2/w/a0/g.smali b/com.discord/smali_classes2/w/a0/g.smali index 3e1debc900..16496a201e 100644 --- a/com.discord/smali_classes2/w/a0/g.smali +++ b/com.discord/smali_classes2/w/a0/g.smali @@ -110,7 +110,7 @@ move-result v0 - invoke-static {v1, v0}, Lw/x/c;->until(II)Lkotlin/ranges/IntRange; + invoke-static {v1, v0}, Lw/x/f;->until(II)Lkotlin/ranges/IntRange; move-result-object v0 diff --git a/com.discord/smali_classes2/w/a0/s.smali b/com.discord/smali_classes2/w/a0/s.smali index 36911e7d15..972ab7bf6d 100644 --- a/com.discord/smali_classes2/w/a0/s.smali +++ b/com.discord/smali_classes2/w/a0/s.smali @@ -54,7 +54,7 @@ const/4 p3, 0x0 :cond_4 - invoke-static {p2, p3}, Lw/x/c;->downTo(II)Lkotlin/ranges/IntProgression; + invoke-static {p2, p3}, Lw/x/f;->downTo(II)Lkotlin/ranges/IntProgression; move-result-object p5 diff --git a/com.discord/smali_classes2/w/x/c.smali b/com.discord/smali_classes2/w/x/c.smali index ffa515b3ec..4f67213d87 100644 --- a/com.discord/smali_classes2/w/x/c.smali +++ b/com.discord/smali_classes2/w/x/c.smali @@ -1,209 +1,148 @@ -.class public final Lw/x/c; -.super Lw/x/d; +.class public Lw/x/c; +.super Ljava/lang/Object; +.source "Progressions.kt" + +# interfaces +.implements Ljava/lang/Iterable; +.implements Lw/u/b/z/a; + + +# annotations +.annotation system Ldalvik/annotation/Signature; + value = { + "Ljava/lang/Object;", + "Ljava/lang/Iterable<", + "Ljava/lang/Long;", + ">;", + "Lw/u/b/z/a;" + } +.end annotation + + +# instance fields +.field public final d:J + +.field public final e:J + +.field public final f:J # direct methods -.method public static final coerceAtLeast(II)I - .locals 0 +.method public constructor (JJJ)V + .locals 7 - if-ge p0, p1, :cond_0 + invoke-direct {p0}, Ljava/lang/Object;->()V - move p0, p1 + const-wide/16 v0, 0x0 - :cond_0 - return p0 -.end method + cmp-long v2, p5, v0 -.method public static final coerceAtMost(JJ)J - .locals 1 + if-eqz v2, :cond_5 - cmp-long v0, p0, p2 + const-wide/high16 v0, -0x8000000000000000L - if-lez v0, :cond_0 + cmp-long v3, p5, v0 - move-wide p0, p2 + if-eqz v3, :cond_4 - :cond_0 - return-wide p0 -.end method + iput-wide p1, p0, Lw/x/c;->d:J -.method public static final coerceIn(III)I - .locals 2 + if-lez v2, :cond_1 - if-gt p1, p2, :cond_2 + cmp-long v0, p1, p3 - if-ge p0, p1, :cond_0 - - return p1 - - :cond_0 - if-le p0, p2, :cond_1 - - return p2 - - :cond_1 - return p0 - - :cond_2 - new-instance p0, Ljava/lang/IllegalArgumentException; - - new-instance v0, Ljava/lang/StringBuilder; - - invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - - const-string v1, "Cannot coerce value to an empty range: maximum " - - invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - - invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; - - const-string p2, " is less than minimum " - - invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - - invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; - - const/16 p1, 0x2e - - invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder; - - invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - - move-result-object p1 - - invoke-direct {p0, p1}, Ljava/lang/IllegalArgumentException;->(Ljava/lang/String;)V - - throw p0 -.end method - -.method public static final downTo(II)Lkotlin/ranges/IntProgression; - .locals 2 - - sget-object v0, Lkotlin/ranges/IntProgression;->g:Lkotlin/ranges/IntProgression$a; - - const/4 v1, -0x1 - - invoke-virtual {v0, p0, p1, v1}, Lkotlin/ranges/IntProgression$a;->fromClosedRange(III)Lkotlin/ranges/IntProgression; - - move-result-object p0 - - return-object p0 -.end method - -.method public static final step(Lkotlin/ranges/IntProgression;I)Lkotlin/ranges/IntProgression; - .locals 3 - - const/4 v0, 0x0 - - if-eqz p0, :cond_4 - - if-lez p1, :cond_0 - - const/4 v1, 0x1 + if-ltz v0, :cond_0 goto :goto_0 :cond_0 - const/4 v1, 0x0 + move-wide v0, p3 - :goto_0 - invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + move-wide v2, p1 - move-result-object v2 + move-wide v4, p5 - if-eqz v2, :cond_3 + invoke-static/range {v0 .. v5}, Le/k/a/c/e/p/g;->a(JJJ)J - if-eqz v1, :cond_2 + move-result-wide p1 - sget-object v0, Lkotlin/ranges/IntProgression;->g:Lkotlin/ranges/IntProgression$a; + sub-long/2addr p3, p1 - invoke-virtual {p0}, Lkotlin/ranges/IntProgression;->getFirst()I - - move-result v1 - - invoke-virtual {p0}, Lkotlin/ranges/IntProgression;->getLast()I - - move-result v2 - - invoke-virtual {p0}, Lkotlin/ranges/IntProgression;->getStep()I - - move-result p0 - - if-lez p0, :cond_1 - - goto :goto_1 + goto :goto_0 :cond_1 - neg-int p1, p1 + if-gez v2, :cond_3 - :goto_1 - invoke-virtual {v0, v1, v2, p1}, Lkotlin/ranges/IntProgression$a;->fromClosedRange(III)Lkotlin/ranges/IntProgression; + cmp-long v0, p1, p3 - move-result-object p0 + if-gtz v0, :cond_2 - return-object p0 + goto :goto_0 :cond_2 - new-instance p0, Ljava/lang/IllegalArgumentException; + neg-long v5, p5 - new-instance p1, Ljava/lang/StringBuilder; + move-wide v1, p1 - invoke-direct {p1}, Ljava/lang/StringBuilder;->()V + move-wide v3, p3 - const-string v0, "Step must be positive, was: " + invoke-static/range {v1 .. v6}, Le/k/a/c/e/p/g;->a(JJJ)J - invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + move-result-wide p1 - invoke-virtual {p1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + add-long/2addr p3, p1 - const/16 v0, 0x2e + :goto_0 + iput-wide p3, p0, Lw/x/c;->e:J - invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder; + iput-wide p5, p0, Lw/x/c;->f:J - invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - - move-result-object p1 - - invoke-direct {p0, p1}, Ljava/lang/IllegalArgumentException;->(Ljava/lang/String;)V - - throw p0 + return-void :cond_3 - const-string p0, "step" + new-instance p1, Ljava/lang/IllegalArgumentException; - invoke-static {p0}, Lw/u/b/j;->a(Ljava/lang/String;)V + const-string p2, "Step is zero." - throw v0 + invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;->(Ljava/lang/String;)V + + throw p1 :cond_4 - const-string p0, "$this$step" + new-instance p1, Ljava/lang/IllegalArgumentException; - invoke-static {p0}, Lw/u/b/j;->a(Ljava/lang/String;)V + const-string p2, "Step must be greater than Long.MIN_VALUE to avoid overflow on negation." - throw v0 + invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;->(Ljava/lang/String;)V + + throw p1 + + :cond_5 + new-instance p1, Ljava/lang/IllegalArgumentException; + + const-string p2, "Step must be non-zero." + + invoke-direct {p1, p2}, Ljava/lang/IllegalArgumentException;->(Ljava/lang/String;)V + + throw p1 .end method -.method public static final until(II)Lkotlin/ranges/IntRange; - .locals 1 - const/high16 v0, -0x80000000 +# virtual methods +.method public iterator()Ljava/util/Iterator; + .locals 8 - if-gt p1, v0, :cond_0 + new-instance v7, Lw/x/d; - sget-object p0, Lkotlin/ranges/IntRange;->i:Lkotlin/ranges/IntRange$a; + iget-wide v1, p0, Lw/x/c;->d:J - invoke-virtual {p0}, Lkotlin/ranges/IntRange$a;->getEMPTY()Lkotlin/ranges/IntRange; + iget-wide v3, p0, Lw/x/c;->e:J - move-result-object p0 + iget-wide v5, p0, Lw/x/c;->f:J - return-object p0 + move-object v0, v7 - :cond_0 - new-instance v0, Lkotlin/ranges/IntRange; + invoke-direct/range {v0 .. v6}, Lw/x/d;->(JJJ)V - add-int/lit8 p1, p1, -0x1 - - invoke-direct {v0, p0, p1}, Lkotlin/ranges/IntRange;->(II)V - - return-object v0 + return-object v7 .end method diff --git a/com.discord/smali_classes2/w/x/d.smali b/com.discord/smali_classes2/w/x/d.smali index ab11d967fd..eeb2e23879 100644 --- a/com.discord/smali_classes2/w/x/d.smali +++ b/com.discord/smali_classes2/w/x/d.smali @@ -1,3 +1,117 @@ -.class public Lw/x/d; -.super Ljava/lang/Object; -.source "Ranges.kt" +.class public final Lw/x/d; +.super Lw/q/s; +.source "ProgressionIterators.kt" + + +# instance fields +.field public final d:J + +.field public e:Z + +.field public f:J + +.field public final g:J + + +# direct methods +.method public constructor (JJJ)V + .locals 5 + + invoke-direct {p0}, Lw/q/s;->()V + + iput-wide p5, p0, Lw/x/d;->g:J + + iput-wide p3, p0, Lw/x/d;->d:J + + iget-wide p5, p0, Lw/x/d;->g:J + + const/4 v0, 0x1 + + const/4 v1, 0x0 + + const-wide/16 v2, 0x0 + + cmp-long v4, p5, v2 + + cmp-long p5, p1, p3 + + if-lez v4, :cond_0 + + if-gtz p5, :cond_1 + + goto :goto_0 + + :cond_0 + if-ltz p5, :cond_1 + + goto :goto_0 + + :cond_1 + const/4 v0, 0x0 + + :goto_0 + iput-boolean v0, p0, Lw/x/d;->e:Z + + iget-boolean p3, p0, Lw/x/d;->e:Z + + if-eqz p3, :cond_2 + + goto :goto_1 + + :cond_2 + iget-wide p1, p0, Lw/x/d;->d:J + + :goto_1 + iput-wide p1, p0, Lw/x/d;->f:J + + return-void +.end method + + +# virtual methods +.method public hasNext()Z + .locals 1 + + iget-boolean v0, p0, Lw/x/d;->e:Z + + return v0 +.end method + +.method public nextLong()J + .locals 5 + + iget-wide v0, p0, Lw/x/d;->f:J + + iget-wide v2, p0, Lw/x/d;->d:J + + cmp-long v4, v0, v2 + + if-nez v4, :cond_1 + + iget-boolean v2, p0, Lw/x/d;->e:Z + + if-eqz v2, :cond_0 + + const/4 v2, 0x0 + + iput-boolean v2, p0, Lw/x/d;->e:Z + + goto :goto_0 + + :cond_0 + new-instance v0, Ljava/util/NoSuchElementException; + + invoke-direct {v0}, Ljava/util/NoSuchElementException;->()V + + throw v0 + + :cond_1 + iget-wide v2, p0, Lw/x/d;->g:J + + add-long/2addr v2, v0 + + iput-wide v2, p0, Lw/x/d;->f:J + + :goto_0 + return-wide v0 +.end method diff --git a/com.discord/smali_classes2/w/x/e$a.smali b/com.discord/smali_classes2/w/x/e$a.smali new file mode 100644 index 0000000000..e9709893cd --- /dev/null +++ b/com.discord/smali_classes2/w/x/e$a.smali @@ -0,0 +1,34 @@ +.class public final Lw/x/e$a; +.super Ljava/lang/Object; +.source "Ranges.kt" + + +# annotations +.annotation system Ldalvik/annotation/EnclosingClass; + value = Lw/x/e; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x19 + name = "a" +.end annotation + + +# direct methods +.method public synthetic constructor (Lkotlin/jvm/internal/DefaultConstructorMarker;)V + .locals 0 + + invoke-direct {p0}, Ljava/lang/Object;->()V + + return-void +.end method + + +# virtual methods +.method public final getEMPTY()Lw/x/e; + .locals 1 + + sget-object v0, Lw/x/e;->g:Lw/x/e; + + return-object v0 +.end method diff --git a/com.discord/smali_classes2/w/x/e.smali b/com.discord/smali_classes2/w/x/e.smali new file mode 100644 index 0000000000..11766b8de5 --- /dev/null +++ b/com.discord/smali_classes2/w/x/e.smali @@ -0,0 +1,241 @@ +.class public final Lw/x/e; +.super Lw/x/c; +.source "Ranges.kt" + +# interfaces +.implements Lw/x/a; + + +# annotations +.annotation system Ldalvik/annotation/MemberClasses; + value = { + Lw/x/e$a; + } +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "Lw/x/c;", + "Lw/x/a<", + "Ljava/lang/Long;", + ">;" + } +.end annotation + + +# static fields +.field public static final g:Lw/x/e; + +.field public static final h:Lw/x/e$a; + + +# direct methods +.method public static constructor ()V + .locals 5 + + new-instance v0, Lw/x/e$a; + + const/4 v1, 0x0 + + invoke-direct {v0, v1}, Lw/x/e$a;->(Lkotlin/jvm/internal/DefaultConstructorMarker;)V + + sput-object v0, Lw/x/e;->h:Lw/x/e$a; + + new-instance v0, Lw/x/e; + + const-wide/16 v1, 0x1 + + const-wide/16 v3, 0x0 + + invoke-direct {v0, v1, v2, v3, v4}, Lw/x/e;->(JJ)V + + sput-object v0, Lw/x/e;->g:Lw/x/e; + + return-void +.end method + +.method public constructor (JJ)V + .locals 7 + + const-wide/16 v5, 0x1 + + move-object v0, p0 + + move-wide v1, p1 + + move-wide v3, p3 + + invoke-direct/range {v0 .. v6}, Lw/x/c;->(JJJ)V + + return-void +.end method + + +# virtual methods +.method public equals(Ljava/lang/Object;)Z + .locals 5 + + instance-of v0, p1, Lw/x/e; + + if-eqz v0, :cond_2 + + invoke-virtual {p0}, Lw/x/e;->isEmpty()Z + + move-result v0 + + if-eqz v0, :cond_0 + + move-object v0, p1 + + check-cast v0, Lw/x/e; + + invoke-virtual {v0}, Lw/x/e;->isEmpty()Z + + move-result v0 + + if-nez v0, :cond_1 + + :cond_0 + iget-wide v0, p0, Lw/x/c;->d:J + + check-cast p1, Lw/x/e; + + iget-wide v2, p1, Lw/x/c;->d:J + + cmp-long v4, v0, v2 + + if-nez v4, :cond_2 + + iget-wide v0, p0, Lw/x/c;->e:J + + iget-wide v2, p1, Lw/x/c;->e:J + + cmp-long p1, v0, v2 + + if-nez p1, :cond_2 + + :cond_1 + const/4 p1, 0x1 + + goto :goto_0 + + :cond_2 + const/4 p1, 0x0 + + :goto_0 + return p1 +.end method + +.method public getEndInclusive()Ljava/lang/Comparable; + .locals 2 + + iget-wide v0, p0, Lw/x/c;->e:J + + invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v0 + + return-object v0 +.end method + +.method public getStart()Ljava/lang/Comparable; + .locals 2 + + iget-wide v0, p0, Lw/x/c;->d:J + + invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v0 + + return-object v0 +.end method + +.method public hashCode()I + .locals 7 + + invoke-virtual {p0}, Lw/x/e;->isEmpty()Z + + move-result v0 + + if-eqz v0, :cond_0 + + const/4 v0, -0x1 + + goto :goto_0 + + :cond_0 + const/16 v0, 0x1f + + int-to-long v0, v0 + + iget-wide v2, p0, Lw/x/c;->d:J + + const/16 v4, 0x20 + + ushr-long v5, v2, v4 + + xor-long/2addr v2, v5 + + mul-long v0, v0, v2 + + iget-wide v2, p0, Lw/x/c;->e:J + + ushr-long v4, v2, v4 + + xor-long/2addr v2, v4 + + add-long/2addr v0, v2 + + long-to-int v0, v0 + + :goto_0 + return v0 +.end method + +.method public isEmpty()Z + .locals 5 + + iget-wide v0, p0, Lw/x/c;->d:J + + iget-wide v2, p0, Lw/x/c;->e:J + + cmp-long v4, v0, v2 + + if-lez v4, :cond_0 + + const/4 v0, 0x1 + + goto :goto_0 + + :cond_0 + const/4 v0, 0x0 + + :goto_0 + return v0 +.end method + +.method public toString()Ljava/lang/String; + .locals 3 + + new-instance v0, Ljava/lang/StringBuilder; + + invoke-direct {v0}, Ljava/lang/StringBuilder;->()V + + iget-wide v1, p0, Lw/x/c;->d:J + + invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder; + + const-string v1, ".." + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + iget-wide v1, p0, Lw/x/c;->e:J + + invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)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_classes2/w/x/f.smali b/com.discord/smali_classes2/w/x/f.smali new file mode 100644 index 0000000000..38a78e2b56 --- /dev/null +++ b/com.discord/smali_classes2/w/x/f.smali @@ -0,0 +1,240 @@ +.class public final Lw/x/f; +.super Lw/x/g; + + +# direct methods +.method public static final coerceAtLeast(II)I + .locals 0 + + if-ge p0, p1, :cond_0 + + move p0, p1 + + :cond_0 + return p0 +.end method + +.method public static final coerceAtMost(JJ)J + .locals 1 + + cmp-long v0, p0, p2 + + if-lez v0, :cond_0 + + move-wide p0, p2 + + :cond_0 + return-wide p0 +.end method + +.method public static final coerceIn(III)I + .locals 2 + + if-gt p1, p2, :cond_2 + + if-ge p0, p1, :cond_0 + + return p1 + + :cond_0 + if-le p0, p2, :cond_1 + + return p2 + + :cond_1 + return p0 + + :cond_2 + new-instance p0, Ljava/lang/IllegalArgumentException; + + new-instance v0, Ljava/lang/StringBuilder; + + invoke-direct {v0}, Ljava/lang/StringBuilder;->()V + + const-string v1, "Cannot coerce value to an empty range: maximum " + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; + + const-string p2, " is less than minimum " + + invoke-virtual {v0, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; + + const/16 p1, 0x2e + + invoke-virtual {v0, p1}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder; + + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + + move-result-object p1 + + invoke-direct {p0, p1}, Ljava/lang/IllegalArgumentException;->(Ljava/lang/String;)V + + throw p0 +.end method + +.method public static final downTo(II)Lkotlin/ranges/IntProgression; + .locals 2 + + sget-object v0, Lkotlin/ranges/IntProgression;->g:Lkotlin/ranges/IntProgression$a; + + const/4 v1, -0x1 + + invoke-virtual {v0, p0, p1, v1}, Lkotlin/ranges/IntProgression$a;->fromClosedRange(III)Lkotlin/ranges/IntProgression; + + move-result-object p0 + + return-object p0 +.end method + +.method public static final step(Lkotlin/ranges/IntProgression;I)Lkotlin/ranges/IntProgression; + .locals 3 + + const/4 v0, 0x0 + + if-eqz p0, :cond_4 + + if-lez p1, :cond_0 + + const/4 v1, 0x1 + + goto :goto_0 + + :cond_0 + const/4 v1, 0x0 + + :goto_0 + invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + + move-result-object v2 + + if-eqz v2, :cond_3 + + if-eqz v1, :cond_2 + + sget-object v0, Lkotlin/ranges/IntProgression;->g:Lkotlin/ranges/IntProgression$a; + + invoke-virtual {p0}, Lkotlin/ranges/IntProgression;->getFirst()I + + move-result v1 + + invoke-virtual {p0}, Lkotlin/ranges/IntProgression;->getLast()I + + move-result v2 + + invoke-virtual {p0}, Lkotlin/ranges/IntProgression;->getStep()I + + move-result p0 + + if-lez p0, :cond_1 + + goto :goto_1 + + :cond_1 + neg-int p1, p1 + + :goto_1 + invoke-virtual {v0, v1, v2, p1}, Lkotlin/ranges/IntProgression$a;->fromClosedRange(III)Lkotlin/ranges/IntProgression; + + move-result-object p0 + + return-object p0 + + :cond_2 + new-instance p0, Ljava/lang/IllegalArgumentException; + + new-instance p1, Ljava/lang/StringBuilder; + + invoke-direct {p1}, Ljava/lang/StringBuilder;->()V + + const-string v0, "Step must be positive, was: " + + invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {p1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + + const/16 v0, 0x2e + + invoke-virtual {p1, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder; + + invoke-virtual {p1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + + move-result-object p1 + + invoke-direct {p0, p1}, Ljava/lang/IllegalArgumentException;->(Ljava/lang/String;)V + + throw p0 + + :cond_3 + const-string p0, "step" + + invoke-static {p0}, Lw/u/b/j;->a(Ljava/lang/String;)V + + throw v0 + + :cond_4 + const-string p0, "$this$step" + + invoke-static {p0}, Lw/u/b/j;->a(Ljava/lang/String;)V + + throw v0 +.end method + +.method public static final until(II)Lkotlin/ranges/IntRange; + .locals 1 + + const/high16 v0, -0x80000000 + + if-gt p1, v0, :cond_0 + + sget-object p0, Lkotlin/ranges/IntRange;->i:Lkotlin/ranges/IntRange$a; + + invoke-virtual {p0}, Lkotlin/ranges/IntRange$a;->getEMPTY()Lkotlin/ranges/IntRange; + + move-result-object p0 + + return-object p0 + + :cond_0 + new-instance v0, Lkotlin/ranges/IntRange; + + add-int/lit8 p1, p1, -0x1 + + invoke-direct {v0, p0, p1}, Lkotlin/ranges/IntRange;->(II)V + + return-object v0 +.end method + +.method public static final until(IJ)Lw/x/e; + .locals 4 + + const-wide/high16 v0, -0x8000000000000000L + + cmp-long v2, p1, v0 + + if-gtz v2, :cond_0 + + sget-object p0, Lw/x/e;->h:Lw/x/e$a; + + invoke-virtual {p0}, Lw/x/e$a;->getEMPTY()Lw/x/e; + + move-result-object p0 + + return-object p0 + + :cond_0 + int-to-long v0, p0 + + new-instance p0, Lw/x/e; + + const-wide/16 v2, 0x1 + + sub-long/2addr p1, v2 + + invoke-direct {p0, v0, v1, p1, p2}, Lw/x/e;->(JJ)V + + return-object p0 +.end method diff --git a/com.discord/smali_classes2/w/x/g.smali b/com.discord/smali_classes2/w/x/g.smali new file mode 100644 index 0000000000..bb4b81a946 --- /dev/null +++ b/com.discord/smali_classes2/w/x/g.smali @@ -0,0 +1,3 @@ +.class public Lw/x/g; +.super Ljava/lang/Object; +.source "Ranges.kt" diff --git a/com.discord/smali_classes2/x/a/a2/w.smali b/com.discord/smali_classes2/x/a/a2/w.smali index ede24348f7..d51b72fabd 100644 --- a/com.discord/smali_classes2/x/a/a2/w.smali +++ b/com.discord/smali_classes2/x/a/a2/w.smali @@ -2448,7 +2448,7 @@ const-wide/16 v3, 0x40 - invoke-static {v1, v2, v3, v4}, Lw/x/c;->coerceAtMost(JJ)J + invoke-static {v1, v2, v3, v4}, Lw/x/f;->coerceAtMost(JJ)J move-result-wide v5 diff --git a/com.discord/smali_classes2/x/a/b2/b.smali b/com.discord/smali_classes2/x/a/b2/b.smali index c7f53c40b7..c790769543 100644 --- a/com.discord/smali_classes2/x/a/b2/b.smali +++ b/com.discord/smali_classes2/x/a/b2/b.smali @@ -123,7 +123,7 @@ int-to-long v2, v2 - invoke-static {v0, v1, v2, v3}, Lw/x/c;->coerceAtMost(JJ)J + invoke-static {v0, v1, v2, v3}, Lw/x/f;->coerceAtMost(JJ)J move-result-wide v0 diff --git a/com.discord/smali_classes2/x/a/b2/m.smali b/com.discord/smali_classes2/x/a/b2/m.smali index f018c27d8a..c474d8b97d 100644 --- a/com.discord/smali_classes2/x/a/b2/m.smali +++ b/com.discord/smali_classes2/x/a/b2/m.smali @@ -75,7 +75,7 @@ const/4 v1, 0x2 - invoke-static {v0, v1}, Lw/x/c;->coerceAtLeast(II)I + invoke-static {v0, v1}, Lw/x/f;->coerceAtLeast(II)I move-result v3 @@ -103,7 +103,7 @@ const v2, 0x1ffffe - invoke-static {v0, v1, v2}, Lw/x/c;->coerceIn(III)I + invoke-static {v0, v1, v2}, Lw/x/f;->coerceIn(III)I move-result v4 diff --git a/com.discord/smali_classes2/x/a/f0.smali b/com.discord/smali_classes2/x/a/f0.smali index f43c90af34..cf53a952bd 100644 --- a/com.discord/smali_classes2/x/a/f0.smali +++ b/com.discord/smali_classes2/x/a/f0.smali @@ -334,7 +334,7 @@ :cond_5 :try_start_3 - invoke-static {v5, v6, v9, v10}, Lw/x/c;->coerceAtMost(JJ)J + invoke-static {v5, v6, v9, v10}, Lw/x/f;->coerceAtMost(JJ)J move-result-wide v5 @@ -343,7 +343,7 @@ :cond_6 sget-wide v9, Lx/a/f0;->i:J - invoke-static {v5, v6, v9, v10}, Lw/x/c;->coerceAtMost(JJ)J + invoke-static {v5, v6, v9, v10}, Lw/x/f;->coerceAtMost(JJ)J move-result-wide v5 diff --git a/com.discord/smali_classes2/x/a/z1/a.smali b/com.discord/smali_classes2/x/a/z1/a.smali index 18e2644e38..c391f99f43 100644 --- a/com.discord/smali_classes2/x/a/z1/a.smali +++ b/com.discord/smali_classes2/x/a/z1/a.smali @@ -86,7 +86,7 @@ const-wide v2, 0x3fffffffffffffffL # 1.9999999999999998 - invoke-static {p1, p2, v2, v3}, Lw/x/c;->coerceAtMost(JJ)J + invoke-static {p1, p2, v2, v3}, Lw/x/f;->coerceAtMost(JJ)J move-result-wide p1