From d9f15b99ae48e2c93aa73b9d0fb78685bcc396d6 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 14 Jan 2020 06:14:30 +0100 Subject: [PATCH] Changes of com.discord v1021 --- com.discord/apktool.yml | 6 +- .../assets/crashlytics-build.properties | 8 +- com.discord/original/AndroidManifest.xml | Bin 31876 -> 31876 bytes .../res/drawable-xhdpi/bg_nitro_classic.png | Bin 64559 -> 64558 bytes .../bg_cloud_pattern_light.png | Bin 13704 -> 13712 bytes ..._profile_badge_bughunter_level_1_32dp.xml} | 0 ...c_profile_badge_bughunter_level_2_32dp.xml | 11 + com.discord/res/layout/view_boxed_button.xml | 2 +- ...ettings_premium_guild_marketing_header.xml | 2 +- .../res/layout/widget_guild_invite_share.xml | 2 +- .../layout/widget_guilds_list_item_guild.xml | 4 +- .../res/layout/widget_incoming_share.xml | 2 +- .../layout/widget_premium_guild_transfer.xml | 4 +- .../widget_remote_auth_pending_login.xml | 2 +- .../res/layout/widget_server_boost_status.xml | 4 +- .../widget_server_settings_audit_log.xml | 2 +- .../widget_settings_authorized_apps.xml | 2 +- com.discord/res/values/public.xml | 711 +++++++++--------- com.discord/res/values/strings.xml | 2 +- com.discord/res/values/styles.xml | 3 +- .../smali/androidx/activity/R$drawable.smali | 24 +- .../smali/androidx/appcompat/R$drawable.smali | 28 +- .../appcompat/resources/R$drawable.smali | 24 +- .../asynclayoutinflater/R$drawable.smali | 24 +- .../smali/androidx/browser/R$drawable.smali | 24 +- .../coordinatorlayout/R$drawable.smali | 24 +- .../smali/androidx/core/R$drawable.smali | 24 +- .../smali/androidx/core/ktx/R$drawable.smali | 24 +- .../androidx/customview/R$drawable.smali | 24 +- .../androidx/drawerlayout/R$drawable.smali | 24 +- .../dynamicanimation/R$drawable.smali | 24 +- .../smali/androidx/fragment/R$drawable.smali | 24 +- .../androidx/legacy/coreui/R$drawable.smali | 24 +- .../legacy/coreutils/R$drawable.smali | 24 +- .../smali/androidx/legacy/v4/R$drawable.smali | 24 +- .../lifecycle/extensions/R$drawable.smali | 24 +- .../smali/androidx/loader/R$drawable.smali | 24 +- .../smali/androidx/media/R$drawable.smali | 24 +- .../androidx/preference/R$drawable.smali | 30 +- .../androidx/preference/ktx/R$drawable.smali | 30 +- .../androidx/recyclerview/R$drawable.smali | 24 +- .../smali/androidx/room/R$drawable.smali | 24 +- .../slidingpanelayout/R$drawable.smali | 24 +- .../swiperefreshlayout/R$drawable.smali | 24 +- .../androidx/transition/R$drawable.smali | 24 +- .../androidx/vectordrawable/R$drawable.smali | 24 +- .../vectordrawable/animated/R$drawable.smali | 24 +- .../smali/androidx/viewpager/R$drawable.smali | 24 +- .../androidx/viewpager2/R$drawable.smali | 24 +- .../smali/androidx/work/R$drawable.smali | 24 +- .../smali/androidx/work/ktx/R$drawable.smali | 24 +- .../smali/com/discord/BuildConfig.smali | 6 +- .../com/discord/gateway/R$drawable.smali | 52 +- .../com/discord/models/domain/ModelUser.smali | 18 +- .../models/domain/ModelUserAffinities.smali | 310 ++++++++ .../models/domain/ModelUserAffinity.smali | 192 +++++ .../smali/com/discord/overlay/R$c.smali | 32 +- .../com/discord/restapi/R$drawable.smali | 52 +- .../discord/restapi/RestAPIInterface.smali | 15 + .../stores/StoreChannels$getDMs$1.smali | 144 ++++ .../com/discord/stores/StoreChannels.smali | 83 +- .../discord/stores/StoreClientVersion.smali | 2 +- .../StoreMediaNotification$init$4.smali | 40 +- .../com/discord/stores/StoreNavigation.smali | 2 +- .../stores/StoreStream$Companion.smali | 14 + .../com/discord/stores/StoreStream.smali | 42 +- ...erAffinities$fetchUserAffinities$1$1.smali | 74 ++ ...UserAffinities$fetchUserAffinities$1.smali | 88 +++ ...eUserAffinities$getAffinityUserIds$1.smali | 130 ++++ .../discord/stores/StoreUserAffinities.smali | 245 ++++++ .../analytics/AnalyticSuperProperties.smali | 6 +- ...ticsTracker$inviteSuggestionOpened$1.smali | 2 +- ...ticsTracker$inviteSuggestionOpened$2.smali | 38 +- .../analytics/AnalyticsTracker.smali | 173 +++-- .../utilities/fcm/NotificationCache.smali | 4 +- .../utilities/fcm/NotificationData.smali | 682 +++++++---------- .../utilities/fcm/NotificationRenderer.smali | 8 +- .../discord/utilities/icon/IconUtils.smali | 24 +- .../images/MGImagesBitmap$getBitmap$1$1.smali | 20 +- .../discord/utilities/platform/Platform.smali | 26 +- .../rest/RestAPI$AppHeadersProvider.smali | 2 +- .../com/discord/utilities/rest/RestAPI.smali | 24 + .../voice/DiscordOverlayService.smali | 2 +- ...VoiceEngineForegroundService$Actions.smali | 43 +- ...ndService$Constants$ACTION$Companion.smali | 2 - ...neForegroundService$Constants$ACTION.smali | 2 - .../voice/VoiceEngineForegroundService.smali | 38 +- .../utilities/voice/VoiceViewUtils.smali | 8 +- com.discord/smali/com/discord/utils/R$c.smali | 52 +- .../ActiveSubscriptionView$HeaderImage.smali | 6 +- .../smali/com/discord/views/StatusView.smali | 16 +- .../PremiumSubscriptionMarketingView.smali | 214 +++--- .../channels/list/WidgetChannelsList.smali | 4 +- ...ChannelsListAdapter$ItemChannelVoice.smali | 2 +- ...WidgetChatListAdapterItemCallMessage.smali | 4 +- .../list/WidgetChatListAdapterItemGift.smali | 4 +- .../WidgetChatListAdapterItemInvite.smali | 2 +- ...dgetChatListAdapterItemSystemMessage.smali | 4 +- ...WidgetChatListActions$configureUI$14.smali | 9 + .../list/actions/WidgetChatListActions.smali | 70 +- .../widgets/debugging/WidgetFatalCrash.smali | 2 +- .../InviteSuggestionsService$Companion.smali | 36 +- ...Service$observeInviteSuggestions$1$1.smali | 102 +++ ...nsService$observeInviteSuggestions$1.smali | 130 ++-- ...nsService$observeInviteSuggestions$2.smali | 379 ++++++++++ .../invite/InviteSuggestionsService.smali | 93 ++- .../guilds/invite/UserAffinityData.smali | 437 +++++++++++ ...eShare$InviteSuggestionItem$Channel.smali} | 109 ++- ...teSuggestionItem$SearchNoResultsItem.smali | 52 ++ ...nviteShare$InviteSuggestionItem$User.smali | 268 +++++++ ...uildInviteShare$InviteSuggestionItem.smali | 74 ++ ...ateChannelAdapter$Item$onConfigure$1.smali | 14 +- ...viteShare$PrivateChannelAdapter$Item.smali | 145 +++- ...hare$PrivateChannelAdapter$onClick$1.smali | 8 +- ...ildInviteShare$PrivateChannelAdapter.smali | 8 +- ...GuildInviteShare$SearchNoResultsItem.smali | 61 -- ...WidgetGuildInviteShare$configureUI$2.smali | 92 --- ...WidgetGuildInviteShare$configureUI$3.smali | 61 +- ...WidgetGuildInviteShare$configureUI$4.smali | 84 +-- ...WidgetGuildInviteShare$configureUI$5.smali | 85 ++- ...WidgetGuildInviteShare$configureUI$6.smali | 58 ++ .../WidgetGuildInviteShare$sendInvite$1.smali | 88 --- .../invite/WidgetGuildInviteShare.smali | 649 ++++++++-------- .../WidgetGuildInviteShareViewModel$1.smali | 2 +- .../WidgetGuildInviteShareViewModel$2.smali | 2 +- ...nviteShareViewModel$ViewState$Loaded.smali | 10 +- ...ewModel$observeViewStateFromStores$1.smali | 240 ++++-- ...Model$observeWidgetInviteViewModel$1.smali | 31 +- ...ShareViewModel$sendInviteToChannel$1.smali | 171 +++++ ...iteShareViewModel$sendInviteToUser$1.smali | 85 +++ .../WidgetGuildInviteShareViewModel.smali | 263 ++++++- ...dgetGuildInviteShareViewModelFactory.smali | 24 +- .../guilds/invite/WidgetInviteInfo.smali | 2 +- .../invite/WidgetInviteModel$Companion.smali | 190 ++--- .../guilds/invite/WidgetInviteModel.smali | 271 +++++-- .../GuildListViewHolder$GuildViewHolder.smali | 358 ++++++--- .../profile/WidgetGuildProfileSheet.smali | 2 +- .../PremiumGuildSubscriptionPerkView.smali | 8 +- .../WidgetPremiumGuildSubscription.smali | 12 +- .../widgets/settings/WidgetSettings.smali | 2 +- .../settings/WidgetSettingsLanguage.smali | 198 ++--- .../premium/WidgetSettingsPremium.smali | 4 +- .../widgets/user/Badge$Companion.smali | 171 +++-- .../user/WidgetUserSetCustomStatus.smali | 2 +- .../widgets/user/WidgetUserStatusSheet.smali | 8 +- .../user/profile/WidgetUserProfileStrip.smali | 2 +- .../call/WidgetPrivateCallControlsView.smali | 4 +- .../voice/call/WidgetVoiceCallIncoming.smali | 2 +- com.discord/smali/e/a/a/a/a.smali | 12 +- com.discord/smali/e/a/j/v.smali | 2 +- .../WidgetRemoteAuthViewModel$f.smali | 0 .../google/android/material/R$drawable.smali | 50 +- .../com/lytefast/flexinput/R$d.smali | 54 +- .../miguelgaeta/media_picker/R$drawable.smali | 52 +- .../com/yalantis/ucrop/R$c.smali | 52 +- .../smali_classes2/e/k/a/b/e/p/g.smali | 56 ++ com.discord/smali_classes2/t/q/l.smali | 71 ++ 157 files changed, 6818 insertions(+), 3189 deletions(-) rename com.discord/res/drawable/{ic_profile_badge_bughunter_32dp.xml => ic_profile_badge_bughunter_level_1_32dp.xml} (100%) create mode 100644 com.discord/res/drawable/ic_profile_badge_bughunter_level_2_32dp.xml create mode 100644 com.discord/smali/com/discord/models/domain/ModelUserAffinities.smali create mode 100644 com.discord/smali/com/discord/models/domain/ModelUserAffinity.smali create mode 100644 com.discord/smali/com/discord/stores/StoreChannels$getDMs$1.smali create mode 100644 com.discord/smali/com/discord/stores/StoreUserAffinities$fetchUserAffinities$1$1.smali create mode 100644 com.discord/smali/com/discord/stores/StoreUserAffinities$fetchUserAffinities$1.smali create mode 100644 com.discord/smali/com/discord/stores/StoreUserAffinities$getAffinityUserIds$1.smali create mode 100644 com.discord/smali/com/discord/stores/StoreUserAffinities.smali create mode 100644 com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1$1.smali create mode 100644 com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$2.smali create mode 100644 com.discord/smali/com/discord/widgets/guilds/invite/UserAffinityData.smali rename com.discord/smali/com/discord/widgets/guilds/invite/{WidgetGuildInviteShare$ChannelItem.smali => WidgetGuildInviteShare$InviteSuggestionItem$Channel.smali} (59%) create mode 100644 com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$SearchNoResultsItem.smali create mode 100644 com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User.smali create mode 100644 com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem.smali delete mode 100644 com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$SearchNoResultsItem.smali delete mode 100644 com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2.smali create mode 100644 com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$6.smali delete mode 100644 com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$sendInvite$1.smali create mode 100644 com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1.smali create mode 100644 com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToUser$1.smali rename com.discord/{smali => smali_classes2}/WidgetRemoteAuthViewModel$f.smali (100%) diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index 1243995c55..96187a3b5f 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-1020.apk +apkFileName: com.discord-1021.apk compressionType: false doNotCompress: - arsc @@ -184,5 +184,5 @@ usesFramework: tag: null version: 2.4.1-197d46-SNAPSHOT versionInfo: - versionCode: '1020' - versionName: 10.2.0 + versionCode: '1021' + versionName: 10.2.1 diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties index 4950e56132..8764f6bebe 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 Jan 11 01:03:36 UTC 2020 -version_name=10.2.0 +#Tue Jan 14 03:18:14 UTC 2020 +version_name=10.2.1 package_name=com.discord -build_id=3735047e-2c54-4100-a69d-11d9da1124d0 -version_code=1020 +build_id=c1541b19-19b9-4651-8f2d-5c0350a9d04c +version_code=1021 app_name=com.discord diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index 2ab2a18ff97e5939a71c7dea66091e20f2683f96..e1019eb18f3f7308b6baabe63cd28d97ce0b652e 100644 GIT binary patch delta 23 fcmZqq$=LFfaf1mbqv2*#&U8b@znkY;J$D2EZypI% delta 23 fcmZqq$=LFfaf1mbqrqlV&U8b@Kbz-TJ$D2EZwm=i diff --git a/com.discord/res/drawable-xhdpi/bg_nitro_classic.png b/com.discord/res/drawable-xhdpi/bg_nitro_classic.png index 4ae051f19618eb12bfc172bfbf69c09b3eb99a26..481d5dc477838ff4d59c72024c1e5b1dc597a16e 100644 GIT binary patch delta 3155 zcmZuyc{tP!*Zwiqk?Ae#gjB*15k-@|c#ABPtTox1A?sKk4buE1@)(L3Tek69Dr7>4 z#*!s5wzjc0h%wocWf(E$>+8L)?|Q%M`_3QdI)9yWpZmVfeJC7A6$kQCJBDw*_EgL( z9LQ1NPV~!$&p{9t(?dRj%pUuytNuY_375v)_(G0493RP&zoY?lFIcvh@hx z@<5EB9DvQmQK9@KP2Z$<^aV-((=J7C`p(4{!U=k5Ogf z_4+^jiWyfEk~=CU=rOZeQL0Ox-Rh|U#hE{^w7vJ;hpM;q9Ti*nTYDVKc6#x3Ek=u< zbThIDQ%=hC%!wD3@b-DZaGnuJmRBW)w6DIc;pLi>zHdz0)S`tY zlGNSsOJzmr%aOyHgSGgSYP3~u)WJElp5NjW7Jh*u+=h621qg}cQ)qhkAa zJYJ{j{S1z+z6_CD5`*43$%p#*Zn4el;hfVgjtMVvTnACqS9Z%Z5s<}Ga~)kRavpcx zm6nu$p0i;EmAs!Nzu#aSle@jTcy=Ux zHT?J!>T}7z33l;D+Gs~VNGhgIdZ2!dPuV#jHZ^`qjX?0oBCzm>1!>^UhBz$;-8|_+ zG4F}dxyCCCbpm|Utn-pRTKAlEivs!y3Kr- zSXkL9)8`sf&eQyMVD_@Zm9=(x7(z)b!ey%?PPBGBL{;#d1f(nl%pXm=dev;Sp8CeSTgGWXe)W_O&t1ehy+QBwa>ND6-i zhLM8MgFY~f919_Jk;Q8t4xqd|`xheyN`k8&o!K z1Ml%^^9O)<=*)>Dt^rGogQ)fgqF>T4G}7+wtK!o6+r!sKAx&pHj}c(i9Z^OeADB zsYXkQrtdu*#-0uK8@wNlcZZXy5n7?DU6CFF8b|s2#8HndHjCqYv{Q9Qe>^;4!Zl;vELUFfX%ke=d9(3Ql^Q1WFyQwzmR^j*Mo7h6r~-Q&&sN0sqHl zYL!A=8pR?}w))h-oas;q*=3f+XW$h>R86drN7=fOo7UdKQRO?-9yj%pN=BluARCjd zfD#eCgmiqFW{Pz&_H2(64UxSns3vOtz$fRuC&`xT2%NF&ZBj5|oi3|PzSj2?>h$DudbaTPx!(JgP?Y-RMh!J%>SOi6 zt@bkU+ktN?l9|@hXxk^u=!O%43&(^*o&FJk7bZFMLdq>2vu|=>0e=={Lkkgo$kbA# zl@a{*IfJHRO-h#m(CY_)rBQv;Wt1ViU>`NBK$ZARW*gt<_%aRFt|pi8ZJ%244hBM` zYF`wWo{5u4)i&^8XQI+nBxmA8B~+|;y#fQypBl)_*EgCKB3Vjd53u-UN|yc#zl9v5 zs->hIHpzkX1TJW;VD@gpX*V(^t?6XMwWiT^ybGbs(gyRv~{b21!F(AQ5CRhzl;C=(MdX?AnBaB?<%Vb*1KG?XV?fC*%sb_{8SRCxFqpWwZ&axCnJ&>Hu929Z!w`v zf^p32-)aJfP6su==+L=;6TE#g7=x~-J?KBy=O^+xe`4;s3Pvhn-7lmi8;3aYk!8H$ z79&;ib<*N&Dfip+EMN?N08E#A=4rA)tA*6T zOIg1g-NM<^9moo8;rwtuHA&k(X`D5AalH#)p+(HoYI!I`D62T4wMy&c@hrucMP7x; zhzH1eDS0Bf)--)Q@4GU^J1G>4NO*c8(toB6o* zIP7)Cka3adg`MiMzN9za{T3bG%V(brd@2c_zK~t>K(Slj%Q#N-6Lp&PC0ubpXu&v3 zJnx)F1FuM-%^h`W`_56QRW@bsm;dgO#(U7-TKsut9A*8*KjCmml0h*@HjL_$3NPU# zRl7-e07v0208zT8&yY2}4#ad0ELEg-f(`Qquv`8i8WU9ha#Ay#M zT=KX+u+*hJ5#;_lR%aIT$AW(Ukl!Br+lzh|YcNwWKvsCTwhvD7cO@wnn7@mnYy8T6 zW;VXnQWeOE7O^MB8fIQdY|Q*zf1{se7PHm`Dul^;Rh1bTr1tunLn6*lG72ONV1KRL zS6iOq%A1gDCSVc*I^v(=#8{55i(kgB?a7z34^#6hJyGZwW z0)htK5v5+?}viczJL$0EVbGM5rFo z{0#x<{SOxYjpMDl*0A>`zXNG6l0o$U2Gm-cZiBBg z4dw+dYQ79s>g{9*d;ymkuNaFwskV8fx(qEUIwsC|>!^jQ^&UGY_8;|?Oc?OK=6c$zi0n3@c?!SrB>AT$@A0Uz7`^6#h(EsY7 z`A5Do`lqIY<<>#PRU6yQ4n^!kh=S=D`&q9C;eJ^{ORIpYd!;e2sg<5i-jUR+4?uKW zJ^fgiJ$n+;TN8Q;Lf-d(6_^n~+>Z*?XJP7K06Bo43`<|#k#rmfm@fd54Qeo6&4-K@ z0hrVM|JtOS`G5G!)|5k7AfxK`(Y&&J>R|HdLAljyJjMMwjaPY9(YnCzu(Yr>uR8A$ F`(JHu8(jbZ delta 3168 zcmZuzc{tnY7EZ)ct>xBIl%k7DQ6pL;#uAKnER9I1#;$FOqNXuZRQRQ}4O+t_4J9QQ zZB%QCrS>RQBofmpO6@AtmMFEvmfM-TKKHrbALpDu&hwt{d(U~^^ObEv$~PeuMnv#@ z6^vLN4uAT#4Y2+ig7UIpuVsGmY( z+Y*la&X>7d0Y=vf-;`=2hkmUM3Vng9JQuIrz&7Z+_F$}5hV`*Oy&`DAY^d9;Uh~L^ z!Ec-x*PwSAFXZbUU#U3AK!Z#*nV#kl$GCh0U>Gf@C2^nn287EcQ<`b%`>K2{h4+6r zEx&mTiJ+)BK5-0IqhPa*0&Wk?$C{v8yKWV#>S|~$>d~r8prt{}w`-!$v#O=s<4BTF z=@wry*)Ez;8opwMk)3+GViB{U$}X-h(GB3@ifZM2DX=ehK=&0iB>tAAf^LHi3bz4h zpn}y)6yWKr4)+oyTv;Kp9w{AKSmZlsAsr|;iN)G`1@F-b`c*+OksxxCK7n4SVK@NN z8EleIIuHzz*HvviTk)!eRxzsp(g|ylGZ+ZEnV2M6&3}11UV#;wDoNf)yw%x=edtbB z!;S>nz`%pAvx2%?GT0;iGaLa4C`O#|%_fPHuU;3*&HrpP>><nADb7lf?S~s7v_9^4Jd|ytnH0GK1Ewv0v4e5T zWS_Hf5LVcY&)i%atRyXA$D#T`cwM&G#0i6!$I1skGpHwiw(wfYn4EYvoNrzVowFJu z`!*Q`9)^%vVsXlb%Rs^qN?GTdo=KuHgP8o2wR5&nlQ1UXeBKqPYg;hi@Gy1rFNB=-bQb(0I{EfEBQ?6&+F)%JtHGJn}%`y6knnV+N zT^e4yRJG!E+B&~vOM}i)fA~u}QQ<&{Z)e2G#I!K)?s^8_8~CCCo-1lFx+p=Leksv^ z(lkoF1(I7EDTNGfYSVQiOZjh5hzh38^gIpLL-R#~7)^%AsFq=2K*fX}u78yjv*POC z*kP`pX2C*=it+fb?Qe?uS6c;>ejdnf0m;NL-i>@jLg%B7c|fDWbuYGd17qUuECvHZ zUEcV!xxhO+9r!L*92!GH-&X|To~1G}Bn9v1WXD=e!&%&???YmGlgsOJDx(q^W!>u9 ze&kp+YzwS0uT(erVvOc=<2DP#>xjwx_7oR#++X^j|4ky^fT5*h5r3E3eLLKHt{zV~ zf`x|E$VO#>p>y>C%|-aU%li%WGK+j=0Dqa)ro zO~x_61bSV~{`ZK6$uPD|mO7~8n6>=iL5Q1$1DQv}uZZ6o$j~U9obn_~W;{*A`vxT{W+{6ERp8&H+XZ zDP*lSR|LoV4D{j5{t=GOjQ@kmNx-*rq7R!#%y6U4%E$Nv!Max;t@ zTuf%)ek-`U+nK5}zCbj$Du8y3nV znNq~bU4hPhCLuCLp6solW~?cdBkn@ZHQCg{;#^B0nHQMTM}jp1CiiMqCQl$8qFS>{*%>;X|>V%iMYJ_5#x@_{MQt+=g?c|TL@6rraXfLnbR-n*MGLL!B0et_NgDeIRJ z%l5?j49EpXBj8J<9_R8lmb=v}AF9bw)c+LKsxQ%vaFTgGSTW%@@#ZtBC(4U?WRL%1 zX*Py>5%IQH9!|sDE6AT@C${tBSI_lyd%@-dO`oQSR)?u$=Zg3dx!Gn;FpL;s=bX$Q zuoii^p?Pa`p*Y(M@g$$b>|~xE5E;%w5#`g*`9(9p!?40_V$FKSZrIYSI&8tZSDB_X zBx`K_`8uCc6;<^Z!WL^$taBy^L@cXoo$03qRK*zQU*7NM4BPj1=Sua@_)G`d4rO+x zbS8!o`5Uzb+Y^zq*E56DZz_zxdOa?G*fd!-2jU%>d*;H2^;cF$W2d%FD*YaLSS8DP zg)eObt6LW?x9AuSOJ4XmFl=sc2EHCRD|Y@3t}%4bpzV1QaY??5M zaV(Z^Cy=;o^C8UT8p#yv#zj#rTZqG(YJikzZzU1yMx{b+95yEoH&wI z6JkdMAMcz^6Ig#FocikGlvkUnf~g2$>{&m;%dNsL;nZ-@L}0`I6$PgAjwrwH_jKg9 zk#Ad*j+!b^-t~%el)nQ+CxD}CMJ!sM9bQ=FR{p}ooq2#XFy*rl{5!rmXz=U}OaF1< zN$1P8JlQ419HVNj5LQ!N$bk3R(1G;$d5a64Dpm=nLN;#^j?dU-8*$X*e0?@1Luveo zq1KXi{I=Ey@Q#EsiK$XZOAyYNGvCPns!pd_#OS)AHqFOxkTY#;fci80Sw$Y+uIE$p z>-LB4&Q33}b7>U4h#|>DznlGB&L6au1N&Jt+Q=mdof4>u`b8H>2^<>zml=p2np%i% zu5NikqlL~;o$PZR?6d9d=L-FuFJ{(5CBs;3(r|HA!vk_^XUayq-+A|ZspdFL{0i`k z?~oflGv{*`VCRz+NGw2?*70jHVslj{T1AP+YOIFEeqbMTOY9waZO-62JqnJVS{|$j zg(ryD@_Kw_+LzW7^`UmCbAM`3!k;4huRs8*1`%)lV9BQ1)Klz*lMdIO2XYFTDTk|L z1q&Z$ILX?@(5|Zpa(0MA*l<5VQyhT$jlhzR&fNG=1u3DPJ4^If^_)Xgenf6qW&a^J z*8A$GU2|L7avEMY%`oHckQP@t=*L(~4YVecyAf?$dq-_)wDMQ#|6ap6+ahA;#woVv z3dC{j(-LN%g8C&?1Qe{Z;{-&+YGj!TEY}Eqm#i}dKt9FkOPm|l#a`kL4eo5~sPc*K zKUuo}=tRG2)=Pf)zE~Xh1YN11uP%K7h=hB{PT?%9$fC_Q7ddF91yol%7OOyzB^v*m zfqw=UX)Jclqh^pY&+P1}@@`Oz=VA@LlTj0`xcOrgYBZ*JDhJ+bpoj*n%6KUASFQ&P zMt(M~G_zUrYczYYu?0x{a3`JB!O+ywF6fQ@{;f0#XwKD6I2|JVx+eca_dkl2yfsqh zc@-2c%AAy@Uk0msS&AGo(Fffgwa>Ta->Bc4D9e+n@`*S){5rtX#63^)zYz@n39(jP zmY_!(rt8PXed8X~ESVYzrzzEE2R!~z434pA?N%x6W%5bA^taM@8#y9n?m#j)+#Xj*cNUm0RO9n$4X#N2T&(7DLiOxfFBH zm|IG$Fl9?4X5?({_v0S>eZT(uzMjwXdEW2O`}27}-{+xkf^WhRs8g1XK7DzpLT}N+ z#2^87WV*Vyq;t`H-Fc#Hv1sRNqxo9P7XIYe%PR)nrBlOROVkJBUf+*Xrm$JK+ai`I8AcqO~cQ7?2TC!_tHIIk{focF6i;)s3?{bM(yhzB4J zC30-;IQnD?N0(6wdbA4aKdLwl~-)>cuYHt?#u$A637 z)0fkC`_qgTBnqOEvO|$<+o`>u^A=@PYqRz$B~X-4KM7)VSNqUVWAnmDPR&eR$iQ_i zEHBIhlWhitDB7W~2uH?eWOVK|(u4Ok72oTyS2T0j;CbG!P*oLE%;+l3K7CImaI2FG z=~%`Pikp$9mQ)6V0J8Q5Q{>dX!O%LckN$P(mmK!)IT&Pfg8!&_-ETR)B^Y|uNuzMA zzAw>NrUZyIaPN3ZYo0>CH$rv~Z{W%I#kuQ(rS5jLtTf^UU8@X}-NzsIq?v95Y3uiO z1+B0StR@{uQ;Yw-<-23c768-#R?hvora|~x_^NNfd+#(B)!R}wHG#v@| z%J!3pOP552lV0>XBBow83u%nB+lVIwENc`ul+JIeWGSn;EZdiuq5vcqymLZwrmw*p zk?mkrPr-P!xP-;WLjm1y4-?;XHxBYwgI{Rtx?Q%4FzNluTcdJFw8*-x{w=qJ*~s5c z7Ejgo4aGKjapC!=W2I$iq6YVSCtG2=A$WCXRmO^sE);P<$b zw~|U$a9fwSF51c_W*1aqrGjxc&1GjZS+2MO1Ey46PW<$S@{(-7gw@YzZyBs-&W=*a zd@d8!`1{UXS0bNpy1X0#b0_R=we1N1=4|NHBuRNI5y8RKglF?)saFks@R(&^R}UH6)zAVOzg9s z4q^VM1>LUn2441Sd%|ha*i_g72R9RUuXv zfv$*FA(khjxf>0<|bwIxZ(H{QREYFm%y5y|cZd&GO%5 zWi)_imFQ&EqFun0Da9kD1yZJo&RhhE3=9_zX4>Ld;A&P*_L<*VZ@quy>*)#^-B~k0 z0q~NkRXjp(>Rn5IjJ8t$7_~Z@@3R`AXAJ{FalloOadLWC|7rC3GhI(VtFfkVQZ_)Z zA%&~iXJNn^Ly-A!Q|q*`HZ}ZVRBHu zOp#uhKoF%9QnK1-9G%70cTii^cHr4aYmZHf8 zCE4??H2md~0Q&>5(?0wps<9*3q)JoOvoJ(bklbm57R}Dvj0`{jGO7&^aCqSr86`?;6(8h?-~k(v zqtaLUxZ@0|PsIq(1;jMRLO4Op85hqh0Eq4X<@(jX(rN|7HqV1ivFd~jL{_rFM&?kq zQ1eg17@ekbMy9?!Kq1^(>kMo0vg>_Cz$hkHL)bCAXFW_VH1e*|yzr>Uf=$|PfF(NG zf)U#!9FV9ysn&(XT%P<`-A8n7+wfvlx{z~#6xy*<>o0|?g#^59=z2np~i&V9KA^Re( zy39zB4%$fN>7`uOT(`iER}0CIMw*A!%Cf0_8=*(HX`w8EBkp+A=VX&ZLE6_d_#2EK zl1MuJ12@U`QTUXjF|#L-pr>FIYuk{nSVfK2GHSXly+CXNE`OoA-0h9~wDvU}!mC*a z203T0{h1OVg_l940Iy6ifHXL5jHn2F7Y0YT}vOEh{5LzJd- zSUaBQVIMY8NcO-qWj!kDslzUI0-K3Z?lnF%Y|ej@jiO8`k`Dg#OzxdiVJDDh6=2zQ zT_AnC#t!iyu1DN8quC%DrYhrg*jsf#lYX&NiK}6rAOV>ECgG#+%^l%Tpeg*MqJkPG zg+LF0h2LKep9wx*tr?oC1VrMJ0+(x;r&eT&XbzQbh?)cb&3w>{rX7HpYw!BfLV-{| zA@8kAp@<>Mn)yKd6DZ_1`^e93WVDQ!KiGvNLy}j{A z5hb%@WWO8Wg_PB;!}i4E<>iP^>5z=Ws@u)--KnUeq;|{$+prQSuwhwuQ5bhqz1bS>0rPX=`%-|8gP8$vv~<5*n!gtG zw$Ae>7wO=x3BYfio5-ItdRuvwKGze*V`y7G4){eLP~d3{9NLZ>V)!`~(&dBs^9=gW gjy1nx&ku6M-kc-#y2iOyE+W-In delta 2870 zcmX9=dmxkRAAiS6JCe$gbGEr1<+PlmqcD+6rO3&YG?7Tnsgpn-P`kIL$TJbuvpB=6?UZZ@>TE_xpXG=kxh~p6};*o&>)?{1Ohr>~aoaC{FAH zn0ytD2ef8|YY~jk@jbfa8DzP6X&0mP-zlD%aV7DQ#fqX*! zwd^exyVK^77rq)SA5k>oT6#e-z0HS+g4cocYJ3JKE&W}k(rv|Z)OEoM~ z@wm;Gwy9pik|pz$nV5md?C%mRdiaC|fAg$I96Rz%f4uE>(j10ENxSf}tV!nJE3%-f zkZz+8;%vI@3FMchbTD%#TE!N~C+_Ir+lqJXMgiFVP)exf!y^V)d8HbER9<--n zIW3w3n>_a)Xr`~l#yNWCN;|Az`wNSLcHiR-h+0lH_Xs@Xv}6I9gR@D(-_VFXY6n9T z0AN>wh3zIG4An?U@A*AlwRaB`dH7%)GZpaC!T9|lvW0UNuLcIdt*adnaFJ|{(hum- zdR#}J4i?kG$f}V8#}jfs-N2xQnzDd~g^an5UFOjP&!umxq?XAiAiRs%3{&rf22MBX z*ApYMz+R0{`ybX%7v8sQTv{G~%qmo06iA#aDLX+7qic?IiDzx(K<8a74||l`c4i_p ze(I_I&p;G_@bWdzG9B4CnySOU7|OzP9DRykBr8Mf?Oxo;S~4Z>Wi^`QmqJ6uM|7Tv z<~OvLFV8=;#{(8o@NATwgw{cJVPGA9%`ZW-lSwyS0Z>WY^#W{RGHOYV!Ww^Uhw`$p1N zEgJF6e1o2i6UW9024dn$D+s($ZVoMo5`bH|z_iEs8E^S^!@=bVKka0_X#MjdUW+eJ zn_%}0ms0vBoBCYTZuBc6pu7xGm-boNsA@!5B^CapGm1zVhXnd3hrOB6gj$(;;9%42 zD0zC}gkR?eJxF(j;aEd*C^t;qF68Z)yiH-ylZ>@$T8AOMgK-arbMmJy94s7P%<5YY zFYo__b&BLw?sA|h_JX9~-FM+5hGH6JeAC%@pDZZeMnY{|Pi=f)%4#mLcgwbX?W%fL zfUs?wJh|1(y*^^*UhYEOEYVWeX&S2FEXhGrRD6%6;{&_-2sezV%PDLKYww!XK|g_& zdKw)$eY2I(1stifyV2fybM-K_6WJyzURjqeud`v$R3dYPKIDIolKIZ+@{%afEw;z_l+{;9taC@nHf|LBfsClMo)6LwTAhyCsSgiAyBJA4!#y&*i!+fw zQ8rkc`>}(dPtnD12o|&z?nozxzuv^}i~n%8dR?s6)+1k%v^vDbFMNZ!6Krzd+2G>{ zJVR+EO~0qbSA2gnB1l%_SrOP|(MgWFi1x%Ck2+W5OVaV`wWXUiq*`lb-7n}xQ%Y_Hf?j%X zu6Yh7GQH}wNXP@ivvBubIR(@yKDGu^IhUNXwwOEBOb-SB`-hy#{A#YWwkT5>q_=X6 z)yVP6CvLu>*F1P)9h|lLAI8%2iv2BBkcO}jn}>OPP1mt=kDiKJPP$H_h}awAMS3d- z_W3MEfG!wBeP8m7()F>CsoeD6laTVE3KQe9(@D#gDRuXP$DW2kUK*+VJ8kpgM1L9~ z6r1g@z1+obY~=QLRlAxi{<)ZV{&d_QcgS#e$l>?^KIYp+CERKN_d9%B8y z(wnH<1h?`a5S+h?Ewvq}DiE_v?7TS1`%bnVk2FTHj)T81#cAtT86yexnBOt?!)9J< z-Ge0g$tWf0dpGCvT+mLRTQ)t7kU^k(b4v|o$UU#wyTr~s-eJ|+T-cONUd+qCQas5IW zPW#&W9Y{R&1-5#4(7=Gcrpka#bxD?V`eM<2w_Krvu08)0E+WqzXVcxTI7=ngtT!&P z-EmOnLO$9czerT>LN^3=VHGw~<;5N@Nv`EYLWt=j3w)KHTPFl)E3t#H_VvBBIn8dO z$G4f8A?!zd-&#spbQ8MKJuoW1`B8yX&9@{0GRirf_{G`KV3T9m`lFKkNax4xJnLXc zUawc;JLRFq8z!gh`z(cfTUDL<2K{1BKqgU24Ia3wWqZ`PL5pBf((`q~TJd@&4CI*H z)>dpq+MP_7kxQxVUb-R+GK)bC?bi9Er>aEZ%M-kvNWZ8fZhxco)`i7>etf`_DK{?@ zP9+tccU(G4Rf24!nbcB2G`ohJNK+9qhwQxK`!bU|GQOqu(QyoWc5%^;*^k7XV}W^- z%>Oge`;`tqd9t04n4Pc}T~r%~L!PpT`*K*3oEUY>DJ5>+n^H;s7N+Xz#Bua$XjCO( zXdi9$zoL+lFeWI)zy2cp+C;tY4q&BNx;hmD-brBa#-90|RH6b~btL^8f#;i6#tfOJ zl+PyFaniIjDCS+P-}dnt`bz*V>K1A!ZtBfWP@~IaDNVK(ri}S6ha}pEwk7gqkd{4!3xVJ@A zg$fF+3h86SCUbo_C=;IS3NlL~EQ%)OL_;P;Vsh?a_iKZg%HVtG`qhGBO~};g0ul*p z-{DKaMKOM(9aUqTWt~xELYYK?E(I$%H<}4FrARtOp01AcGRTY3+RnO;@z_8*t}_#` z>iN2WEm>TfGuF@Uk5vE*dG@?ulk;hpqOkf?Im=0x){%3ajz5dV2SXQy!WFe~S)-JU z!Al|-K5}?kp&dMs4(fBF7riDXC`+2@O2XrL4VqS@za;OU3s#$Ey%i0i0i$D)Y`xu$ zE5)EL*lFD8;t$Xcz9E&Y`y15%w)->F3Mn3|-a}?UeKv-4TENb~Yfz^B?bTh;m=!IFsZpM9QL*@7)Hbx3evM?7=`` z&1UW3=HzJW=RsD-ww@jsO8(ukF2ZkfI%xg98?SPkfsg_Gfqw|YTTe$_QIs;vBVIcI zpxWhgolE7mgvI*HeA&{sR2BdT?!4=yEzvT5GANQfvvTLH)g9azC9v{>HUQMuOl-_e q7cb6GTq?Kb;?3FH)0Ka%Y{P~x^K3jYcjZA?;QU#fW!dQ)5B~>Rr*?Ay diff --git a/com.discord/res/drawable/ic_profile_badge_bughunter_32dp.xml b/com.discord/res/drawable/ic_profile_badge_bughunter_level_1_32dp.xml similarity index 100% rename from com.discord/res/drawable/ic_profile_badge_bughunter_32dp.xml rename to com.discord/res/drawable/ic_profile_badge_bughunter_level_1_32dp.xml diff --git a/com.discord/res/drawable/ic_profile_badge_bughunter_level_2_32dp.xml b/com.discord/res/drawable/ic_profile_badge_bughunter_level_2_32dp.xml new file mode 100644 index 0000000000..056af974f0 --- /dev/null +++ b/com.discord/res/drawable/ic_profile_badge_bughunter_level_2_32dp.xml @@ -0,0 +1,11 @@ + + + + + + + + + + \ No newline at end of file diff --git a/com.discord/res/layout/view_boxed_button.xml b/com.discord/res/layout/view_boxed_button.xml index 9316707a85..435d7781da 100644 --- a/com.discord/res/layout/view_boxed_button.xml +++ b/com.discord/res/layout/view_boxed_button.xml @@ -1,9 +1,9 @@ + - \ No newline at end of file diff --git a/com.discord/res/layout/view_settings_premium_guild_marketing_header.xml b/com.discord/res/layout/view_settings_premium_guild_marketing_header.xml index f5dbc3c094..ff6afe4469 100644 --- a/com.discord/res/layout/view_settings_premium_guild_marketing_header.xml +++ b/com.discord/res/layout/view_settings_premium_guild_marketing_header.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout/widget_guild_invite_share.xml b/com.discord/res/layout/widget_guild_invite_share.xml index 453bde4f5b..b82651eb29 100644 --- a/com.discord/res/layout/widget_guild_invite_share.xml +++ b/com.discord/res/layout/widget_guild_invite_share.xml @@ -9,7 +9,7 @@ - + diff --git a/com.discord/res/layout/widget_guilds_list_item_guild.xml b/com.discord/res/layout/widget_guilds_list_item_guild.xml index dfab38ee2e..6b0a6a203d 100644 --- a/com.discord/res/layout/widget_guilds_list_item_guild.xml +++ b/com.discord/res/layout/widget_guilds_list_item_guild.xml @@ -1,9 +1,9 @@ - + - + diff --git a/com.discord/res/layout/widget_incoming_share.xml b/com.discord/res/layout/widget_incoming_share.xml index 4a00ad3b0a..92acb170ce 100644 --- a/com.discord/res/layout/widget_incoming_share.xml +++ b/com.discord/res/layout/widget_incoming_share.xml @@ -7,7 +7,7 @@ - + diff --git a/com.discord/res/layout/widget_premium_guild_transfer.xml b/com.discord/res/layout/widget_premium_guild_transfer.xml index 1c80d46a12..2ccb591930 100644 --- a/com.discord/res/layout/widget_premium_guild_transfer.xml +++ b/com.discord/res/layout/widget_premium_guild_transfer.xml @@ -4,7 +4,7 @@ - + @@ -16,6 +16,6 @@ - + \ No newline at end of file diff --git a/com.discord/res/layout/widget_remote_auth_pending_login.xml b/com.discord/res/layout/widget_remote_auth_pending_login.xml index 102b4ef228..e2e9830d04 100644 --- a/com.discord/res/layout/widget_remote_auth_pending_login.xml +++ b/com.discord/res/layout/widget_remote_auth_pending_login.xml @@ -2,7 +2,7 @@ - + diff --git a/com.discord/res/layout/widget_server_boost_status.xml b/com.discord/res/layout/widget_server_boost_status.xml index e33cf8d128..8b6e0a3f17 100644 --- a/com.discord/res/layout/widget_server_boost_status.xml +++ b/com.discord/res/layout/widget_server_boost_status.xml @@ -10,13 +10,13 @@ - + - + diff --git a/com.discord/res/layout/widget_server_settings_audit_log.xml b/com.discord/res/layout/widget_server_settings_audit_log.xml index b8c03db36b..e869cf7036 100644 --- a/com.discord/res/layout/widget_server_settings_audit_log.xml +++ b/com.discord/res/layout/widget_server_settings_audit_log.xml @@ -16,7 +16,7 @@ - + diff --git a/com.discord/res/layout/widget_settings_authorized_apps.xml b/com.discord/res/layout/widget_settings_authorized_apps.xml index 3ef3c3e92f..a6880b7ed2 100644 --- a/com.discord/res/layout/widget_settings_authorized_apps.xml +++ b/com.discord/res/layout/widget_settings_authorized_apps.xml @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml index 138890ed26..4ecdb91439 100644 --- a/com.discord/res/values/public.xml +++ b/com.discord/res/values/public.xml @@ -2873,209 +2873,210 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3201,81 +3202,81 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3332,15 +3333,15 @@ - - - - - + + + + + - - + + @@ -3401,20 +3402,20 @@ - - - - - - - - - - - - - - + + + + + + + + + + + + + + @@ -3430,50 +3431,50 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3489,18 +3490,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml index 490c0b83fb..7182dd127c 100644 --- a/com.discord/res/values/strings.xml +++ b/com.discord/res/values/strings.xml @@ -1025,7 +1025,7 @@ ONE MORE THING {fixed} OR Collapse Collapse Category - 3735047e-2c54-4100-a69d-11d9da1124d0 + c1541b19-19b9-4651-8f2d-5c0350a9d04c Coming Soon Search Animated GIFs on the Web Displays text with emphasis. diff --git a/com.discord/res/values/styles.xml b/com.discord/res/values/styles.xml index d6884b8de5..eaaa48753b 100644 --- a/com.discord/res/values/styles.xml +++ b/com.discord/res/values/styles.xml @@ -4384,6 +4384,7 @@ 16.0dip true 0.0dip + 0.0dip @dimen/uikit_spacing_small diff --git a/com.discord/smali/androidx/activity/R$drawable.smali b/com.discord/smali/androidx/activity/R$drawable.smali index 5577a2e715..5de27b04b3 100644 --- a/com.discord/smali/androidx/activity/R$drawable.smali +++ b/com.discord/smali/androidx/activity/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be # direct methods diff --git a/com.discord/smali/androidx/appcompat/R$drawable.smali b/com.discord/smali/androidx/appcompat/R$drawable.smali index b27cc2dc83..10660107eb 100644 --- a/com.discord/smali/androidx/appcompat/R$drawable.smali +++ b/com.discord/smali/androidx/appcompat/R$drawable.smali @@ -203,33 +203,33 @@ .field public static final btn_radio_on_to_off_mtrl_animation:I = 0x7f0800aa -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be -.field public static final tooltip_frame_dark:I = 0x7f0804cc +.field public static final tooltip_frame_dark:I = 0x7f0804cd -.field public static final tooltip_frame_light:I = 0x7f0804cd +.field public static final tooltip_frame_light:I = 0x7f0804ce # direct methods diff --git a/com.discord/smali/androidx/appcompat/resources/R$drawable.smali b/com.discord/smali/androidx/appcompat/resources/R$drawable.smali index afb7573ddd..0237a49297 100644 --- a/com.discord/smali/androidx/appcompat/resources/R$drawable.smali +++ b/com.discord/smali/androidx/appcompat/resources/R$drawable.smali @@ -17,29 +17,29 @@ # static fields .field public static final abc_vector_test:I = 0x7f08006f -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be # direct methods diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali b/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali index 8437ae76ed..d1e04a296a 100644 --- a/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali +++ b/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be # direct methods diff --git a/com.discord/smali/androidx/browser/R$drawable.smali b/com.discord/smali/androidx/browser/R$drawable.smali index 5684e27b37..d63ebd08c4 100644 --- a/com.discord/smali/androidx/browser/R$drawable.smali +++ b/com.discord/smali/androidx/browser/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be # direct methods diff --git a/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali b/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali index 0d6417be4f..ab3e53c229 100644 --- a/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali +++ b/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be # direct methods diff --git a/com.discord/smali/androidx/core/R$drawable.smali b/com.discord/smali/androidx/core/R$drawable.smali index c18bf8c5fd..9090fa3147 100644 --- a/com.discord/smali/androidx/core/R$drawable.smali +++ b/com.discord/smali/androidx/core/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be # direct methods diff --git a/com.discord/smali/androidx/core/ktx/R$drawable.smali b/com.discord/smali/androidx/core/ktx/R$drawable.smali index 3e0483cbe3..af14b6210f 100644 --- a/com.discord/smali/androidx/core/ktx/R$drawable.smali +++ b/com.discord/smali/androidx/core/ktx/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be # direct methods diff --git a/com.discord/smali/androidx/customview/R$drawable.smali b/com.discord/smali/androidx/customview/R$drawable.smali index aaac9fcf3c..8fe664fc99 100644 --- a/com.discord/smali/androidx/customview/R$drawable.smali +++ b/com.discord/smali/androidx/customview/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be # direct methods diff --git a/com.discord/smali/androidx/drawerlayout/R$drawable.smali b/com.discord/smali/androidx/drawerlayout/R$drawable.smali index 69aaf1b887..4e28cff0b9 100644 --- a/com.discord/smali/androidx/drawerlayout/R$drawable.smali +++ b/com.discord/smali/androidx/drawerlayout/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be # direct methods diff --git a/com.discord/smali/androidx/dynamicanimation/R$drawable.smali b/com.discord/smali/androidx/dynamicanimation/R$drawable.smali index 86bb01de72..11d54af4ba 100644 --- a/com.discord/smali/androidx/dynamicanimation/R$drawable.smali +++ b/com.discord/smali/androidx/dynamicanimation/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be # direct methods diff --git a/com.discord/smali/androidx/fragment/R$drawable.smali b/com.discord/smali/androidx/fragment/R$drawable.smali index 14a069a0ed..2028343421 100644 --- a/com.discord/smali/androidx/fragment/R$drawable.smali +++ b/com.discord/smali/androidx/fragment/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be # direct methods diff --git a/com.discord/smali/androidx/legacy/coreui/R$drawable.smali b/com.discord/smali/androidx/legacy/coreui/R$drawable.smali index 05d5940322..94d42a62bd 100644 --- a/com.discord/smali/androidx/legacy/coreui/R$drawable.smali +++ b/com.discord/smali/androidx/legacy/coreui/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be # direct methods diff --git a/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali b/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali index da988cf4de..076fb5bce5 100644 --- a/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali +++ b/com.discord/smali/androidx/legacy/coreutils/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be # direct methods diff --git a/com.discord/smali/androidx/legacy/v4/R$drawable.smali b/com.discord/smali/androidx/legacy/v4/R$drawable.smali index 02065ae6f4..4633503e81 100644 --- a/com.discord/smali/androidx/legacy/v4/R$drawable.smali +++ b/com.discord/smali/androidx/legacy/v4/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be # direct methods diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$drawable.smali b/com.discord/smali/androidx/lifecycle/extensions/R$drawable.smali index 27b48a0a19..95f5bd6725 100644 --- a/com.discord/smali/androidx/lifecycle/extensions/R$drawable.smali +++ b/com.discord/smali/androidx/lifecycle/extensions/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be # direct methods diff --git a/com.discord/smali/androidx/loader/R$drawable.smali b/com.discord/smali/androidx/loader/R$drawable.smali index 28aefb2a26..404f9649a2 100644 --- a/com.discord/smali/androidx/loader/R$drawable.smali +++ b/com.discord/smali/androidx/loader/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be # direct methods diff --git a/com.discord/smali/androidx/media/R$drawable.smali b/com.discord/smali/androidx/media/R$drawable.smali index 390214a664..1ca060eef2 100644 --- a/com.discord/smali/androidx/media/R$drawable.smali +++ b/com.discord/smali/androidx/media/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be # direct methods diff --git a/com.discord/smali/androidx/preference/R$drawable.smali b/com.discord/smali/androidx/preference/R$drawable.smali index 8087e000e5..42e9d47b01 100644 --- a/com.discord/smali/androidx/preference/R$drawable.smali +++ b/com.discord/smali/androidx/preference/R$drawable.smali @@ -205,35 +205,35 @@ .field public static final ic_arrow_down_24dp:I = 0x7f0801e2 -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be -.field public static final preference_list_divider_material:I = 0x7f0804be +.field public static final preference_list_divider_material:I = 0x7f0804bf -.field public static final tooltip_frame_dark:I = 0x7f0804cc +.field public static final tooltip_frame_dark:I = 0x7f0804cd -.field public static final tooltip_frame_light:I = 0x7f0804cd +.field public static final tooltip_frame_light:I = 0x7f0804ce # direct methods diff --git a/com.discord/smali/androidx/preference/ktx/R$drawable.smali b/com.discord/smali/androidx/preference/ktx/R$drawable.smali index 0a6db1c8d4..f5d8963d25 100644 --- a/com.discord/smali/androidx/preference/ktx/R$drawable.smali +++ b/com.discord/smali/androidx/preference/ktx/R$drawable.smali @@ -205,35 +205,35 @@ .field public static final ic_arrow_down_24dp:I = 0x7f0801e2 -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be -.field public static final preference_list_divider_material:I = 0x7f0804be +.field public static final preference_list_divider_material:I = 0x7f0804bf -.field public static final tooltip_frame_dark:I = 0x7f0804cc +.field public static final tooltip_frame_dark:I = 0x7f0804cd -.field public static final tooltip_frame_light:I = 0x7f0804cd +.field public static final tooltip_frame_light:I = 0x7f0804ce # direct methods diff --git a/com.discord/smali/androidx/recyclerview/R$drawable.smali b/com.discord/smali/androidx/recyclerview/R$drawable.smali index 90c3d03bf3..a848fcaf5d 100644 --- a/com.discord/smali/androidx/recyclerview/R$drawable.smali +++ b/com.discord/smali/androidx/recyclerview/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be # direct methods diff --git a/com.discord/smali/androidx/room/R$drawable.smali b/com.discord/smali/androidx/room/R$drawable.smali index 0ab60127db..e7d172f113 100644 --- a/com.discord/smali/androidx/room/R$drawable.smali +++ b/com.discord/smali/androidx/room/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be # direct methods diff --git a/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali b/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali index 06c3511978..f459fe8655 100644 --- a/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali +++ b/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be # direct methods diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali b/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali index 673402af0b..0c6c3ddb48 100644 --- a/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali +++ b/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be # direct methods diff --git a/com.discord/smali/androidx/transition/R$drawable.smali b/com.discord/smali/androidx/transition/R$drawable.smali index 163eb8e8cd..8ee2c5a187 100644 --- a/com.discord/smali/androidx/transition/R$drawable.smali +++ b/com.discord/smali/androidx/transition/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be # direct methods diff --git a/com.discord/smali/androidx/vectordrawable/R$drawable.smali b/com.discord/smali/androidx/vectordrawable/R$drawable.smali index 20eb1e429d..2d1ca8642e 100644 --- a/com.discord/smali/androidx/vectordrawable/R$drawable.smali +++ b/com.discord/smali/androidx/vectordrawable/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be # direct methods diff --git a/com.discord/smali/androidx/vectordrawable/animated/R$drawable.smali b/com.discord/smali/androidx/vectordrawable/animated/R$drawable.smali index 02dadf1f42..a9033c73db 100644 --- a/com.discord/smali/androidx/vectordrawable/animated/R$drawable.smali +++ b/com.discord/smali/androidx/vectordrawable/animated/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be # direct methods diff --git a/com.discord/smali/androidx/viewpager/R$drawable.smali b/com.discord/smali/androidx/viewpager/R$drawable.smali index 99ce0822c8..0ef81ef0ce 100644 --- a/com.discord/smali/androidx/viewpager/R$drawable.smali +++ b/com.discord/smali/androidx/viewpager/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be # direct methods diff --git a/com.discord/smali/androidx/viewpager2/R$drawable.smali b/com.discord/smali/androidx/viewpager2/R$drawable.smali index ed8e0989fe..4d96cd4254 100644 --- a/com.discord/smali/androidx/viewpager2/R$drawable.smali +++ b/com.discord/smali/androidx/viewpager2/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be # direct methods diff --git a/com.discord/smali/androidx/work/R$drawable.smali b/com.discord/smali/androidx/work/R$drawable.smali index aced179379..a2c5a53394 100644 --- a/com.discord/smali/androidx/work/R$drawable.smali +++ b/com.discord/smali/androidx/work/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be # direct methods diff --git a/com.discord/smali/androidx/work/ktx/R$drawable.smali b/com.discord/smali/androidx/work/ktx/R$drawable.smali index ef78be38d7..6f97659941 100644 --- a/com.discord/smali/androidx/work/ktx/R$drawable.smali +++ b/com.discord/smali/androidx/work/ktx/R$drawable.smali @@ -15,29 +15,29 @@ # static fields -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be # direct methods diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali index 65b7372093..a7fa8b2a55 100644 --- a/com.discord/smali/com/discord/BuildConfig.smali +++ b/com.discord/smali/com/discord/BuildConfig.smali @@ -36,11 +36,11 @@ .field public static final SAMSUNGxDISCORD_CLIENT_ID:Ljava/lang/String; = "97t47j218f" -.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1020" +.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/1021" -.field public static final VERSION_CODE:I = 0x3fc +.field public static final VERSION_CODE:I = 0x3fd -.field public static final VERSION_NAME:Ljava/lang/String; = "10.2.0" +.field public static final VERSION_NAME:Ljava/lang/String; = "10.2.1" # direct methods diff --git a/com.discord/smali/com/discord/gateway/R$drawable.smali b/com.discord/smali/com/discord/gateway/R$drawable.smali index ce8ea640c8..b952fd4e2c 100644 --- a/com.discord/smali/com/discord/gateway/R$drawable.smali +++ b/com.discord/smali/com/discord/gateway/R$drawable.smali @@ -291,57 +291,57 @@ .field public static final ic_mtrl_chip_close_circle:I = 0x7f08032e -.field public static final mtrl_dialog_background:I = 0x7f0804a8 +.field public static final mtrl_dialog_background:I = 0x7f0804a9 -.field public static final mtrl_dropdown_arrow:I = 0x7f0804a9 +.field public static final mtrl_dropdown_arrow:I = 0x7f0804aa -.field public static final mtrl_ic_arrow_drop_down:I = 0x7f0804aa +.field public static final mtrl_ic_arrow_drop_down:I = 0x7f0804ab -.field public static final mtrl_ic_arrow_drop_up:I = 0x7f0804ab +.field public static final mtrl_ic_arrow_drop_up:I = 0x7f0804ac -.field public static final mtrl_ic_cancel:I = 0x7f0804ac +.field public static final mtrl_ic_cancel:I = 0x7f0804ad -.field public static final mtrl_ic_error:I = 0x7f0804ad +.field public static final mtrl_ic_error:I = 0x7f0804ae -.field public static final mtrl_popupmenu_background:I = 0x7f0804ae +.field public static final mtrl_popupmenu_background:I = 0x7f0804af -.field public static final mtrl_popupmenu_background_dark:I = 0x7f0804af +.field public static final mtrl_popupmenu_background_dark:I = 0x7f0804b0 -.field public static final mtrl_tabs_default_indicator:I = 0x7f0804b0 +.field public static final mtrl_tabs_default_indicator:I = 0x7f0804b1 -.field public static final navigation_empty_icon:I = 0x7f0804b1 +.field public static final navigation_empty_icon:I = 0x7f0804b2 -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be -.field public static final preference_list_divider_material:I = 0x7f0804be +.field public static final preference_list_divider_material:I = 0x7f0804bf -.field public static final test_custom_background:I = 0x7f0804cb +.field public static final test_custom_background:I = 0x7f0804cc -.field public static final tooltip_frame_dark:I = 0x7f0804cc +.field public static final tooltip_frame_dark:I = 0x7f0804cd -.field public static final tooltip_frame_light:I = 0x7f0804cd +.field public static final tooltip_frame_light:I = 0x7f0804ce # direct methods diff --git a/com.discord/smali/com/discord/models/domain/ModelUser.smali b/com.discord/smali/com/discord/models/domain/ModelUser.smali index b2369e3325..9aa773cd0b 100644 --- a/com.discord/smali/com/discord/models/domain/ModelUser.smali +++ b/com.discord/smali/com/discord/models/domain/ModelUser.smali @@ -32,7 +32,9 @@ .field public static final EMPTY:Lcom/discord/models/domain/ModelUser; -.field public static final FLAG_BUG_HUNTER:I = 0x8 +.field public static final FLAG_BUG_HUNTER_LEVEL_1:I = 0x8 + +.field public static final FLAG_BUG_HUNTER_LEVEL_2:I = 0x4000 .field public static final FLAG_HAS_UNREAD_URGENT_MESSAGES:I = 0x2000 @@ -1900,7 +1902,7 @@ return v0 .end method -.method public isBugHunter()Z +.method public isBugHunterLevel1()Z .locals 1 const/16 v0, 0x8 @@ -1912,6 +1914,18 @@ return v0 .end method +.method public isBugHunterLevel2()Z + .locals 1 + + const/16 v0, 0x4000 + + invoke-direct {p0, v0}, Lcom/discord/models/domain/ModelUser;->isOn(I)Z + + move-result v0 + + return v0 +.end method + .method public isClaimed()Z .locals 5 diff --git a/com.discord/smali/com/discord/models/domain/ModelUserAffinities.smali b/com.discord/smali/com/discord/models/domain/ModelUserAffinities.smali new file mode 100644 index 0000000000..5b105dacb1 --- /dev/null +++ b/com.discord/smali/com/discord/models/domain/ModelUserAffinities.smali @@ -0,0 +1,310 @@ +.class public final Lcom/discord/models/domain/ModelUserAffinities; +.super Ljava/lang/Object; +.source "ModelUserAffinities.kt" + + +# instance fields +.field public final inverseUserAffinities:Ljava/util/List; + .annotation system Ldalvik/annotation/Signature; + value = { + "Ljava/util/List<", + "Lcom/discord/models/domain/ModelUserAffinity;", + ">;" + } + .end annotation +.end field + +.field public final userAffinities:Ljava/util/List; + .annotation system Ldalvik/annotation/Signature; + value = { + "Ljava/util/List<", + "Lcom/discord/models/domain/ModelUserAffinity;", + ">;" + } + .end annotation +.end field + + +# direct methods +.method public constructor (Ljava/util/List;Ljava/util/List;)V + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Ljava/util/List<", + "Lcom/discord/models/domain/ModelUserAffinity;", + ">;", + "Ljava/util/List<", + "Lcom/discord/models/domain/ModelUserAffinity;", + ">;)V" + } + .end annotation + + const/4 v0, 0x0 + + if-eqz p1, :cond_1 + + if-eqz p2, :cond_0 + + invoke-direct {p0}, Ljava/lang/Object;->()V + + iput-object p1, p0, Lcom/discord/models/domain/ModelUserAffinities;->userAffinities:Ljava/util/List; + + iput-object p2, p0, Lcom/discord/models/domain/ModelUserAffinities;->inverseUserAffinities:Ljava/util/List; + + return-void + + :cond_0 + const-string p1, "inverseUserAffinities" + + invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V + + throw v0 + + :cond_1 + const-string p1, "userAffinities" + + invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V + + throw v0 +.end method + +.method public static synthetic copy$default(Lcom/discord/models/domain/ModelUserAffinities;Ljava/util/List;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/models/domain/ModelUserAffinities; + .locals 0 + + and-int/lit8 p4, p3, 0x1 + + if-eqz p4, :cond_0 + + iget-object p1, p0, Lcom/discord/models/domain/ModelUserAffinities;->userAffinities:Ljava/util/List; + + :cond_0 + and-int/lit8 p3, p3, 0x2 + + if-eqz p3, :cond_1 + + iget-object p2, p0, Lcom/discord/models/domain/ModelUserAffinities;->inverseUserAffinities:Ljava/util/List; + + :cond_1 + invoke-virtual {p0, p1, p2}, Lcom/discord/models/domain/ModelUserAffinities;->copy(Ljava/util/List;Ljava/util/List;)Lcom/discord/models/domain/ModelUserAffinities; + + move-result-object p0 + + return-object p0 +.end method + + +# virtual methods +.method public final component1()Ljava/util/List; + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Ljava/util/List<", + "Lcom/discord/models/domain/ModelUserAffinity;", + ">;" + } + .end annotation + + iget-object v0, p0, Lcom/discord/models/domain/ModelUserAffinities;->userAffinities:Ljava/util/List; + + return-object v0 +.end method + +.method public final component2()Ljava/util/List; + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Ljava/util/List<", + "Lcom/discord/models/domain/ModelUserAffinity;", + ">;" + } + .end annotation + + iget-object v0, p0, Lcom/discord/models/domain/ModelUserAffinities;->inverseUserAffinities:Ljava/util/List; + + return-object v0 +.end method + +.method public final copy(Ljava/util/List;Ljava/util/List;)Lcom/discord/models/domain/ModelUserAffinities; + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Ljava/util/List<", + "Lcom/discord/models/domain/ModelUserAffinity;", + ">;", + "Ljava/util/List<", + "Lcom/discord/models/domain/ModelUserAffinity;", + ">;)", + "Lcom/discord/models/domain/ModelUserAffinities;" + } + .end annotation + + const/4 v0, 0x0 + + if-eqz p1, :cond_1 + + if-eqz p2, :cond_0 + + new-instance v0, Lcom/discord/models/domain/ModelUserAffinities; + + invoke-direct {v0, p1, p2}, Lcom/discord/models/domain/ModelUserAffinities;->(Ljava/util/List;Ljava/util/List;)V + + return-object v0 + + :cond_0 + const-string p1, "inverseUserAffinities" + + invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V + + throw v0 + + :cond_1 + const-string p1, "userAffinities" + + invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V + + throw v0 +.end method + +.method public equals(Ljava/lang/Object;)Z + .locals 2 + + if-eq p0, p1, :cond_1 + + instance-of v0, p1, Lcom/discord/models/domain/ModelUserAffinities; + + if-eqz v0, :cond_0 + + check-cast p1, Lcom/discord/models/domain/ModelUserAffinities; + + iget-object v0, p0, Lcom/discord/models/domain/ModelUserAffinities;->userAffinities:Ljava/util/List; + + iget-object v1, p1, Lcom/discord/models/domain/ModelUserAffinities;->userAffinities:Ljava/util/List; + + invoke-static {v0, v1}, Lt/u/b/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z + + move-result v0 + + if-eqz v0, :cond_0 + + iget-object v0, p0, Lcom/discord/models/domain/ModelUserAffinities;->inverseUserAffinities:Ljava/util/List; + + iget-object p1, p1, Lcom/discord/models/domain/ModelUserAffinities;->inverseUserAffinities:Ljava/util/List; + + invoke-static {v0, p1}, Lt/u/b/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z + + move-result p1 + + if-eqz p1, :cond_0 + + goto :goto_0 + + :cond_0 + const/4 p1, 0x0 + + return p1 + + :cond_1 + :goto_0 + const/4 p1, 0x1 + + return p1 +.end method + +.method public final getInverseUserAffinities()Ljava/util/List; + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Ljava/util/List<", + "Lcom/discord/models/domain/ModelUserAffinity;", + ">;" + } + .end annotation + + iget-object v0, p0, Lcom/discord/models/domain/ModelUserAffinities;->inverseUserAffinities:Ljava/util/List; + + return-object v0 +.end method + +.method public final getUserAffinities()Ljava/util/List; + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Ljava/util/List<", + "Lcom/discord/models/domain/ModelUserAffinity;", + ">;" + } + .end annotation + + iget-object v0, p0, Lcom/discord/models/domain/ModelUserAffinities;->userAffinities:Ljava/util/List; + + return-object v0 +.end method + +.method public hashCode()I + .locals 3 + + iget-object v0, p0, Lcom/discord/models/domain/ModelUserAffinities;->userAffinities:Ljava/util/List; + + const/4 v1, 0x0 + + if-eqz v0, :cond_0 + + invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I + + move-result v0 + + goto :goto_0 + + :cond_0 + const/4 v0, 0x0 + + :goto_0 + mul-int/lit8 v0, v0, 0x1f + + iget-object v2, p0, Lcom/discord/models/domain/ModelUserAffinities;->inverseUserAffinities:Ljava/util/List; + + if-eqz v2, :cond_1 + + invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I + + move-result v1 + + :cond_1 + add-int/2addr v0, v1 + + return v0 +.end method + +.method public toString()Ljava/lang/String; + .locals 3 + + const-string v0, "ModelUserAffinities(userAffinities=" + + invoke-static {v0}, Le/e/b/a/a;->a(Ljava/lang/String;)Ljava/lang/StringBuilder; + + move-result-object v0 + + iget-object v1, p0, Lcom/discord/models/domain/ModelUserAffinities;->userAffinities:Ljava/util/List; + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + + const-string v1, ", inverseUserAffinities=" + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + iget-object v1, p0, Lcom/discord/models/domain/ModelUserAffinities;->inverseUserAffinities:Ljava/util/List; + + const-string v2, ")" + + invoke-static {v0, v1, v2}, Le/e/b/a/a;->a(Ljava/lang/StringBuilder;Ljava/util/List;Ljava/lang/String;)Ljava/lang/String; + + move-result-object v0 + + return-object v0 +.end method diff --git a/com.discord/smali/com/discord/models/domain/ModelUserAffinity.smali b/com.discord/smali/com/discord/models/domain/ModelUserAffinity.smali new file mode 100644 index 0000000000..a1e2066740 --- /dev/null +++ b/com.discord/smali/com/discord/models/domain/ModelUserAffinity.smali @@ -0,0 +1,192 @@ +.class public final Lcom/discord/models/domain/ModelUserAffinity; +.super Ljava/lang/Object; +.source "ModelUserAffinity.kt" + + +# instance fields +.field public final affinity:F + +.field public final userId:J + + +# direct methods +.method public constructor (JF)V + .locals 0 + + invoke-direct {p0}, Ljava/lang/Object;->()V + + iput-wide p1, p0, Lcom/discord/models/domain/ModelUserAffinity;->userId:J + + iput p3, p0, Lcom/discord/models/domain/ModelUserAffinity;->affinity:F + + return-void +.end method + +.method public static synthetic copy$default(Lcom/discord/models/domain/ModelUserAffinity;JFILjava/lang/Object;)Lcom/discord/models/domain/ModelUserAffinity; + .locals 0 + + and-int/lit8 p5, p4, 0x1 + + if-eqz p5, :cond_0 + + iget-wide p1, p0, Lcom/discord/models/domain/ModelUserAffinity;->userId:J + + :cond_0 + and-int/lit8 p4, p4, 0x2 + + if-eqz p4, :cond_1 + + iget p3, p0, Lcom/discord/models/domain/ModelUserAffinity;->affinity:F + + :cond_1 + invoke-virtual {p0, p1, p2, p3}, Lcom/discord/models/domain/ModelUserAffinity;->copy(JF)Lcom/discord/models/domain/ModelUserAffinity; + + move-result-object p0 + + return-object p0 +.end method + + +# virtual methods +.method public final component1()J + .locals 2 + + iget-wide v0, p0, Lcom/discord/models/domain/ModelUserAffinity;->userId:J + + return-wide v0 +.end method + +.method public final component2()F + .locals 1 + + iget v0, p0, Lcom/discord/models/domain/ModelUserAffinity;->affinity:F + + return v0 +.end method + +.method public final copy(JF)Lcom/discord/models/domain/ModelUserAffinity; + .locals 1 + + new-instance v0, Lcom/discord/models/domain/ModelUserAffinity; + + invoke-direct {v0, p1, p2, p3}, Lcom/discord/models/domain/ModelUserAffinity;->(JF)V + + return-object v0 +.end method + +.method public equals(Ljava/lang/Object;)Z + .locals 5 + + if-eq p0, p1, :cond_1 + + instance-of v0, p1, Lcom/discord/models/domain/ModelUserAffinity; + + if-eqz v0, :cond_0 + + check-cast p1, Lcom/discord/models/domain/ModelUserAffinity; + + iget-wide v0, p0, Lcom/discord/models/domain/ModelUserAffinity;->userId:J + + iget-wide v2, p1, Lcom/discord/models/domain/ModelUserAffinity;->userId:J + + cmp-long v4, v0, v2 + + if-nez v4, :cond_0 + + iget v0, p0, Lcom/discord/models/domain/ModelUserAffinity;->affinity:F + + iget p1, p1, Lcom/discord/models/domain/ModelUserAffinity;->affinity:F + + invoke-static {v0, p1}, Ljava/lang/Float;->compare(FF)I + + move-result p1 + + if-nez p1, :cond_0 + + goto :goto_0 + + :cond_0 + const/4 p1, 0x0 + + return p1 + + :cond_1 + :goto_0 + const/4 p1, 0x1 + + return p1 +.end method + +.method public final getAffinity()F + .locals 1 + + iget v0, p0, Lcom/discord/models/domain/ModelUserAffinity;->affinity:F + + return v0 +.end method + +.method public final getUserId()J + .locals 2 + + iget-wide v0, p0, Lcom/discord/models/domain/ModelUserAffinity;->userId:J + + return-wide v0 +.end method + +.method public hashCode()I + .locals 4 + + iget-wide v0, p0, Lcom/discord/models/domain/ModelUserAffinity;->userId:J + + const/16 v2, 0x20 + + ushr-long v2, v0, v2 + + xor-long/2addr v0, v2 + + long-to-int v1, v0 + + mul-int/lit8 v1, v1, 0x1f + + iget v0, p0, Lcom/discord/models/domain/ModelUserAffinity;->affinity:F + + invoke-static {v0}, Ljava/lang/Float;->floatToIntBits(F)I + + move-result v0 + + add-int/2addr v0, v1 + + return v0 +.end method + +.method public toString()Ljava/lang/String; + .locals 3 + + const-string v0, "ModelUserAffinity(userId=" + + invoke-static {v0}, Le/e/b/a/a;->a(Ljava/lang/String;)Ljava/lang/StringBuilder; + + move-result-object v0 + + iget-wide v1, p0, Lcom/discord/models/domain/ModelUserAffinity;->userId:J + + invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder; + + const-string v1, ", affinity=" + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + iget v1, p0, Lcom/discord/models/domain/ModelUserAffinity;->affinity:F + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(F)Ljava/lang/StringBuilder; + + const-string v1, ")" + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + + move-result-object v0 + + return-object v0 +.end method diff --git a/com.discord/smali/com/discord/overlay/R$c.smali b/com.discord/smali/com/discord/overlay/R$c.smali index 259b72e654..c5a55d66d0 100644 --- a/com.discord/smali/com/discord/overlay/R$c.smali +++ b/com.discord/smali/com/discord/overlay/R$c.smali @@ -207,37 +207,37 @@ .field public static final ic_close_24dp:I = 0x7f080249 -.field public static final ic_trash_outline:I = 0x7f0803d7 +.field public static final ic_trash_outline:I = 0x7f0803d8 -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be -.field public static final tooltip_frame_dark:I = 0x7f0804cc +.field public static final tooltip_frame_dark:I = 0x7f0804cd -.field public static final tooltip_frame_light:I = 0x7f0804cd +.field public static final tooltip_frame_light:I = 0x7f0804ce -.field public static final trash_bg:I = 0x7f0804ce +.field public static final trash_bg:I = 0x7f0804cf # direct methods diff --git a/com.discord/smali/com/discord/restapi/R$drawable.smali b/com.discord/smali/com/discord/restapi/R$drawable.smali index a1c9f66123..8f855e2bcc 100644 --- a/com.discord/smali/com/discord/restapi/R$drawable.smali +++ b/com.discord/smali/com/discord/restapi/R$drawable.smali @@ -291,57 +291,57 @@ .field public static final ic_mtrl_chip_close_circle:I = 0x7f08032e -.field public static final mtrl_dialog_background:I = 0x7f0804a8 +.field public static final mtrl_dialog_background:I = 0x7f0804a9 -.field public static final mtrl_dropdown_arrow:I = 0x7f0804a9 +.field public static final mtrl_dropdown_arrow:I = 0x7f0804aa -.field public static final mtrl_ic_arrow_drop_down:I = 0x7f0804aa +.field public static final mtrl_ic_arrow_drop_down:I = 0x7f0804ab -.field public static final mtrl_ic_arrow_drop_up:I = 0x7f0804ab +.field public static final mtrl_ic_arrow_drop_up:I = 0x7f0804ac -.field public static final mtrl_ic_cancel:I = 0x7f0804ac +.field public static final mtrl_ic_cancel:I = 0x7f0804ad -.field public static final mtrl_ic_error:I = 0x7f0804ad +.field public static final mtrl_ic_error:I = 0x7f0804ae -.field public static final mtrl_popupmenu_background:I = 0x7f0804ae +.field public static final mtrl_popupmenu_background:I = 0x7f0804af -.field public static final mtrl_popupmenu_background_dark:I = 0x7f0804af +.field public static final mtrl_popupmenu_background_dark:I = 0x7f0804b0 -.field public static final mtrl_tabs_default_indicator:I = 0x7f0804b0 +.field public static final mtrl_tabs_default_indicator:I = 0x7f0804b1 -.field public static final navigation_empty_icon:I = 0x7f0804b1 +.field public static final navigation_empty_icon:I = 0x7f0804b2 -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be -.field public static final preference_list_divider_material:I = 0x7f0804be +.field public static final preference_list_divider_material:I = 0x7f0804bf -.field public static final test_custom_background:I = 0x7f0804cb +.field public static final test_custom_background:I = 0x7f0804cc -.field public static final tooltip_frame_dark:I = 0x7f0804cc +.field public static final tooltip_frame_dark:I = 0x7f0804cd -.field public static final tooltip_frame_light:I = 0x7f0804cd +.field public static final tooltip_frame_light:I = 0x7f0804ce # direct methods diff --git a/com.discord/smali/com/discord/restapi/RestAPIInterface.smali b/com.discord/smali/com/discord/restapi/RestAPIInterface.smali index d146a500d3..66c89ec7bd 100644 --- a/com.discord/smali/com/discord/restapi/RestAPIInterface.smali +++ b/com.discord/smali/com/discord/restapi/RestAPIInterface.smali @@ -1975,6 +1975,21 @@ .end annotation .end method +.method public abstract getUserAffinities()Lrx/Observable; + .annotation runtime La0/v/e; + value = "users/@me/affinities/users" + .end annotation + + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Lrx/Observable<", + "Lcom/discord/models/domain/ModelUserAffinities;", + ">;" + } + .end annotation +.end method + .method public abstract getVanityUrl(J)Lrx/Observable; .param p1 # J .annotation runtime La0/v/q; diff --git a/com.discord/smali/com/discord/stores/StoreChannels$getDMs$1.smali b/com.discord/smali/com/discord/stores/StoreChannels$getDMs$1.smali new file mode 100644 index 0000000000..745bf55e33 --- /dev/null +++ b/com.discord/smali/com/discord/stores/StoreChannels$getDMs$1.smali @@ -0,0 +1,144 @@ +.class public final Lcom/discord/stores/StoreChannels$getDMs$1; +.super Ljava/lang/Object; +.source "StoreChannels.kt" + +# interfaces +.implements Lb0/l/i; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/stores/StoreChannels;->getDMs()Lrx/Observable; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x19 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "", + "Ljava/lang/Object;", + "Lb0/l/i<", + "TT;TR;>;" + } +.end annotation + + +# static fields +.field public static final INSTANCE:Lcom/discord/stores/StoreChannels$getDMs$1; + + +# direct methods +.method public static constructor ()V + .locals 1 + + new-instance v0, Lcom/discord/stores/StoreChannels$getDMs$1; + + invoke-direct {v0}, Lcom/discord/stores/StoreChannels$getDMs$1;->()V + + sput-object v0, Lcom/discord/stores/StoreChannels$getDMs$1;->INSTANCE:Lcom/discord/stores/StoreChannels$getDMs$1; + + return-void +.end method + +.method public constructor ()V + .locals 0 + + invoke-direct {p0}, Ljava/lang/Object;->()V + + return-void +.end method + + +# virtual methods +.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object; + .locals 0 + + check-cast p1, Ljava/util/Map; + + invoke-virtual {p0, p1}, Lcom/discord/stores/StoreChannels$getDMs$1;->call(Ljava/util/Map;)Ljava/util/List; + + move-result-object p1 + + return-object p1 +.end method + +.method public final call(Ljava/util/Map;)Ljava/util/List; + .locals 3 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Ljava/util/Map<", + "Ljava/lang/Long;", + "+", + "Lcom/discord/models/domain/ModelChannel;", + ">;)", + "Ljava/util/List<", + "Lcom/discord/models/domain/ModelChannel;", + ">;" + } + .end annotation + + invoke-interface {p1}, Ljava/util/Map;->values()Ljava/util/Collection; + + move-result-object p1 + + new-instance v0, Ljava/util/ArrayList; + + invoke-direct {v0}, Ljava/util/ArrayList;->()V + + invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; + + move-result-object p1 + + :cond_0 + :goto_0 + invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z + + move-result v1 + + if-eqz v1, :cond_2 + + invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object; + + move-result-object v1 + + move-object v2, v1 + + check-cast v2, Lcom/discord/models/domain/ModelChannel; + + if-eqz v2, :cond_1 + + invoke-virtual {v2}, Lcom/discord/models/domain/ModelChannel;->isDM()Z + + move-result v2 + + invoke-static {v2}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean; + + move-result-object v2 + + goto :goto_1 + + :cond_1 + const/4 v2, 0x0 + + :goto_1 + invoke-virtual {v2}, Ljava/lang/Boolean;->booleanValue()Z + + move-result v2 + + if-eqz v2, :cond_0 + + invoke-interface {v0, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z + + goto :goto_0 + + :cond_2 + return-object v0 +.end method diff --git a/com.discord/smali/com/discord/stores/StoreChannels.smali b/com.discord/smali/com/discord/stores/StoreChannels.smali index 8f66c158e1..d099a09fae 100644 --- a/com.discord/smali/com/discord/stores/StoreChannels.smali +++ b/com.discord/smali/com/discord/stores/StoreChannels.smali @@ -862,6 +862,35 @@ return-object v0 .end method +.method public final getDMs()Lrx/Observable; + .locals 2 + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Lrx/Observable<", + "Ljava/util/List<", + "Lcom/discord/models/domain/ModelChannel;", + ">;>;" + } + .end annotation + + invoke-virtual {p0}, Lcom/discord/stores/StoreChannels;->getPrivate()Lrx/Observable; + + move-result-object v0 + + sget-object v1, Lcom/discord/stores/StoreChannels$getDMs$1;->INSTANCE:Lcom/discord/stores/StoreChannels$getDMs$1; + + invoke-virtual {v0, v1}, Lrx/Observable;->f(Lb0/l/i;)Lrx/Observable; + + move-result-object v0 + + const-string v1, "private\n .map {\u2026hannel?.isDM ?: false } }" + + invoke-static {v0, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + return-object v0 +.end method + .method public final getForGuild(J)Lrx/Observable; .locals 6 .annotation system Ldalvik/annotation/Signature; @@ -2440,32 +2469,10 @@ goto :goto_1 :cond_4 - new-instance v0, Ljava/util/ArrayList; + invoke-static {v2}, Le/k/a/b/e/p/g;->flatten(Ljava/lang/Iterable;)Ljava/util/List; - invoke-direct {v0}, Ljava/util/ArrayList;->()V + move-result-object v0 - invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; - - move-result-object v2 - - :goto_2 - invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z - - move-result v3 - - if-eqz v3, :cond_5 - - invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object; - - move-result-object v3 - - check-cast v3, Ljava/lang/Iterable; - - invoke-static {v0, v3}, Le/k/a/b/e/p/g;->addAll(Ljava/util/Collection;Ljava/lang/Iterable;)Z - - goto :goto_2 - - :cond_5 iget-object v2, p0, Lcom/discord/stores/StoreChannels;->channelsCache:Lcom/discord/utilities/persister/Persister; new-instance v3, Ljava/util/ArrayList; @@ -2476,13 +2483,13 @@ move-result-object v5 - :cond_6 - :goto_3 + :cond_5 + :goto_2 invoke-interface {v5}, Ljava/util/Iterator;->hasNext()Z move-result v6 - if-eqz v6, :cond_7 + if-eqz v6, :cond_6 invoke-interface {v5}, Ljava/util/Iterator;->next()Ljava/lang/Object; @@ -2504,13 +2511,13 @@ move-result v7 - if-nez v7, :cond_6 + if-nez v7, :cond_5 invoke-interface {v3, v6}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z - goto :goto_3 + goto :goto_2 - :cond_7 + :cond_6 const/4 v0, 0x2 const/4 v5, 0x0 @@ -2531,11 +2538,11 @@ const/16 v6, 0x10 - if-ge v3, v6, :cond_8 + if-ge v3, v6, :cond_7 const/16 v3, 0x10 - :cond_8 + :cond_7 new-instance v6, Ljava/util/LinkedHashMap; invoke-direct {v6, v3}, Ljava/util/LinkedHashMap;->(I)V @@ -2544,12 +2551,12 @@ move-result-object v1 - :goto_4 + :goto_3 invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z move-result v3 - if-eqz v3, :cond_9 + if-eqz v3, :cond_8 invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object; @@ -2569,9 +2576,9 @@ invoke-interface {v6, v7, v3}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; - goto :goto_4 + goto :goto_3 - :cond_9 + :cond_8 invoke-virtual {v2, v6}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V iget-object v1, p0, Lcom/discord/stores/StoreChannels;->channelNamesSubject:Lrx/subjects/BehaviorSubject; @@ -2598,7 +2605,7 @@ check-cast v1, Ljava/util/Map; - if-eqz v1, :cond_a + if-eqz v1, :cond_9 iget-object v2, p0, Lcom/discord/stores/StoreChannels;->channelsPrivatePublisher:Lcom/discord/utilities/persister/Persister; @@ -2608,7 +2615,7 @@ invoke-static {v2, v3, v5, v0, v4}, Lcom/discord/utilities/persister/Persister;->set$default(Lcom/discord/utilities/persister/Persister;Ljava/lang/Object;ZILjava/lang/Object;)Ljava/lang/Object; - :cond_a + :cond_9 iput-boolean v5, p0, Lcom/discord/stores/StoreChannels;->isDirty:Z return-void diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali index 5f88963c26..adac64718c 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, 0x3fc + const/16 v0, 0x3fd iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$4.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$init$4.smali index c079279479..a192bf3e0c 100644 --- a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$4.smali +++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$init$4.smali @@ -63,7 +63,7 @@ .end method .method public final invoke(Lcom/discord/stores/StoreMediaNotification$NotificationData;)V - .locals 7 + .locals 8 invoke-virtual {p1}, Lcom/discord/stores/StoreMediaNotification$NotificationData;->getRtcConnectionState()Lcom/discord/rtcconnection/RtcConnection$State; @@ -118,37 +118,31 @@ move-result v6 - invoke-virtual/range {v1 .. v6}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Actions;->startForegroundAndBind(Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;Ljava/lang/String;Ljava/lang/String;ZZ)V + invoke-virtual {p1}, Lcom/discord/stores/StoreMediaNotification$NotificationData;->getProximityLockEnabled()Z + + move-result v7 + + invoke-virtual/range {v1 .. v7}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Actions;->startForegroundAndBind(Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;Ljava/lang/String;Ljava/lang/String;ZZZ)V invoke-virtual {p1}, Lcom/discord/stores/StoreMediaNotification$NotificationData;->getRtcConnectionState()Lcom/discord/rtcconnection/RtcConnection$State; - move-result-object v0 + move-result-object p1 - sget-object v1, Lcom/discord/rtcconnection/RtcConnection$State$f;->a:Lcom/discord/rtcconnection/RtcConnection$State$f; + sget-object v0, Lcom/discord/rtcconnection/RtcConnection$State$f;->a:Lcom/discord/rtcconnection/RtcConnection$State$f; - invoke-static {v0, v1}, Lt/u/b/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z - - move-result v0 - - if-eqz v0, :cond_1 - - sget-object v0, Lcom/discord/utilities/voice/DiscordOverlayService;->Companion:Lcom/discord/utilities/voice/DiscordOverlayService$Companion; - - iget-object v1, p0, Lcom/discord/stores/StoreMediaNotification$init$4;->$context:Landroid/content/Context; - - invoke-virtual {v0, v1}, Lcom/discord/utilities/voice/DiscordOverlayService$Companion;->launchOverlayForVoice(Landroid/content/Context;)V - - :cond_1 - sget-object v0, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Actions;->INSTANCE:Lcom/discord/utilities/voice/VoiceEngineForegroundService$Actions; - - iget-object v1, p0, Lcom/discord/stores/StoreMediaNotification$init$4;->$serviceBinding:Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection; - - invoke-virtual {p1}, Lcom/discord/stores/StoreMediaNotification$NotificationData;->getProximityLockEnabled()Z + invoke-static {p1, v0}, Lt/u/b/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z move-result p1 - invoke-virtual {v0, v1, p1}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Actions;->setProximityLock(Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;Z)V + if-eqz p1, :cond_1 + sget-object p1, Lcom/discord/utilities/voice/DiscordOverlayService;->Companion:Lcom/discord/utilities/voice/DiscordOverlayService$Companion; + + iget-object v0, p0, Lcom/discord/stores/StoreMediaNotification$init$4;->$context:Landroid/content/Context; + + invoke-virtual {p1, v0}, Lcom/discord/utilities/voice/DiscordOverlayService$Companion;->launchOverlayForVoice(Landroid/content/Context;)V + + :cond_1 :goto_0 return-void .end method diff --git a/com.discord/smali/com/discord/stores/StoreNavigation.smali b/com.discord/smali/com/discord/stores/StoreNavigation.smali index c86b5e6390..af5c3b0c09 100644 --- a/com.discord/smali/com/discord/stores/StoreNavigation.smali +++ b/com.discord/smali/com/discord/stores/StoreNavigation.smali @@ -168,7 +168,7 @@ const-string v1, "CONNECTION_ISSUES" - const v4, 0x7f0803db + const v4, 0x7f0803dc const/4 v8, 0x1 diff --git a/com.discord/smali/com/discord/stores/StoreStream$Companion.smali b/com.discord/smali/com/discord/stores/StoreStream$Companion.smali index 2004ea8fbc..11c9e97092 100644 --- a/com.discord/smali/com/discord/stores/StoreStream$Companion.smali +++ b/com.discord/smali/com/discord/stores/StoreStream$Companion.smali @@ -971,6 +971,20 @@ return-object v0 .end method +.method public final getUserAffinities()Lcom/discord/stores/StoreUserAffinities; + .locals 1 + + invoke-static {}, Lcom/discord/stores/StoreStream;->access$getCollector$cp()Lcom/discord/stores/StoreStream; + + move-result-object v0 + + invoke-virtual {v0}, Lcom/discord/stores/StoreStream;->getUserAffinities$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreUserAffinities; + + move-result-object v0 + + return-object v0 +.end method + .method public final getUserConnections()Lcom/discord/stores/StoreUserConnections; .locals 1 diff --git a/com.discord/smali/com/discord/stores/StoreStream.smali b/com.discord/smali/com/discord/stores/StoreStream.smali index a62a914939..91cb56ff30 100644 --- a/com.discord/smali/com/discord/stores/StoreStream.smali +++ b/com.discord/smali/com/discord/stores/StoreStream.smali @@ -188,6 +188,8 @@ .field public final subscriptions:Lcom/discord/stores/StoreSubscriptions; +.field public final userAffinities:Lcom/discord/stores/StoreUserAffinities; + .field public final userConnections:Lcom/discord/stores/StoreUserConnections; .field public final userNotes:Lcom/discord/stores/StoreUserNotes; @@ -1049,6 +1051,14 @@ iput-object v0, p0, Lcom/discord/stores/StoreStream;->guildProfiles:Lcom/discord/stores/StoreGuildProfiles; + new-instance v0, Lcom/discord/stores/StoreUserAffinities; + + iget-object v1, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher; + + invoke-direct {v0, v1}, Lcom/discord/stores/StoreUserAffinities;->(Lcom/discord/stores/Dispatcher;)V + + iput-object v0, p0, Lcom/discord/stores/StoreStream;->userAffinities:Lcom/discord/stores/StoreUserAffinities; + invoke-direct {p0}, Lcom/discord/stores/StoreStream;->registerDispatchHandlers()V return-void @@ -2472,6 +2482,18 @@ return-object v0 .end method +.method public static final getUserAffinities()Lcom/discord/stores/StoreUserAffinities; + .locals 1 + + sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion; + + invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getUserAffinities()Lcom/discord/stores/StoreUserAffinities; + + move-result-object v0 + + return-object v0 +.end method + .method public static final getUserConnections()Lcom/discord/stores/StoreUserConnections; .locals 1 @@ -3071,6 +3093,10 @@ invoke-virtual {p1}, Lcom/discord/stores/StoreRtcRegion;->handleConnectionOpen$app_productionDiscordExternalRelease()V + iget-object p1, p0, Lcom/discord/stores/StoreStream;->userAffinities:Lcom/discord/stores/StoreUserAffinities; + + invoke-virtual {p1}, Lcom/discord/stores/StoreUserAffinities;->handleConnectionOpen()V + new-instance p1, Ljava/lang/StringBuilder; invoke-direct {p1}, Ljava/lang/StringBuilder;->()V @@ -5172,7 +5198,7 @@ iget-object v0, p0, Lcom/discord/stores/StoreStream;->dispatcher:Lcom/discord/stores/Dispatcher; - const/16 v1, 0x27 + const/16 v1, 0x28 new-array v1, v1, [Lcom/discord/stores/DispatchHandler; @@ -5410,6 +5436,12 @@ aput-object v2, v1, v3 + iget-object v2, p0, Lcom/discord/stores/StoreStream;->userAffinities:Lcom/discord/stores/StoreUserAffinities; + + const/16 v3, 0x27 + + aput-object v2, v1, v3 + invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->registerDispatchHandlers([Lcom/discord/stores/DispatchHandler;)V return-void @@ -6093,6 +6125,14 @@ return-object v0 .end method +.method public final getUserAffinities$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreUserAffinities; + .locals 1 + + iget-object v0, p0, Lcom/discord/stores/StoreStream;->userAffinities:Lcom/discord/stores/StoreUserAffinities; + + return-object v0 +.end method + .method public final getUserConnections$app_productionDiscordExternalRelease()Lcom/discord/stores/StoreUserConnections; .locals 1 diff --git a/com.discord/smali/com/discord/stores/StoreUserAffinities$fetchUserAffinities$1$1.smali b/com.discord/smali/com/discord/stores/StoreUserAffinities$fetchUserAffinities$1$1.smali new file mode 100644 index 0000000000..ad1db28ae9 --- /dev/null +++ b/com.discord/smali/com/discord/stores/StoreUserAffinities$fetchUserAffinities$1$1.smali @@ -0,0 +1,74 @@ +.class public final Lcom/discord/stores/StoreUserAffinities$fetchUserAffinities$1$1; +.super Lt/u/b/k; +.source "StoreUserAffinities.kt" + +# interfaces +.implements Lkotlin/jvm/functions/Function0; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/stores/StoreUserAffinities$fetchUserAffinities$1;->invoke(Lcom/discord/models/domain/ModelUserAffinities;)V +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x19 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "Lt/u/b/k;", + "Lkotlin/jvm/functions/Function0<", + "Lkotlin/Unit;", + ">;" + } +.end annotation + + +# instance fields +.field public final synthetic $affinities:Lcom/discord/models/domain/ModelUserAffinities; + +.field public final synthetic this$0:Lcom/discord/stores/StoreUserAffinities$fetchUserAffinities$1; + + +# direct methods +.method public constructor (Lcom/discord/stores/StoreUserAffinities$fetchUserAffinities$1;Lcom/discord/models/domain/ModelUserAffinities;)V + .locals 0 + + iput-object p1, p0, Lcom/discord/stores/StoreUserAffinities$fetchUserAffinities$1$1;->this$0:Lcom/discord/stores/StoreUserAffinities$fetchUserAffinities$1; + + iput-object p2, p0, Lcom/discord/stores/StoreUserAffinities$fetchUserAffinities$1$1;->$affinities:Lcom/discord/models/domain/ModelUserAffinities; + + const/4 p1, 0x0 + + invoke-direct {p0, p1}, Lt/u/b/k;->(I)V + + return-void +.end method + + +# virtual methods +.method public bridge synthetic invoke()Ljava/lang/Object; + .locals 1 + + invoke-virtual {p0}, Lcom/discord/stores/StoreUserAffinities$fetchUserAffinities$1$1;->invoke()V + + sget-object v0, Lkotlin/Unit;->a:Lkotlin/Unit; + + return-object v0 +.end method + +.method public final invoke()V + .locals 2 + + iget-object v0, p0, Lcom/discord/stores/StoreUserAffinities$fetchUserAffinities$1$1;->this$0:Lcom/discord/stores/StoreUserAffinities$fetchUserAffinities$1; + + iget-object v0, v0, Lcom/discord/stores/StoreUserAffinities$fetchUserAffinities$1;->this$0:Lcom/discord/stores/StoreUserAffinities; + + iget-object v1, p0, Lcom/discord/stores/StoreUserAffinities$fetchUserAffinities$1$1;->$affinities:Lcom/discord/models/domain/ModelUserAffinities; + + invoke-static {v0, v1}, Lcom/discord/stores/StoreUserAffinities;->access$handleUserAffinitiesFetchSuccess(Lcom/discord/stores/StoreUserAffinities;Lcom/discord/models/domain/ModelUserAffinities;)V + + return-void +.end method diff --git a/com.discord/smali/com/discord/stores/StoreUserAffinities$fetchUserAffinities$1.smali b/com.discord/smali/com/discord/stores/StoreUserAffinities$fetchUserAffinities$1.smali new file mode 100644 index 0000000000..8ba5b2b3b3 --- /dev/null +++ b/com.discord/smali/com/discord/stores/StoreUserAffinities$fetchUserAffinities$1.smali @@ -0,0 +1,88 @@ +.class public final Lcom/discord/stores/StoreUserAffinities$fetchUserAffinities$1; +.super Lt/u/b/k; +.source "StoreUserAffinities.kt" + +# interfaces +.implements Lkotlin/jvm/functions/Function1; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/stores/StoreUserAffinities;->fetchUserAffinities()V +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x19 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "Lt/u/b/k;", + "Lkotlin/jvm/functions/Function1<", + "Lcom/discord/models/domain/ModelUserAffinities;", + "Lkotlin/Unit;", + ">;" + } +.end annotation + + +# instance fields +.field public final synthetic this$0:Lcom/discord/stores/StoreUserAffinities; + + +# direct methods +.method public constructor (Lcom/discord/stores/StoreUserAffinities;)V + .locals 0 + + iput-object p1, p0, Lcom/discord/stores/StoreUserAffinities$fetchUserAffinities$1;->this$0:Lcom/discord/stores/StoreUserAffinities; + + const/4 p1, 0x1 + + invoke-direct {p0, p1}, Lt/u/b/k;->(I)V + + return-void +.end method + + +# virtual methods +.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object; + .locals 0 + + check-cast p1, Lcom/discord/models/domain/ModelUserAffinities; + + invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUserAffinities$fetchUserAffinities$1;->invoke(Lcom/discord/models/domain/ModelUserAffinities;)V + + sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit; + + return-object p1 +.end method + +.method public final invoke(Lcom/discord/models/domain/ModelUserAffinities;)V + .locals 2 + + if-eqz p1, :cond_0 + + iget-object v0, p0, Lcom/discord/stores/StoreUserAffinities$fetchUserAffinities$1;->this$0:Lcom/discord/stores/StoreUserAffinities; + + invoke-static {v0}, Lcom/discord/stores/StoreUserAffinities;->access$getDispatcher$p(Lcom/discord/stores/StoreUserAffinities;)Lcom/discord/stores/Dispatcher; + + move-result-object v0 + + new-instance v1, Lcom/discord/stores/StoreUserAffinities$fetchUserAffinities$1$1; + + invoke-direct {v1, p0, p1}, Lcom/discord/stores/StoreUserAffinities$fetchUserAffinities$1$1;->(Lcom/discord/stores/StoreUserAffinities$fetchUserAffinities$1;Lcom/discord/models/domain/ModelUserAffinities;)V + + invoke-virtual {v0, v1}, Lcom/discord/stores/Dispatcher;->schedule(Lkotlin/jvm/functions/Function0;)V + + return-void + + :cond_0 + const-string p1, "affinities" + + invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V + + const/4 p1, 0x0 + + throw p1 +.end method diff --git a/com.discord/smali/com/discord/stores/StoreUserAffinities$getAffinityUserIds$1.smali b/com.discord/smali/com/discord/stores/StoreUserAffinities$getAffinityUserIds$1.smali new file mode 100644 index 0000000000..1fba2af143 --- /dev/null +++ b/com.discord/smali/com/discord/stores/StoreUserAffinities$getAffinityUserIds$1.smali @@ -0,0 +1,130 @@ +.class public final Lcom/discord/stores/StoreUserAffinities$getAffinityUserIds$1; +.super Ljava/lang/Object; +.source "StoreUserAffinities.kt" + +# interfaces +.implements Lb0/l/i; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/stores/StoreUserAffinities;->getAffinityUserIds()Lrx/Observable; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x19 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "", + "Ljava/lang/Object;", + "Lb0/l/i<", + "TT;TR;>;" + } +.end annotation + + +# static fields +.field public static final INSTANCE:Lcom/discord/stores/StoreUserAffinities$getAffinityUserIds$1; + + +# direct methods +.method public static constructor ()V + .locals 1 + + new-instance v0, Lcom/discord/stores/StoreUserAffinities$getAffinityUserIds$1; + + invoke-direct {v0}, Lcom/discord/stores/StoreUserAffinities$getAffinityUserIds$1;->()V + + sput-object v0, Lcom/discord/stores/StoreUserAffinities$getAffinityUserIds$1;->INSTANCE:Lcom/discord/stores/StoreUserAffinities$getAffinityUserIds$1; + + return-void +.end method + +.method public constructor ()V + .locals 0 + + invoke-direct {p0}, Ljava/lang/Object;->()V + + return-void +.end method + + +# virtual methods +.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object; + .locals 0 + + check-cast p1, Lcom/discord/models/domain/ModelUserAffinities; + + invoke-virtual {p0, p1}, Lcom/discord/stores/StoreUserAffinities$getAffinityUserIds$1;->call(Lcom/discord/models/domain/ModelUserAffinities;)Ljava/util/List; + + move-result-object p1 + + return-object p1 +.end method + +.method public final call(Lcom/discord/models/domain/ModelUserAffinities;)Ljava/util/List; + .locals 3 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Lcom/discord/models/domain/ModelUserAffinities;", + ")", + "Ljava/util/List<", + "Ljava/lang/Long;", + ">;" + } + .end annotation + + invoke-virtual {p1}, Lcom/discord/models/domain/ModelUserAffinities;->getUserAffinities()Ljava/util/List; + + move-result-object p1 + + new-instance v0, Ljava/util/ArrayList; + + const/16 v1, 0xa + + invoke-static {p1, v1}, Le/k/a/b/e/p/g;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I + + move-result v1 + + invoke-direct {v0, v1}, Ljava/util/ArrayList;->(I)V + + invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; + + move-result-object p1 + + :goto_0 + invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z + + move-result v1 + + if-eqz v1, :cond_0 + + invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object; + + move-result-object v1 + + check-cast v1, Lcom/discord/models/domain/ModelUserAffinity; + + invoke-virtual {v1}, Lcom/discord/models/domain/ModelUserAffinity;->getUserId()J + + move-result-wide v1 + + invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v1 + + invoke-interface {v0, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z + + goto :goto_0 + + :cond_0 + return-object v0 +.end method diff --git a/com.discord/smali/com/discord/stores/StoreUserAffinities.smali b/com.discord/smali/com/discord/stores/StoreUserAffinities.smali new file mode 100644 index 0000000000..858c724df8 --- /dev/null +++ b/com.discord/smali/com/discord/stores/StoreUserAffinities.smali @@ -0,0 +1,245 @@ +.class public final Lcom/discord/stores/StoreUserAffinities; +.super Lcom/discord/stores/Store; +.source "StoreUserAffinities.kt" + +# interfaces +.implements Lcom/discord/stores/DispatchHandler; + + +# instance fields +.field public affinities:Lcom/discord/models/domain/ModelUserAffinities; + +.field public final affinitiesSubject:Lrx/subjects/BehaviorSubject; + .annotation system Ldalvik/annotation/Signature; + value = { + "Lrx/subjects/BehaviorSubject<", + "Lcom/discord/models/domain/ModelUserAffinities;", + ">;" + } + .end annotation +.end field + +.field public final dispatcher:Lcom/discord/stores/Dispatcher; + +.field public isDirty:Z + + +# direct methods +.method public constructor (Lcom/discord/stores/Dispatcher;)V + .locals 1 + + if-eqz p1, :cond_0 + + invoke-direct {p0}, Lcom/discord/stores/Store;->()V + + iput-object p1, p0, Lcom/discord/stores/StoreUserAffinities;->dispatcher:Lcom/discord/stores/Dispatcher; + + new-instance p1, Lcom/discord/models/domain/ModelUserAffinities; + + sget-object v0, Lt/q/o;->d:Lt/q/o; + + invoke-direct {p1, v0, v0}, Lcom/discord/models/domain/ModelUserAffinities;->(Ljava/util/List;Ljava/util/List;)V + + iput-object p1, p0, Lcom/discord/stores/StoreUserAffinities;->affinities:Lcom/discord/models/domain/ModelUserAffinities; + + iget-object p1, p0, Lcom/discord/stores/StoreUserAffinities;->affinities:Lcom/discord/models/domain/ModelUserAffinities; + + invoke-static {p1}, Lrx/subjects/BehaviorSubject;->a(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject; + + move-result-object p1 + + const-string v0, "BehaviorSubject.create(affinities)" + + invoke-static {p1, v0}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + iput-object p1, p0, Lcom/discord/stores/StoreUserAffinities;->affinitiesSubject:Lrx/subjects/BehaviorSubject; + + return-void + + :cond_0 + const-string p1, "dispatcher" + + invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V + + const/4 p1, 0x0 + + throw p1 +.end method + +.method public static final synthetic access$getDispatcher$p(Lcom/discord/stores/StoreUserAffinities;)Lcom/discord/stores/Dispatcher; + .locals 0 + + iget-object p0, p0, Lcom/discord/stores/StoreUserAffinities;->dispatcher:Lcom/discord/stores/Dispatcher; + + return-object p0 +.end method + +.method public static final synthetic access$handleUserAffinitiesFetchSuccess(Lcom/discord/stores/StoreUserAffinities;Lcom/discord/models/domain/ModelUserAffinities;)V + .locals 0 + + invoke-direct {p0, p1}, Lcom/discord/stores/StoreUserAffinities;->handleUserAffinitiesFetchSuccess(Lcom/discord/models/domain/ModelUserAffinities;)V + + return-void +.end method + +.method private final fetchUserAffinities()V + .locals 13 + .annotation runtime Lcom/discord/stores/StoreThread; + .end annotation + + sget-object v0, Lcom/discord/utilities/rest/RestAPI;->Companion:Lcom/discord/utilities/rest/RestAPI$Companion; + + invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI$Companion;->getApi()Lcom/discord/utilities/rest/RestAPI; + + move-result-object v0 + + invoke-virtual {v0}, Lcom/discord/utilities/rest/RestAPI;->getUserAffinities()Lrx/Observable; + + move-result-object v0 + + const/4 v1, 0x0 + + const/4 v2, 0x1 + + const/4 v3, 0x0 + + invoke-static {v0, v1, v2, v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable; + + move-result-object v4 + + const-class v5, Lcom/discord/stores/StoreUserAffinities; + + new-instance v10, Lcom/discord/stores/StoreUserAffinities$fetchUserAffinities$1; + + invoke-direct {v10, p0}, Lcom/discord/stores/StoreUserAffinities$fetchUserAffinities$1;->(Lcom/discord/stores/StoreUserAffinities;)V + + const/4 v6, 0x0 + + const/4 v7, 0x0 + + const/4 v8, 0x0 + + const/4 v9, 0x0 + + const/16 v11, 0x1e + + const/4 v12, 0x0 + + invoke-static/range {v4 .. v12}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + + return-void +.end method + +.method private final handleUserAffinitiesFetchSuccess(Lcom/discord/models/domain/ModelUserAffinities;)V + .locals 0 + .annotation runtime Lcom/discord/stores/StoreThread; + .end annotation + + iput-object p1, p0, Lcom/discord/stores/StoreUserAffinities;->affinities:Lcom/discord/models/domain/ModelUserAffinities; + + const/4 p1, 0x1 + + iput-boolean p1, p0, Lcom/discord/stores/StoreUserAffinities;->isDirty:Z + + return-void +.end method + + +# virtual methods +.method public final get()Lrx/Observable; + .locals 2 + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Lrx/Observable<", + "Lcom/discord/models/domain/ModelUserAffinities;", + ">;" + } + .end annotation + + iget-object v0, p0, Lcom/discord/stores/StoreUserAffinities;->affinitiesSubject:Lrx/subjects/BehaviorSubject; + + invoke-virtual {v0}, Lrx/Observable;->a()Lrx/Observable; + + move-result-object v0 + + const-string v1, "affinitiesSubject\n \u2026 .distinctUntilChanged()" + + invoke-static {v0, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + return-object v0 +.end method + +.method public final getAffinityUserIds()Lrx/Observable; + .locals 2 + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Lrx/Observable<", + "Ljava/util/List<", + "Ljava/lang/Long;", + ">;>;" + } + .end annotation + + invoke-virtual {p0}, Lcom/discord/stores/StoreUserAffinities;->get()Lrx/Observable; + + move-result-object v0 + + sget-object v1, Lcom/discord/stores/StoreUserAffinities$getAffinityUserIds$1;->INSTANCE:Lcom/discord/stores/StoreUserAffinities$getAffinityUserIds$1; + + invoke-virtual {v0, v1}, Lrx/Observable;->f(Lb0/l/i;)Lrx/Observable; + + move-result-object v0 + + const-string v1, "get()\n .map { a\u2026ty -> affinity.userId } }" + + invoke-static {v0, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable; + + move-result-object v0 + + invoke-virtual {v0}, Lrx/Observable;->a()Lrx/Observable; + + move-result-object v0 + + const-string v1, "get()\n .map { a\u2026 .distinctUntilChanged()" + + invoke-static {v0, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + return-object v0 +.end method + +.method public final handleConnectionOpen()V + .locals 0 + .annotation runtime Lcom/discord/stores/StoreThread; + .end annotation + + invoke-direct {p0}, Lcom/discord/stores/StoreUserAffinities;->fetchUserAffinities()V + + return-void +.end method + +.method public onDispatchEnded()V + .locals 2 + .annotation runtime Lcom/discord/stores/StoreThread; + .end annotation + + iget-boolean v0, p0, Lcom/discord/stores/StoreUserAffinities;->isDirty:Z + + if-eqz v0, :cond_0 + + iget-object v0, p0, Lcom/discord/stores/StoreUserAffinities;->affinitiesSubject:Lrx/subjects/BehaviorSubject; + + iget-object v1, p0, Lcom/discord/stores/StoreUserAffinities;->affinities:Lcom/discord/models/domain/ModelUserAffinities; + + invoke-virtual {v0, v1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V + + const/4 v0, 0x0 + + iput-boolean v0, p0, Lcom/discord/stores/StoreUserAffinities;->isDirty:Z + + :cond_0 + return-void +.end method diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali index 200ba3a113..dfba81eb36 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/1020" + const-string v4, "Discord-Android/1021" 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, 0x3fc + const/16 v2, 0x3fd invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -201,7 +201,7 @@ const/4 v1, 0x3 - const-string v2, "10.2.0" + const-string v2, "10.2.1" const-string v3, "" diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$1.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$1.smali index 06af3db284..d2cd7d4b68 100644 --- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$1.smali +++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$1.smali @@ -8,7 +8,7 @@ # annotations .annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/utilities/analytics/AnalyticsTracker;->inviteSuggestionOpened(JLjava/util/List;)V + value = Lcom/discord/utilities/analytics/AnalyticsTracker;->inviteSuggestionOpened(JLjava/util/List;Ljava/util/List;)V .end annotation .annotation system Ldalvik/annotation/InnerClass; diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2.smali index 6a77777be7..55b259ef45 100644 --- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2.smali +++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2.smali @@ -8,7 +8,7 @@ # annotations .annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/utilities/analytics/AnalyticsTracker;->inviteSuggestionOpened(JLjava/util/List;)V + value = Lcom/discord/utilities/analytics/AnalyticsTracker;->inviteSuggestionOpened(JLjava/util/List;Ljava/util/List;)V .end annotation .annotation system Ldalvik/annotation/InnerClass; @@ -31,18 +31,22 @@ # instance fields +.field public final synthetic $channelSuggestions:Ljava/util/List; + .field public final synthetic $guildId:J -.field public final synthetic $suggestions:Ljava/util/List; +.field public final synthetic $userSuggestions:Ljava/util/List; # direct methods -.method public constructor (Ljava/util/List;J)V +.method public constructor (Ljava/util/List;Ljava/util/List;J)V .locals 0 - iput-object p1, p0, Lcom/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2;->$suggestions:Ljava/util/List; + iput-object p1, p0, Lcom/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2;->$channelSuggestions:Ljava/util/List; - iput-wide p2, p0, Lcom/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2;->$guildId:J + iput-object p2, p0, Lcom/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2;->$userSuggestions:Ljava/util/List; + + iput-wide p3, p0, Lcom/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2;->$guildId:J const/4 p1, 0x1 @@ -76,7 +80,7 @@ } .end annotation - iget-object v0, p0, Lcom/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2;->$suggestions:Ljava/util/List; + iget-object v0, p0, Lcom/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2;->$channelSuggestions:Ljava/util/List; new-instance v1, Ljava/util/LinkedHashMap; @@ -189,13 +193,21 @@ new-array v6, v6, [Lkotlin/Pair; - iget-object v7, p0, Lcom/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2;->$suggestions:Ljava/util/List; + iget-object v7, p0, Lcom/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2;->$channelSuggestions:Ljava/util/List; invoke-interface {v7}, Ljava/util/List;->size()I move-result v7 - invoke-static {v7}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + iget-object v8, p0, Lcom/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2;->$userSuggestions:Ljava/util/List; + + invoke-interface {v8}, Ljava/util/List;->size()I + + move-result v8 + + add-int/2addr v8, v7 + + invoke-static {v8}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; move-result-object v7 @@ -225,7 +237,15 @@ const/4 p1, 0x2 - invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + iget-object v0, p0, Lcom/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2;->$userSuggestions:Ljava/util/List; + + invoke-interface {v0}, Ljava/util/List;->size()I + + move-result v0 + + add-int/2addr v0, v2 + + invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; move-result-object v0 diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker.smali index ef7fdc6f73..4e7135f75b 100644 --- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker.smali +++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsTracker.smali @@ -4476,7 +4476,7 @@ throw p1 .end method -.method public final inviteSuggestionOpened(JLjava/util/List;)V +.method public final inviteSuggestionOpened(JLjava/util/List;Ljava/util/List;)V .locals 9 .annotation system Ldalvik/annotation/Signature; value = { @@ -4484,72 +4484,133 @@ "Ljava/util/List<", "+", "Lcom/discord/models/domain/ModelChannel;", + ">;", + "Ljava/util/List<", + "+", + "Lcom/discord/models/domain/ModelUser;", ">;)V" } .end annotation - if-eqz p3, :cond_2 + const/4 v0, 0x0 - new-instance v0, Ljava/util/ArrayList; + if-eqz p3, :cond_4 - invoke-direct {v0}, Ljava/util/ArrayList;->()V + if-eqz p4, :cond_3 + + const/4 v0, 0x2 + + new-array v0, v0, [Ljava/util/List; + + const/4 v1, 0x0 + + new-instance v2, Ljava/util/ArrayList; + + invoke-direct {v2}, Ljava/util/ArrayList;->()V invoke-interface {p3}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; - move-result-object v1 + move-result-object v3 :goto_0 - invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z - - move-result v2 - - if-eqz v2, :cond_1 - - invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object; - - move-result-object v2 - - check-cast v2, Lcom/discord/models/domain/ModelChannel; - - invoke-virtual {v2}, Lcom/discord/models/domain/ModelChannel;->getRecipients()Ljava/util/List; - - move-result-object v2 - - const-string v3, "channel.recipients" - - invoke-static {v2, v3}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - - new-instance v3, Ljava/util/ArrayList; - - const/16 v4, 0xa - - invoke-static {v2, v4}, Le/k/a/b/e/p/g;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I + invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z move-result v4 - invoke-direct {v3, v4}, Ljava/util/ArrayList;->(I)V + const/16 v5, 0xa - invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; + if-eqz v4, :cond_1 - move-result-object v2 + invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object; + + move-result-object v4 + + check-cast v4, Lcom/discord/models/domain/ModelChannel; + + invoke-virtual {v4}, Lcom/discord/models/domain/ModelChannel;->getRecipients()Ljava/util/List; + + move-result-object v4 + + const-string v6, "channel.recipients" + + invoke-static {v4, v6}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + new-instance v6, Ljava/util/ArrayList; + + invoke-static {v4, v5}, Le/k/a/b/e/p/g;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I + + move-result v5 + + invoke-direct {v6, v5}, Ljava/util/ArrayList;->(I)V + + invoke-interface {v4}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; + + move-result-object v4 :goto_1 - invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z + invoke-interface {v4}, Ljava/util/Iterator;->hasNext()Z + + move-result v5 + + if-eqz v5, :cond_0 + + invoke-interface {v4}, Ljava/util/Iterator;->next()Ljava/lang/Object; + + move-result-object v5 + + check-cast v5, Lcom/discord/models/domain/ModelUser; + + const-string v7, "it" + + invoke-static {v5, v7}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {v5}, Lcom/discord/models/domain/ModelUser;->getId()J + + move-result-wide v7 + + invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v5 + + invoke-interface {v6, v5}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z + + goto :goto_1 + + :cond_0 + invoke-static {v2, v6}, Le/k/a/b/e/p/g;->addAll(Ljava/util/Collection;Ljava/lang/Iterable;)Z + + goto :goto_0 + + :cond_1 + aput-object v2, v0, v1 + + const/4 v1, 0x1 + + new-instance v2, Ljava/util/ArrayList; + + invoke-static {p4, v5}, Le/k/a/b/e/p/g;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I + + move-result v3 + + invoke-direct {v2, v3}, Ljava/util/ArrayList;->(I)V + + invoke-interface {p4}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; + + move-result-object v3 + + :goto_2 + invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z move-result v4 - if-eqz v4, :cond_0 + if-eqz v4, :cond_2 - invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object; + invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object; move-result-object v4 check-cast v4, Lcom/discord/models/domain/ModelUser; - const-string v5, "it" - - invoke-static {v4, v5}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getId()J move-result-wide v4 @@ -4558,16 +4619,21 @@ move-result-object v4 - invoke-interface {v3, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z + invoke-interface {v2, v4}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z - goto :goto_1 + goto :goto_2 - :cond_0 - invoke-static {v0, v3}, Le/k/a/b/e/p/g;->addAll(Ljava/util/Collection;Ljava/lang/Iterable;)Z + :cond_2 + aput-object v2, v0, v1 - goto :goto_0 + invoke-static {v0}, Le/k/a/b/e/p/g;->listOf([Ljava/lang/Object;)Ljava/util/List; + + move-result-object v0 + + invoke-static {v0}, Le/k/a/b/e/p/g;->flatten(Ljava/lang/Iterable;)Ljava/util/List; + + move-result-object v0 - :cond_1 invoke-static {v0}, Lt/q/l;->distinct(Ljava/lang/Iterable;)Ljava/util/List; move-result-object v0 @@ -4612,7 +4678,7 @@ new-instance v2, Lcom/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2; - invoke-direct {v2, p3, p1, p2}, Lcom/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2;->(Ljava/util/List;J)V + invoke-direct {v2, p3, p4, p1, p2}, Lcom/discord/utilities/analytics/AnalyticsTracker$inviteSuggestionOpened$2;->(Ljava/util/List;Ljava/util/List;J)V const-class v3, Lcom/discord/utilities/analytics/AnalyticsTracker; @@ -4632,14 +4698,19 @@ return-void - :cond_2 - const-string p1, "suggestions" + :cond_3 + const-string p1, "userSuggestions" invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V - const/4 p1, 0x0 + throw v0 - throw p1 + :cond_4 + const-string p1, "channelSuggestions" + + invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V + + throw v0 .end method .method public final inviteViewed()V diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationCache.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationCache.smali index 42901880f6..caae0f8897 100644 --- a/com.discord/smali/com/discord/utilities/fcm/NotificationCache.smali +++ b/com.discord/smali/com/discord/utilities/fcm/NotificationCache.smali @@ -41,7 +41,7 @@ invoke-direct {v1}, Ljava/util/HashMap;->()V - const-string v2, "NOTIFICATION_BUNDLES_V3" + const-string v2, "NOTIFICATION_BUNDLES_V4" invoke-direct {v0, v2, v1}, Lcom/discord/utilities/persister/Persister;->(Ljava/lang/String;Ljava/lang/Object;)V @@ -433,7 +433,7 @@ invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v6, "NOTIFICATION_BUNDLES_V3 cache " + const-string v6, "NOTIFICATION_BUNDLES_V4 cache " invoke-virtual {v5, v6}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali index 38b0bd1a26..0e21a453d3 100644 --- a/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali +++ b/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali @@ -93,8 +93,6 @@ .field public final channelType:I -.field public final clock:Lcom/discord/utilities/time/Clock; - .field public final guildIcon:Ljava/lang/String; .field public final guildId:J @@ -151,12 +149,11 @@ return-void .end method -.method public constructor (Lcom/discord/utilities/time/Clock;Ljava/lang/String;JILjava/lang/String;ILjava/lang/String;JLjava/util/List;ILjava/lang/String;Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;IJLjava/lang/String;Ljava/lang/String;ILjava/lang/String;JLjava/lang/String;Ljava/lang/String;)V +.method public constructor (Ljava/lang/String;JILjava/lang/String;ILjava/lang/String;JLjava/util/List;ILjava/lang/String;Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;IJLjava/lang/String;Ljava/lang/String;ILjava/lang/String;JLjava/lang/String;Ljava/lang/String;)V .locals 10 .annotation system Ldalvik/annotation/Signature; value = { "(", - "Lcom/discord/utilities/time/Clock;", "Ljava/lang/String;", "JI", "Ljava/lang/String;", @@ -187,153 +184,147 @@ move-object v1, p1 - move-object v2, p2 + move-object/from16 v2, p10 - move-object/from16 v3, p11 + const/4 v3, 0x0 - const/4 v4, 0x0 + if-eqz v1, :cond_7 - if-eqz v1, :cond_8 - - if-eqz v2, :cond_7 - - if-eqz v3, :cond_6 + if-eqz v2, :cond_6 invoke-direct {p0}, Ljava/lang/Object;->()V - iput-object v1, v0, Lcom/discord/utilities/fcm/NotificationData;->clock:Lcom/discord/utilities/time/Clock; + iput-object v1, v0, Lcom/discord/utilities/fcm/NotificationData;->type:Ljava/lang/String; - iput-object v2, v0, Lcom/discord/utilities/fcm/NotificationData;->type:Ljava/lang/String; + move-wide v4, p2 - move-wide v1, p3 + iput-wide v4, v0, Lcom/discord/utilities/fcm/NotificationData;->messageId:J - iput-wide v1, v0, Lcom/discord/utilities/fcm/NotificationData;->messageId:J - - move v1, p5 + move v1, p4 iput v1, v0, Lcom/discord/utilities/fcm/NotificationData;->messageActivityType:I - move-object/from16 v1, p6 + move-object v1, p5 iput-object v1, v0, Lcom/discord/utilities/fcm/NotificationData;->messageApplicationName:Ljava/lang/String; - move/from16 v1, p7 + move/from16 v1, p6 iput v1, v0, Lcom/discord/utilities/fcm/NotificationData;->messageType:I - move-object/from16 v1, p8 + move-object/from16 v1, p7 iput-object v1, v0, Lcom/discord/utilities/fcm/NotificationData;->messageContent:Ljava/lang/String; - move-wide/from16 v1, p9 + move-wide/from16 v4, p8 - iput-wide v1, v0, Lcom/discord/utilities/fcm/NotificationData;->channelId:J + iput-wide v4, v0, Lcom/discord/utilities/fcm/NotificationData;->channelId:J - iput-object v3, v0, Lcom/discord/utilities/fcm/NotificationData;->ackChannelIds:Ljava/util/List; + iput-object v2, v0, Lcom/discord/utilities/fcm/NotificationData;->ackChannelIds:Ljava/util/List; - move/from16 v1, p12 + move/from16 v1, p11 iput v1, v0, Lcom/discord/utilities/fcm/NotificationData;->channelType:I - move-object/from16 v1, p13 + move-object/from16 v1, p12 iput-object v1, v0, Lcom/discord/utilities/fcm/NotificationData;->channelName:Ljava/lang/String; - move-object/from16 v1, p14 + move-object/from16 v1, p13 iput-object v1, v0, Lcom/discord/utilities/fcm/NotificationData;->channelIcon:Ljava/lang/String; - move-wide/from16 v1, p15 + move-wide/from16 v1, p14 iput-wide v1, v0, Lcom/discord/utilities/fcm/NotificationData;->userId:J - move-object/from16 v1, p17 + move-object/from16 v1, p16 iput-object v1, v0, Lcom/discord/utilities/fcm/NotificationData;->userUsername:Ljava/lang/String; - move-object/from16 v1, p18 + move-object/from16 v1, p17 iput-object v1, v0, Lcom/discord/utilities/fcm/NotificationData;->userAvatar:Ljava/lang/String; - move/from16 v1, p19 + move/from16 v1, p18 iput v1, v0, Lcom/discord/utilities/fcm/NotificationData;->relationshipType:I - move-object/from16 v1, p22 + move-object/from16 v1, p21 iput-object v1, v0, Lcom/discord/utilities/fcm/NotificationData;->guildName:Ljava/lang/String; - move-object/from16 v1, p23 + move-object/from16 v1, p22 iput-object v1, v0, Lcom/discord/utilities/fcm/NotificationData;->guildIcon:Ljava/lang/String; - move/from16 v1, p24 + move/from16 v1, p23 iput v1, v0, Lcom/discord/utilities/fcm/NotificationData;->activityType:I - move-object/from16 v1, p25 + move-object/from16 v1, p24 iput-object v1, v0, Lcom/discord/utilities/fcm/NotificationData;->activityName:Ljava/lang/String; - move-wide/from16 v1, p26 + move-wide/from16 v1, p25 iput-wide v1, v0, Lcom/discord/utilities/fcm/NotificationData;->applicationId:J - move-object/from16 v1, p28 + move-object/from16 v1, p27 iput-object v1, v0, Lcom/discord/utilities/fcm/NotificationData;->applicationName:Ljava/lang/String; - move-object/from16 v1, p29 + move-object/from16 v1, p28 iput-object v1, v0, Lcom/discord/utilities/fcm/NotificationData;->applicationIcon:Ljava/lang/String; - invoke-static/range {p20 .. p21}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static/range {p19 .. p20}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; move-result-object v1 invoke-virtual {v1}, Ljava/lang/Number;->longValue()J - move-result-wide v2 + move-result-wide v4 - const/4 v5, 0x0 + const/4 v2, 0x0 const-wide/16 v6, -0x1 const/4 v8, 0x1 - cmp-long v9, v2, v6 + cmp-long v9, v4, v6 if-nez v9, :cond_0 - const/4 v2, 0x1 + const/4 v4, 0x1 goto :goto_0 :cond_0 - const/4 v2, 0x0 + const/4 v4, 0x0 :goto_0 - if-nez v2, :cond_1 + if-nez v4, :cond_1 - move-object v4, v1 + move-object v3, v1 :cond_1 const/4 v1, 0x3 - if-eqz v4, :cond_2 + if-eqz v3, :cond_2 - invoke-virtual {v4}, Ljava/lang/Long;->longValue()J + invoke-virtual {v3}, Ljava/lang/Long;->longValue()J move-result-wide v6 goto :goto_1 :cond_2 - iget v2, v0, Lcom/discord/utilities/fcm/NotificationData;->channelType:I + iget v3, v0, Lcom/discord/utilities/fcm/NotificationData;->channelType:I - if-eq v2, v8, :cond_3 + if-eq v3, v8, :cond_3 - if-eq v2, v1, :cond_3 + if-eq v3, v1, :cond_3 goto :goto_1 @@ -343,27 +334,30 @@ :goto_1 iput-wide v6, v0, Lcom/discord/utilities/fcm/NotificationData;->guildId:J - iget-object v2, v0, Lcom/discord/utilities/fcm/NotificationData;->type:Ljava/lang/String; + iget-object v3, v0, Lcom/discord/utilities/fcm/NotificationData;->type:Ljava/lang/String; - const-string v3, "MESSAGE_CREATE" + const-string v4, "MESSAGE_CREATE" - invoke-static {v2, v3}, Lt/u/b/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z + invoke-static {v3, v4}, Lt/u/b/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z - move-result v2 + move-result v3 - if-eqz v2, :cond_5 + if-eqz v3, :cond_4 - iget v2, v0, Lcom/discord/utilities/fcm/NotificationData;->channelType:I + iget v3, v0, Lcom/discord/utilities/fcm/NotificationData;->channelType:I - if-eqz v2, :cond_4 + if-eqz v3, :cond_5 - if-ne v2, v1, :cond_5 + if-ne v3, v1, :cond_4 + + goto :goto_2 :cond_4 - const/4 v5, 0x1 + const/4 v8, 0x0 :cond_5 - iput-boolean v5, v0, Lcom/discord/utilities/fcm/NotificationData;->isGroupConversation:Z + :goto_2 + iput-boolean v8, v0, Lcom/discord/utilities/fcm/NotificationData;->isGroupConversation:Z return-void @@ -372,97 +366,18 @@ invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V - throw v4 + throw v3 :cond_7 const-string v1, "type" invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V - throw v4 - - :cond_8 - const-string v1, "clock" - - invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V - - throw v4 -.end method - -.method public synthetic constructor (Lcom/discord/utilities/time/Clock;Ljava/lang/String;JILjava/lang/String;ILjava/lang/String;JLjava/util/List;ILjava/lang/String;Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;IJLjava/lang/String;Ljava/lang/String;ILjava/lang/String;JLjava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - .locals 31 - - and-int/lit8 v0, p30, 0x1 - - if-eqz v0, :cond_0 - - invoke-static {}, Lcom/discord/utilities/time/ClockFactory;->get()Lcom/discord/utilities/time/Clock; - - move-result-object v0 - - move-object v2, v0 - - goto :goto_0 - - :cond_0 - move-object/from16 v2, p1 - - :goto_0 - move-object/from16 v1, p0 - - move-object/from16 v3, p2 - - move-wide/from16 v4, p3 - - move/from16 v6, p5 - - move-object/from16 v7, p6 - - move/from16 v8, p7 - - move-object/from16 v9, p8 - - move-wide/from16 v10, p9 - - move-object/from16 v12, p11 - - move/from16 v13, p12 - - move-object/from16 v14, p13 - - move-object/from16 v15, p14 - - move-wide/from16 v16, p15 - - move-object/from16 v18, p17 - - move-object/from16 v19, p18 - - move/from16 v20, p19 - - move-wide/from16 v21, p20 - - move-object/from16 v23, p22 - - move-object/from16 v24, p23 - - move/from16 v25, p24 - - move-object/from16 v26, p25 - - move-wide/from16 v27, p26 - - move-object/from16 v29, p28 - - move-object/from16 v30, p29 - - invoke-direct/range {v1 .. v30}, Lcom/discord/utilities/fcm/NotificationData;->(Lcom/discord/utilities/time/Clock;Ljava/lang/String;JILjava/lang/String;ILjava/lang/String;JLjava/util/List;ILjava/lang/String;Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;IJLjava/lang/String;Ljava/lang/String;ILjava/lang/String;JLjava/lang/String;Ljava/lang/String;)V - - return-void + throw v3 .end method .method public constructor (Ljava/util/Map;)V - .locals 40 + .locals 36 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -477,8 +392,6 @@ if-eqz v0, :cond_b - const/4 v2, 0x0 - const-string v1, "type" invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; @@ -515,7 +428,9 @@ invoke-virtual {v1}, Ljava/lang/Long;->longValue()J - move-result-wide v6 + move-result-wide v1 + + move-wide v6, v1 goto :goto_1 @@ -531,17 +446,17 @@ check-cast v1, Ljava/lang/String; - const/16 v8, 0xa + const/16 v2, 0xa - const-string v9, "$this$toIntOrNull" + const-string v8, "$this$toIntOrNull" - const/4 v10, -0x1 + const/4 v9, -0x1 if-eqz v1, :cond_2 - invoke-static {v1, v9}, Lt/u/b/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v1, v8}, Lt/u/b/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {v1, v8}, Lt/a0/m;->toIntOrNull(Ljava/lang/String;I)Ljava/lang/Integer; + invoke-static {v1, v2}, Lt/a0/m;->toIntOrNull(Ljava/lang/String;I)Ljava/lang/Integer; move-result-object v1 @@ -551,91 +466,83 @@ move-result v1 - move v11, v1 - goto :goto_2 :cond_2 - const/4 v11, -0x1 + const/4 v1, -0x1 :goto_2 - const-string v1, "message_application_name" + const-string v10, "message_application_name" - invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v0, v10}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object v1 + move-result-object v10 - move-object v12, v1 + check-cast v10, Ljava/lang/String; - check-cast v12, Ljava/lang/String; + const-string v11, "message_type_" - const-string v1, "message_type_" + invoke-interface {v0, v11}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + move-result-object v11 - move-result-object v1 + check-cast v11, Ljava/lang/String; - check-cast v1, Ljava/lang/String; + if-eqz v11, :cond_3 - if-eqz v1, :cond_3 + invoke-static {v11, v8}, Lt/u/b/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {v1, v9}, Lt/u/b/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v11, v2}, Lt/a0/m;->toIntOrNull(Ljava/lang/String;I)Ljava/lang/Integer; - invoke-static {v1, v8}, Lt/a0/m;->toIntOrNull(Ljava/lang/String;I)Ljava/lang/Integer; + move-result-object v11 - move-result-object v1 + if-eqz v11, :cond_3 - if-eqz v1, :cond_3 + invoke-virtual {v11}, Ljava/lang/Integer;->intValue()I - invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I - - move-result v1 - - move v13, v1 + move-result v11 goto :goto_3 :cond_3 - const/4 v13, -0x1 + const/4 v11, -0x1 :goto_3 - const-string v1, "message_content" + const-string v12, "message_content" - invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v0, v12}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object v1 + move-result-object v12 - move-object v14, v1 + check-cast v12, Ljava/lang/String; - check-cast v14, Ljava/lang/String; + const-string v13, "channel_id" - const-string v1, "channel_id" + invoke-interface {v0, v13}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + move-result-object v13 - move-result-object v1 + check-cast v13, Ljava/lang/String; - check-cast v1, Ljava/lang/String; + if-eqz v13, :cond_4 - if-eqz v1, :cond_4 + invoke-static {v13}, Lt/a0/m;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long; - invoke-static {v1}, Lt/a0/m;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long; + move-result-object v13 - move-result-object v1 + if-eqz v13, :cond_4 - if-eqz v1, :cond_4 + invoke-virtual {v13}, Ljava/lang/Long;->longValue()J - invoke-virtual {v1}, Ljava/lang/Long;->longValue()J - - move-result-wide v15 + move-result-wide v13 goto :goto_4 :cond_4 - const-wide/16 v15, -0x1 + const-wide/16 v13, -0x1 :goto_4 - sget-object v1, Lcom/discord/utilities/fcm/NotificationData;->Companion:Lcom/discord/utilities/fcm/NotificationData$Companion; + sget-object v15, Lcom/discord/utilities/fcm/NotificationData;->Companion:Lcom/discord/utilities/fcm/NotificationData$Companion; const-string v4, "channel_ids" @@ -645,267 +552,267 @@ check-cast v4, Ljava/lang/String; - invoke-static {v1, v4}, Lcom/discord/utilities/fcm/NotificationData$Companion;->access$parseAckChannelIds(Lcom/discord/utilities/fcm/NotificationData$Companion;Ljava/lang/String;)Ljava/util/List; + invoke-static {v15, v4}, Lcom/discord/utilities/fcm/NotificationData$Companion;->access$parseAckChannelIds(Lcom/discord/utilities/fcm/NotificationData$Companion;Ljava/lang/String;)Ljava/util/List; - move-result-object v19 + move-result-object v15 - const-string v1, "channel_type" + const-string v4, "channel_type" - invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v0, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object v1 + move-result-object v4 - check-cast v1, Ljava/lang/String; + check-cast v4, Ljava/lang/String; - if-eqz v1, :cond_5 + if-eqz v4, :cond_5 - invoke-static {v1, v9}, Lt/u/b/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v4, v8}, Lt/u/b/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {v1, v8}, Lt/a0/m;->toIntOrNull(Ljava/lang/String;I)Ljava/lang/Integer; + invoke-static {v4, v2}, Lt/a0/m;->toIntOrNull(Ljava/lang/String;I)Ljava/lang/Integer; - move-result-object v1 + move-result-object v4 - if-eqz v1, :cond_5 + if-eqz v4, :cond_5 - invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I + invoke-virtual {v4}, Ljava/lang/Integer;->intValue()I - move-result v1 + move-result v4 - move/from16 v20, v1 + move/from16 v18, v4 goto :goto_5 :cond_5 - const/16 v20, -0x1 + const/16 v18, -0x1 :goto_5 - const-string v1, "channel_name" + const-string v4, "channel_name" - invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v0, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object v1 + move-result-object v4 - move-object/from16 v21, v1 + move-object/from16 v19, v4 - check-cast v21, Ljava/lang/String; + check-cast v19, Ljava/lang/String; - const-string v1, "channel_icon" + const-string v4, "channel_icon" - invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v0, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object v1 + move-result-object v4 - move-object/from16 v22, v1 + move-object/from16 v20, v4 - check-cast v22, Ljava/lang/String; + check-cast v20, Ljava/lang/String; - const-string v1, "user_id" + const-string v4, "user_id" - invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v0, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object v1 + move-result-object v4 - check-cast v1, Ljava/lang/String; + check-cast v4, Ljava/lang/String; - if-eqz v1, :cond_6 + if-eqz v4, :cond_6 - invoke-static {v1}, Lt/a0/m;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long; + invoke-static {v4}, Lt/a0/m;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long; - move-result-object v1 + move-result-object v4 - if-eqz v1, :cond_6 + if-eqz v4, :cond_6 - invoke-virtual {v1}, Ljava/lang/Long;->longValue()J + invoke-virtual {v4}, Ljava/lang/Long;->longValue()J move-result-wide v4 - move-wide/from16 v23, v4 + move-wide/from16 v21, v4 goto :goto_6 :cond_6 - const-wide/16 v23, -0x1 + const-wide/16 v21, -0x1 :goto_6 - const-string v1, "user_username" + const-string v4, "user_username" - invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v0, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object v1 + move-result-object v4 - move-object/from16 v25, v1 + move-object/from16 v23, v4 - check-cast v25, Ljava/lang/String; + check-cast v23, Ljava/lang/String; - const-string v1, "user_avatar" + const-string v4, "user_avatar" - invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v0, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object v1 + move-result-object v4 - move-object/from16 v26, v1 + move-object/from16 v24, v4 - check-cast v26, Ljava/lang/String; + check-cast v24, Ljava/lang/String; - const-string v1, "rel_type" + const-string v4, "rel_type" - invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v0, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object v1 + move-result-object v4 - check-cast v1, Ljava/lang/String; + check-cast v4, Ljava/lang/String; - if-eqz v1, :cond_7 + if-eqz v4, :cond_7 - invoke-static {v1, v9}, Lt/u/b/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v4, v8}, Lt/u/b/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {v1, v8}, Lt/a0/m;->toIntOrNull(Ljava/lang/String;I)Ljava/lang/Integer; + invoke-static {v4, v2}, Lt/a0/m;->toIntOrNull(Ljava/lang/String;I)Ljava/lang/Integer; - move-result-object v1 + move-result-object v4 - if-eqz v1, :cond_7 + if-eqz v4, :cond_7 - invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I + invoke-virtual {v4}, Ljava/lang/Integer;->intValue()I - move-result v1 + move-result v4 - move/from16 v27, v1 + move/from16 v25, v4 goto :goto_7 :cond_7 - const/16 v27, -0x1 + const/16 v25, -0x1 :goto_7 - const-string v1, "guild_id" + const-string v4, "guild_id" - invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v0, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object v1 + move-result-object v4 - check-cast v1, Ljava/lang/String; + check-cast v4, Ljava/lang/String; - if-eqz v1, :cond_8 + if-eqz v4, :cond_8 - invoke-static {v1}, Lt/a0/m;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long; + invoke-static {v4}, Lt/a0/m;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long; - move-result-object v1 + move-result-object v4 - if-eqz v1, :cond_8 + if-eqz v4, :cond_8 - invoke-virtual {v1}, Ljava/lang/Long;->longValue()J + invoke-virtual {v4}, Ljava/lang/Long;->longValue()J move-result-wide v4 - move-wide/from16 v33, v4 + move-wide/from16 v26, v4 goto :goto_8 :cond_8 - const-wide/16 v33, -0x1 + const-wide/16 v26, -0x1 :goto_8 - const-string v1, "guild_name" + const-string v4, "guild_name" - invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v0, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object v1 + move-result-object v4 - move-object/from16 v28, v1 + move-object/from16 v28, v4 check-cast v28, Ljava/lang/String; - const-string v1, "guild_icon" + const-string v4, "guild_icon" - invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v0, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object v1 + move-result-object v4 - move-object/from16 v35, v1 + move-object/from16 v31, v4 - check-cast v35, Ljava/lang/String; + check-cast v31, Ljava/lang/String; - const-string v1, "activity_type" + const-string v4, "activity_type" - invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v0, v4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object v1 + move-result-object v4 - check-cast v1, Ljava/lang/String; + check-cast v4, Ljava/lang/String; - if-eqz v1, :cond_9 + if-eqz v4, :cond_9 - invoke-static {v1, v9}, Lt/u/b/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v4, v8}, Lt/u/b/j;->checkParameterIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {v1, v8}, Lt/a0/m;->toIntOrNull(Ljava/lang/String;I)Ljava/lang/Integer; + invoke-static {v4, v2}, Lt/a0/m;->toIntOrNull(Ljava/lang/String;I)Ljava/lang/Integer; - move-result-object v1 + move-result-object v2 - if-eqz v1, :cond_9 + if-eqz v2, :cond_9 - invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I + invoke-virtual {v2}, Ljava/lang/Integer;->intValue()I - move-result v1 + move-result v2 - move/from16 v36, v1 + move/from16 v32, v2 goto :goto_9 :cond_9 - const/16 v36, -0x1 + const/16 v32, -0x1 :goto_9 - const-string v1, "activity_name" + const-string v2, "activity_name" - invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v0, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object v1 + move-result-object v2 - move-object/from16 v37, v1 + move-object/from16 v33, v2 - check-cast v37, Ljava/lang/String; + check-cast v33, Ljava/lang/String; - const-string v1, "application_id" + const-string v2, "application_id" - invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v0, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object v1 + move-result-object v2 - check-cast v1, Ljava/lang/String; + check-cast v2, Ljava/lang/String; - if-eqz v1, :cond_a + if-eqz v2, :cond_a - invoke-static {v1}, Lt/a0/m;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long; + invoke-static {v2}, Lt/a0/m;->toLongOrNull(Ljava/lang/String;)Ljava/lang/Long; - move-result-object v1 + move-result-object v2 - if-eqz v1, :cond_a + if-eqz v2, :cond_a - invoke-virtual {v1}, Ljava/lang/Long;->longValue()J + invoke-virtual {v2}, Ljava/lang/Long;->longValue()J move-result-wide v4 - move-wide/from16 v38, v4 + move-wide/from16 v34, v4 goto :goto_a :cond_a - const-wide/16 v38, -0x1 + const-wide/16 v34, -0x1 :goto_a - const-string v1, "application_name" + const-string v2, "application_name" - invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v0, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; - move-result-object v1 + move-result-object v2 - move-object/from16 v29, v1 + move-object/from16 v29, v2 check-cast v29, Ljava/lang/String; - const-string v1, "application_icon" + const-string v2, "application_icon" - invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v0, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; move-result-object v0 @@ -913,53 +820,49 @@ check-cast v30, Ljava/lang/String; - const/16 v31, 0x1 - - const/16 v32, 0x0 - - move-object/from16 v1, p0 + move-object/from16 v2, p0 move-wide v4, v6 - move v6, v11 + move v6, v1 - move-object v7, v12 + move-object v7, v10 - move v8, v13 + move v8, v11 - move-object v9, v14 + move-object v9, v12 - move-wide v10, v15 + move-wide v10, v13 - move-object/from16 v12, v19 + move-object v12, v15 - move/from16 v13, v20 + move/from16 v13, v18 - move-object/from16 v14, v21 + move-object/from16 v14, v19 - move-object/from16 v15, v22 + move-object/from16 v15, v20 - move-wide/from16 v16, v23 + move-wide/from16 v16, v21 - move-object/from16 v18, v25 + move-object/from16 v18, v23 - move-object/from16 v19, v26 + move-object/from16 v19, v24 - move/from16 v20, v27 + move/from16 v20, v25 - move-wide/from16 v21, v33 + move-wide/from16 v21, v26 move-object/from16 v23, v28 - move-object/from16 v24, v35 + move-object/from16 v24, v31 - move/from16 v25, v36 + move/from16 v25, v32 - move-object/from16 v26, v37 + move-object/from16 v26, v33 - move-wide/from16 v27, v38 + move-wide/from16 v27, v34 - invoke-direct/range {v1 .. v32}, Lcom/discord/utilities/fcm/NotificationData;->(Lcom/discord/utilities/time/Clock;Ljava/lang/String;JILjava/lang/String;ILjava/lang/String;JLjava/util/List;ILjava/lang/String;Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;IJLjava/lang/String;Ljava/lang/String;ILjava/lang/String;JLjava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + invoke-direct/range {v2 .. v30}, Lcom/discord/utilities/fcm/NotificationData;->(Ljava/lang/String;JILjava/lang/String;ILjava/lang/String;JLjava/util/List;ILjava/lang/String;Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;IJLjava/lang/String;Ljava/lang/String;ILjava/lang/String;JLjava/lang/String;Ljava/lang/String;)V return-void @@ -1271,7 +1174,7 @@ # virtual methods .method public final copyForDirectReply(Lcom/discord/models/domain/ModelMessage;)Lcom/discord/utilities/fcm/NotificationData; - .locals 35 + .locals 32 move-object/from16 v0, p0 @@ -1279,13 +1182,11 @@ if-eqz p1, :cond_2 - new-instance v34, Lcom/discord/utilities/fcm/NotificationData; - - const/4 v3, 0x0 + new-instance v31, Lcom/discord/utilities/fcm/NotificationData; invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getId()J - move-result-wide v5 + move-result-wide v4 invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getActivity()Lcom/discord/models/domain/ModelMessage$Activity; @@ -1297,14 +1198,14 @@ move-result v2 - move v7, v2 + move v6, v2 goto :goto_0 :cond_0 const/4 v2, -0x1 - const/4 v7, -0x1 + const/4 v6, -0x1 :goto_0 invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getApplication()Lcom/discord/models/domain/ModelApplication; @@ -1318,29 +1219,27 @@ move-result-object v1 :cond_1 - move-object v8, v1 + move-object v7, v1 invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getType()I - move-result v9 + move-result v8 invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getContent()Ljava/lang/String; - move-result-object v10 + move-result-object v9 invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J - move-result-wide v11 + move-result-wide v10 - sget-object v13, Lt/q/o;->d:Lt/q/o; + sget-object v12, Lt/q/o;->d:Lt/q/o; - iget v14, v0, Lcom/discord/utilities/fcm/NotificationData;->channelType:I + iget v13, v0, Lcom/discord/utilities/fcm/NotificationData;->channelType:I - iget-object v15, v0, Lcom/discord/utilities/fcm/NotificationData;->channelName:Ljava/lang/String; + iget-object v14, v0, Lcom/discord/utilities/fcm/NotificationData;->channelName:Ljava/lang/String; - iget-object v1, v0, Lcom/discord/utilities/fcm/NotificationData;->channelIcon:Ljava/lang/String; - - move-object/from16 v16, v1 + iget-object v15, v0, Lcom/discord/utilities/fcm/NotificationData;->channelIcon:Ljava/lang/String; invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser; @@ -1352,7 +1251,7 @@ invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J - move-result-wide v17 + move-result-wide v16 invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser; @@ -1362,7 +1261,7 @@ invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String; - move-result-object v19 + move-result-object v18 invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser; @@ -1372,43 +1271,39 @@ invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getAvatar()Ljava/lang/String; - move-result-object v20 + move-result-object v19 - const/16 v21, -0x1 + const/16 v20, -0x1 iget-wide v1, v0, Lcom/discord/utilities/fcm/NotificationData;->guildId:J - move-wide/from16 v22, v1 + move-wide/from16 v21, v1 iget-object v1, v0, Lcom/discord/utilities/fcm/NotificationData;->guildName:Ljava/lang/String; - move-object/from16 v24, v1 + move-object/from16 v23, v1 iget-object v1, v0, Lcom/discord/utilities/fcm/NotificationData;->guildIcon:Ljava/lang/String; - move-object/from16 v25, v1 + move-object/from16 v24, v1 - const/16 v26, -0x1 + const/16 v25, -0x1 - const/16 v27, 0x0 + const/16 v26, 0x0 - const-wide/16 v28, -0x1 + const-wide/16 v27, -0x1 + + const/16 v29, 0x0 const/16 v30, 0x0 - const/16 v31, 0x0 + const-string v3, "MESSAGE_CREATE" - const/16 v32, 0x1 + move-object/from16 v2, v31 - const/16 v33, 0x0 + invoke-direct/range {v2 .. v30}, Lcom/discord/utilities/fcm/NotificationData;->(Ljava/lang/String;JILjava/lang/String;ILjava/lang/String;JLjava/util/List;ILjava/lang/String;Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;IJLjava/lang/String;Ljava/lang/String;ILjava/lang/String;JLjava/lang/String;Ljava/lang/String;)V - const-string v4, "MESSAGE_CREATE" - - move-object/from16 v2, v34 - - invoke-direct/range {v2 .. v33}, Lcom/discord/utilities/fcm/NotificationData;->(Lcom/discord/utilities/time/Clock;Ljava/lang/String;JILjava/lang/String;ILjava/lang/String;JLjava/util/List;ILjava/lang/String;Ljava/lang/String;JLjava/lang/String;Ljava/lang/String;IJLjava/lang/String;Ljava/lang/String;ILjava/lang/String;JLjava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - - return-object v34 + return-object v31 :cond_2 const-string v2, "message" @@ -2309,7 +2204,7 @@ new-instance v1, Landroidx/core/app/NotificationCompat$Action$Builder; - const v3, 0x7f0803a0 + const v3, 0x7f0803a1 const v4, 0x7f120d05 @@ -3473,15 +3368,17 @@ return v0 .end method -.method public final getTimedMute(Landroid/content/Context;I)Landroidx/core/app/NotificationCompat$Action; - .locals 12 +.method public final getTimedMute(Landroid/content/Context;Lcom/discord/utilities/time/Clock;I)Landroidx/core/app/NotificationCompat$Action; + .locals 10 .annotation build Landroidx/annotation/RequiresApi; value = 0x18 .end annotation const/4 v0, 0x0 - if-eqz p1, :cond_2 + if-eqz p1, :cond_3 + + if-eqz p2, :cond_2 iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationData;->type:Ljava/lang/String; @@ -3497,30 +3394,28 @@ const/4 v1, 0x2 - if-ge p2, v1, :cond_0 + if-ge p3, v1, :cond_0 goto :goto_0 :cond_0 - iget-object p2, p0, Lcom/discord/utilities/fcm/NotificationData;->clock:Lcom/discord/utilities/time/Clock; - invoke-interface {p2}, Lcom/discord/utilities/time/Clock;->currentTimeMillis()J - move-result-wide v0 + move-result-wide p2 - const-wide/32 v2, 0x36ee80 + const-wide/32 v0, 0x36ee80 - add-long v10, v0, v2 + add-long v8, p2, v0 - sget-object v4, Lcom/discord/utilities/fcm/NotificationActions;->Companion:Lcom/discord/utilities/fcm/NotificationActions$Companion; + sget-object v2, Lcom/discord/utilities/fcm/NotificationActions;->Companion:Lcom/discord/utilities/fcm/NotificationActions$Companion; - iget-wide v6, p0, Lcom/discord/utilities/fcm/NotificationData;->guildId:J + iget-wide v4, p0, Lcom/discord/utilities/fcm/NotificationData;->guildId:J - iget-wide v8, p0, Lcom/discord/utilities/fcm/NotificationData;->channelId:J + iget-wide v6, p0, Lcom/discord/utilities/fcm/NotificationData;->channelId:J - move-object v5, p1 + move-object v3, p1 - invoke-virtual/range {v4 .. v11}, Lcom/discord/utilities/fcm/NotificationActions$Companion;->timedMute(Landroid/content/Context;JJJ)Landroid/content/Intent; + invoke-virtual/range {v2 .. v9}, Lcom/discord/utilities/fcm/NotificationActions$Companion;->timedMute(Landroid/content/Context;JJJ)Landroid/content/Intent; move-result-object p2 @@ -3528,25 +3423,25 @@ move-result-object p2 - const/4 v0, 0x0 + const/4 p3, 0x0 - invoke-static {p1, v0, p2, v0}, Landroid/app/PendingIntent;->getBroadcast(Landroid/content/Context;ILandroid/content/Intent;I)Landroid/app/PendingIntent; + invoke-static {p1, p3, p2, p3}, Landroid/app/PendingIntent;->getBroadcast(Landroid/content/Context;ILandroid/content/Intent;I)Landroid/app/PendingIntent; move-result-object p2 - new-instance v0, Landroidx/core/app/NotificationCompat$Action$Builder; + new-instance p3, Landroidx/core/app/NotificationCompat$Action$Builder; - const v1, 0x7f080344 + const v0, 0x7f080344 - const v2, 0x7f120d02 + const v1, 0x7f120d02 - invoke-virtual {p1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String; + invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; move-result-object p1 - invoke-direct {v0, v1, p1, p2}, Landroidx/core/app/NotificationCompat$Action$Builder;->(ILjava/lang/CharSequence;Landroid/app/PendingIntent;)V + invoke-direct {p3, v0, p1, p2}, Landroidx/core/app/NotificationCompat$Action$Builder;->(ILjava/lang/CharSequence;Landroid/app/PendingIntent;)V - invoke-virtual {v0}, Landroidx/core/app/NotificationCompat$Action$Builder;->build()Landroidx/core/app/NotificationCompat$Action; + invoke-virtual {p3}, Landroidx/core/app/NotificationCompat$Action$Builder;->build()Landroidx/core/app/NotificationCompat$Action; move-result-object p1 @@ -3557,6 +3452,13 @@ return-object v0 :cond_2 + const-string p1, "clock" + + invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V + + throw v0 + + :cond_3 const-string p1, "ctx" invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali index 2a23e418e8..d2c7c2efe8 100644 --- a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali +++ b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali @@ -380,11 +380,15 @@ const/4 v3, 0x2 + invoke-static {}, Lcom/discord/utilities/time/ClockFactory;->get()Lcom/discord/utilities/time/Clock; + + move-result-object v5 + invoke-interface {v11}, Ljava/util/List;->size()I - move-result v5 + move-result v6 - invoke-virtual {v8, v7, v5}, Lcom/discord/utilities/fcm/NotificationData;->getTimedMute(Landroid/content/Context;I)Landroidx/core/app/NotificationCompat$Action; + invoke-virtual {v8, v7, v5, v6}, Lcom/discord/utilities/fcm/NotificationData;->getTimedMute(Landroid/content/Context;Lcom/discord/utilities/time/Clock;I)Landroidx/core/app/NotificationCompat$Action; move-result-object v5 diff --git a/com.discord/smali/com/discord/utilities/icon/IconUtils.smali b/com.discord/smali/com/discord/utilities/icon/IconUtils.smali index 034c32ea4e..5b2d8afa99 100644 --- a/com.discord/smali/com/discord/utilities/icon/IconUtils.smali +++ b/com.discord/smali/com/discord/utilities/icon/IconUtils.smali @@ -2822,7 +2822,7 @@ if-eqz p1, :cond_1 - const p1, 0x7f08041e + const p1, 0x7f08041f goto/16 :goto_3 @@ -2835,7 +2835,7 @@ if-eqz p1, :cond_1 - const p1, 0x7f08042b + const p1, 0x7f08042c goto/16 :goto_3 @@ -2848,7 +2848,7 @@ if-eqz p1, :cond_1 - const p1, 0x7f08042e + const p1, 0x7f08042f goto/16 :goto_3 @@ -2883,7 +2883,7 @@ if-eqz p1, :cond_1 - const p1, 0x7f080427 + const p1, 0x7f080428 goto/16 :goto_3 @@ -2896,7 +2896,7 @@ if-eqz p1, :cond_1 - const p1, 0x7f08041a + const p1, 0x7f08041b goto :goto_3 @@ -2909,7 +2909,7 @@ if-eqz p1, :cond_1 - const p1, 0x7f080433 + const p1, 0x7f080434 goto :goto_3 @@ -2922,7 +2922,7 @@ if-eqz p1, :cond_1 - const p1, 0x7f080426 + const p1, 0x7f080427 goto :goto_3 @@ -2935,7 +2935,7 @@ if-eqz p1, :cond_1 - const p1, 0x7f080431 + const p1, 0x7f080432 goto :goto_3 @@ -2970,7 +2970,7 @@ if-eqz p1, :cond_1 - const p1, 0x7f080434 + const p1, 0x7f080435 goto :goto_3 @@ -2984,7 +2984,7 @@ if-eqz p1, :cond_1 :goto_0 - const p1, 0x7f080421 + const p1, 0x7f080422 goto :goto_3 @@ -2998,13 +2998,13 @@ if-eqz p1, :cond_1 :goto_1 - const p1, 0x7f080423 + const p1, 0x7f080424 goto :goto_3 :cond_1 :goto_2 - const p1, 0x7f080439 + const p1, 0x7f08043a :goto_3 return p1 diff --git a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmap$1$1.smali b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmap$1$1.smali index e25cc8d6fb..16966aa9ed 100644 --- a/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmap$1$1.smali +++ b/com.discord/smali/com/discord/utilities/images/MGImagesBitmap$getBitmap$1$1.smali @@ -54,17 +54,29 @@ } .end annotation - iget-object p1, p0, Lcom/discord/utilities/images/MGImagesBitmap$getBitmap$1$1;->$emitter:Lrx/Subscriber; + iget-object v0, p0, Lcom/discord/utilities/images/MGImagesBitmap$getBitmap$1$1;->$emitter:Lrx/Subscriber; - new-instance v0, Lcom/discord/utilities/images/MGImagesBitmap$DecodeException; + if-eqz p1, :cond_0 + + invoke-interface {p1}, Lcom/facebook/datasource/DataSource;->d()Ljava/lang/Throwable; + + move-result-object p1 + + if-eqz p1, :cond_0 + + goto :goto_0 + + :cond_0 + new-instance p1, Lcom/discord/utilities/images/MGImagesBitmap$DecodeException; iget-object v1, p0, Lcom/discord/utilities/images/MGImagesBitmap$getBitmap$1$1;->this$0:Lcom/discord/utilities/images/MGImagesBitmap$getBitmap$1; iget-object v1, v1, Lcom/discord/utilities/images/MGImagesBitmap$getBitmap$1;->$imageUri:Ljava/lang/String; - invoke-direct {v0, v1}, Lcom/discord/utilities/images/MGImagesBitmap$DecodeException;->(Ljava/lang/String;)V + invoke-direct {p1, v1}, Lcom/discord/utilities/images/MGImagesBitmap$DecodeException;->(Ljava/lang/String;)V - invoke-interface {p1, v0}, Lb0/g;->onError(Ljava/lang/Throwable;)V + :goto_0 + invoke-interface {v0, p1}, Lb0/g;->onError(Ljava/lang/Throwable;)V return-void .end method diff --git a/com.discord/smali/com/discord/utilities/platform/Platform.smali b/com.discord/smali/com/discord/utilities/platform/Platform.smali index 90a113a37f..eb9b762e78 100644 --- a/com.discord/smali/com/discord/utilities/platform/Platform.smali +++ b/com.discord/smali/com/discord/utilities/platform/Platform.smali @@ -99,7 +99,7 @@ move-result-object v6 - const v1, 0x7f080416 + const v1, 0x7f080417 invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -113,11 +113,11 @@ const/4 v8, 0x0 - const/4 v9, 0x0 + const/4 v9, 0x1 const/4 v10, 0x1 - const/16 v11, 0x30 + const/16 v11, 0x10 const/4 v12, 0x0 @@ -367,7 +367,7 @@ move-result-object v8 - const v2, 0x7f08038e + const v2, 0x7f08038f invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -437,7 +437,7 @@ move-result-object v8 - const v2, 0x7f0803ac + const v2, 0x7f0803ad invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -449,11 +449,9 @@ const-string v6, "Skype" - const/4 v10, 0x1 - const/4 v11, 0x0 - const/16 v13, 0x60 + const/16 v13, 0x70 move-object v3, v1 @@ -479,7 +477,7 @@ move-result-object v8 - const v2, 0x7f0803b5 + const v2, 0x7f0803b6 invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -491,8 +489,6 @@ const-string v6, "Spotify" - const/4 v10, 0x0 - const/4 v11, 0x1 const/4 v12, 0x1 @@ -523,7 +519,7 @@ move-result-object v8 - const v2, 0x7f0803bd + const v2, 0x7f0803be invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -563,7 +559,7 @@ move-result-object v8 - const v2, 0x7f0803d8 + const v2, 0x7f0803d9 invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -599,7 +595,7 @@ move-result-object v8 - const v2, 0x7f0803da + const v2, 0x7f0803db invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -667,7 +663,7 @@ move-result-object v8 - const v2, 0x7f080417 + const v2, 0x7f080418 invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; 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 5db1c5cbd3..db01ea5d6b 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/1020" + const-string v0, "Discord-Android/1021" return-object v0 .end method diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPI.smali b/com.discord/smali/com/discord/utilities/rest/RestAPI.smali index b0599b2716..07f0f51671 100644 --- a/com.discord/smali/com/discord/utilities/rest/RestAPI.smali +++ b/com.discord/smali/com/discord/utilities/rest/RestAPI.smali @@ -4223,6 +4223,30 @@ return-object v0 .end method +.method public getUserAffinities()Lrx/Observable; + .locals 1 + .annotation runtime La0/v/e; + value = "users/@me/affinities/users" + .end annotation + + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Lrx/Observable<", + "Lcom/discord/models/domain/ModelUserAffinities;", + ">;" + } + .end annotation + + iget-object v0, p0, Lcom/discord/utilities/rest/RestAPI;->_api:Lcom/discord/restapi/RestAPIInterface; + + invoke-interface {v0}, Lcom/discord/restapi/RestAPIInterface;->getUserAffinities()Lrx/Observable; + + move-result-object v0 + + return-object v0 +.end method + .method public getVanityUrl(J)Lrx/Observable; .locals 1 .param p1 # J diff --git a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService.smali b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService.smali index 1db3dff5e6..5a2e488766 100644 --- a/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService.smali +++ b/com.discord/smali/com/discord/utilities/voice/DiscordOverlayService.smali @@ -317,7 +317,7 @@ move-result-object v1 - const v2, 0x7f0803a5 + const v2, 0x7f0803a6 invoke-virtual {p1, v2, v1, v0}, Landroidx/core/app/NotificationCompat$Builder;->addAction(ILjava/lang/CharSequence;Landroid/app/PendingIntent;)Landroidx/core/app/NotificationCompat$Builder; diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Actions.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Actions.smali index 9148c261a6..d916b21a59 100644 --- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Actions.smali +++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Actions.smali @@ -89,44 +89,7 @@ # virtual methods -.method public final setProximityLock(Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;Z)V - .locals 2 - - if-eqz p1, :cond_0 - - invoke-virtual {p1}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;->getContext()Landroid/content/Context; - - move-result-object p1 - - new-instance v0, Landroid/content/Intent; - - const-class v1, Lcom/discord/utilities/voice/VoiceEngineForegroundService; - - invoke-direct {v0, p1, v1}, Landroid/content/Intent;->(Landroid/content/Context;Ljava/lang/Class;)V - - const-string v1, "com.discord.utilities.voice.action.set_proximity_lock" - - invoke-virtual {v0, v1}, Landroid/content/Intent;->setAction(Ljava/lang/String;)Landroid/content/Intent; - - const-string v1, "com.discord.utilities.voice.extra.proximity_lock_enabled" - - invoke-virtual {v0, v1, p2}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Z)Landroid/content/Intent; - - invoke-virtual {p1, v0}, Landroid/content/Context;->startService(Landroid/content/Intent;)Landroid/content/ComponentName; - - return-void - - :cond_0 - const-string p1, "connection" - - invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V - - const/4 p1, 0x0 - - throw p1 -.end method - -.method public final startForegroundAndBind(Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;Ljava/lang/String;Ljava/lang/String;ZZ)V +.method public final startForegroundAndBind(Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;Ljava/lang/String;Ljava/lang/String;ZZZ)V .locals 3 const/4 v0, 0x0 @@ -168,6 +131,10 @@ invoke-virtual {v1, p2, p5}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Z)Landroid/content/Intent; + const-string p2, "com.discord.utilities.voice.extra.proximity_lock_enabled" + + invoke-virtual {v1, p2, p6}, Landroid/content/Intent;->putExtra(Ljava/lang/String;Z)Landroid/content/Intent; + invoke-virtual {v0, v1}, Landroid/content/Context;->startService(Landroid/content/Intent;)Landroid/content/ComponentName; invoke-virtual {p1}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$Connection;->getContext()Landroid/content/Context; diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$ACTION$Companion.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$ACTION$Companion.smali index 5c1d095fce..d85a861aa6 100644 --- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$ACTION$Companion.smali +++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$ACTION$Companion.smali @@ -21,8 +21,6 @@ .field public static final MAIN_ACTION:Ljava/lang/String; = "com.discord.utilities.voice.action.main" -.field public static final SET_PROXIMITY_LOCK:Ljava/lang/String; = "com.discord.utilities.voice.action.set_proximity_lock" - .field public static final START_FOREGROUND:Ljava/lang/String; = "com.discord.utilities.voice.action.start_foreground" .field public static final STOP_SERVICE:Ljava/lang/String; = "com.discord.utilities.voice.action.stop" diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$ACTION.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$ACTION.smali index 1f2c73aa0e..eee7b55670 100644 --- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$ACTION.smali +++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$Constants$ACTION.smali @@ -27,8 +27,6 @@ .field public static final MAIN_ACTION:Ljava/lang/String; = "com.discord.utilities.voice.action.main" -.field public static final SET_PROXIMITY_LOCK:Ljava/lang/String; = "com.discord.utilities.voice.action.set_proximity_lock" - .field public static final START_FOREGROUND:Ljava/lang/String; = "com.discord.utilities.voice.action.start_foreground" .field public static final STOP_SERVICE:Ljava/lang/String; = "com.discord.utilities.voice.action.stop" diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService.smali index 2a2521ea81..67fdfd7e30 100644 --- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService.smali +++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService.smali @@ -400,9 +400,19 @@ invoke-virtual {v1}, Lcom/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder;->build()Landroid/app/Notification; - move-result-object p1 + move-result-object v1 - invoke-virtual {p0, v0, p1}, Landroid/app/IntentService;->startForeground(ILandroid/app/Notification;)V + invoke-virtual {p0, v0, v1}, Landroid/app/IntentService;->startForeground(ILandroid/app/Notification;)V + + const/4 v0, 0x0 + + const-string v1, "com.discord.utilities.voice.extra.proximity_lock_enabled" + + invoke-virtual {p1, v1, v0}, Landroid/content/Intent;->getBooleanExtra(Ljava/lang/String;Z)Z + + move-result p1 + + invoke-direct {p0, p1}, Lcom/discord/utilities/voice/VoiceEngineForegroundService;->setProximityLock(Z)V goto :goto_0 @@ -453,36 +463,12 @@ invoke-interface {p1}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object; - goto :goto_0 - - :sswitch_5 - const-string v1, "com.discord.utilities.voice.action.set_proximity_lock" - - invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z - - move-result v0 - - if-eqz v0, :cond_0 - - const/4 v0, 0x0 - - const-string v1, "com.discord.utilities.voice.extra.proximity_lock_enabled" - - invoke-virtual {p1, v1, v0}, Landroid/content/Intent;->getBooleanExtra(Ljava/lang/String;Z)Z - - move-result p1 - - invoke-direct {p0, p1}, Lcom/discord/utilities/voice/VoiceEngineForegroundService;->setProximityLock(Z)V - :cond_0 :goto_0 return-void - nop - :sswitch_data_0 .sparse-switch - -0x7c6ce4ef -> :sswitch_5 -0x78b14b10 -> :sswitch_4 -0x593bf795 -> :sswitch_3 -0x29e659bb -> :sswitch_2 diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceViewUtils.smali b/com.discord/smali/com/discord/utilities/voice/VoiceViewUtils.smali index 4bb8405771..e79be17b3c 100644 --- a/com.discord/smali/com/discord/utilities/voice/VoiceViewUtils.smali +++ b/com.discord/smali/com/discord/utilities/voice/VoiceViewUtils.smali @@ -406,7 +406,7 @@ .annotation build Landroidx/annotation/DrawableRes; .end annotation - const v0, 0x7f080408 + const v0, 0x7f080409 if-nez p1, :cond_0 @@ -438,17 +438,17 @@ goto :goto_0 :cond_1 - const v0, 0x7f080407 + const v0, 0x7f080408 goto :goto_0 :cond_2 - const v0, 0x7f080405 + const v0, 0x7f080406 goto :goto_0 :cond_3 - const v0, 0x7f080406 + const v0, 0x7f080407 :goto_0 return v0 diff --git a/com.discord/smali/com/discord/utils/R$c.smali b/com.discord/smali/com/discord/utils/R$c.smali index b79f97e69b..a795e917aa 100644 --- a/com.discord/smali/com/discord/utils/R$c.smali +++ b/com.discord/smali/com/discord/utils/R$c.smali @@ -291,57 +291,57 @@ .field public static final ic_mtrl_chip_close_circle:I = 0x7f08032e -.field public static final mtrl_dialog_background:I = 0x7f0804a8 +.field public static final mtrl_dialog_background:I = 0x7f0804a9 -.field public static final mtrl_dropdown_arrow:I = 0x7f0804a9 +.field public static final mtrl_dropdown_arrow:I = 0x7f0804aa -.field public static final mtrl_ic_arrow_drop_down:I = 0x7f0804aa +.field public static final mtrl_ic_arrow_drop_down:I = 0x7f0804ab -.field public static final mtrl_ic_arrow_drop_up:I = 0x7f0804ab +.field public static final mtrl_ic_arrow_drop_up:I = 0x7f0804ac -.field public static final mtrl_ic_cancel:I = 0x7f0804ac +.field public static final mtrl_ic_cancel:I = 0x7f0804ad -.field public static final mtrl_ic_error:I = 0x7f0804ad +.field public static final mtrl_ic_error:I = 0x7f0804ae -.field public static final mtrl_popupmenu_background:I = 0x7f0804ae +.field public static final mtrl_popupmenu_background:I = 0x7f0804af -.field public static final mtrl_popupmenu_background_dark:I = 0x7f0804af +.field public static final mtrl_popupmenu_background_dark:I = 0x7f0804b0 -.field public static final mtrl_tabs_default_indicator:I = 0x7f0804b0 +.field public static final mtrl_tabs_default_indicator:I = 0x7f0804b1 -.field public static final navigation_empty_icon:I = 0x7f0804b1 +.field public static final navigation_empty_icon:I = 0x7f0804b2 -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be -.field public static final preference_list_divider_material:I = 0x7f0804be +.field public static final preference_list_divider_material:I = 0x7f0804bf -.field public static final test_custom_background:I = 0x7f0804cb +.field public static final test_custom_background:I = 0x7f0804cc -.field public static final tooltip_frame_dark:I = 0x7f0804cc +.field public static final tooltip_frame_dark:I = 0x7f0804cd -.field public static final tooltip_frame_light:I = 0x7f0804cd +.field public static final tooltip_frame_light:I = 0x7f0804ce # direct methods diff --git a/com.discord/smali/com/discord/views/ActiveSubscriptionView$HeaderImage.smali b/com.discord/smali/com/discord/views/ActiveSubscriptionView$HeaderImage.smali index 793e0883f0..d1e517cb2d 100644 --- a/com.discord/smali/com/discord/views/ActiveSubscriptionView$HeaderImage.smali +++ b/com.discord/smali/com/discord/views/ActiveSubscriptionView$HeaderImage.smali @@ -52,7 +52,7 @@ const-string v3, "MECH_WUMPUS" - const v4, 0x7f0804a4 + const v4, 0x7f0804a5 const/high16 v5, -0x40800000 # -1.0f @@ -68,7 +68,7 @@ const/4 v8, 0x1 - const v9, 0x7f0804a5 + const v9, 0x7f0804a6 const/4 v10, 0x0 @@ -90,7 +90,7 @@ const/4 v5, 0x2 - const v6, 0x7f08047f + const v6, 0x7f080480 const/4 v7, 0x0 diff --git a/com.discord/smali/com/discord/views/StatusView.smali b/com.discord/smali/com/discord/views/StatusView.smali index 4371dd6a26..6321407dbf 100644 --- a/com.discord/smali/com/discord/views/StatusView.smali +++ b/com.discord/smali/com/discord/views/StatusView.smali @@ -385,7 +385,7 @@ :goto_0 if-eqz v2, :cond_2 - const v0, 0x7f0803bc + const v0, 0x7f0803bd goto :goto_2 @@ -421,22 +421,22 @@ if-eq v0, v2, :cond_5 :goto_1 - const v0, 0x7f0803ba + const v0, 0x7f0803bb goto :goto_2 :cond_5 - const v0, 0x7f0803b8 - - goto :goto_2 - - :cond_6 const v0, 0x7f0803b9 goto :goto_2 + :cond_6 + const v0, 0x7f0803ba + + goto :goto_2 + :cond_7 - const v0, 0x7f0803bb + const v0, 0x7f0803bc :goto_2 invoke-virtual {p0, v0}, Landroidx/appcompat/widget/AppCompatImageView;->setImageResource(I)V diff --git a/com.discord/smali/com/discord/views/premiumguild/PremiumSubscriptionMarketingView.smali b/com.discord/smali/com/discord/views/premiumguild/PremiumSubscriptionMarketingView.smali index 0b26722bd4..2708621458 100644 --- a/com.discord/smali/com/discord/views/premiumguild/PremiumSubscriptionMarketingView.smali +++ b/com.discord/smali/com/discord/views/premiumguild/PremiumSubscriptionMarketingView.smali @@ -267,7 +267,7 @@ # virtual methods .method public final a(ILkotlin/jvm/functions/Function0;)V - .locals 18 + .locals 13 .annotation system Ldalvik/annotation/Signature; value = { "(I", @@ -277,23 +277,43 @@ } .end annotation - move-object/from16 v0, p0 + if-eqz p2, :cond_3 - move/from16 v1, p1 + invoke-virtual {p0}, Landroid/widget/FrameLayout;->getResources()Landroid/content/res/Resources; - move-object/from16 v2, p2 + move-result-object v0 - if-eqz v2, :cond_3 + const v1, 0x7f100078 - iget-object v3, v0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->d:Landroid/widget/TextView; + const/4 v2, 0x1 - const/4 v4, 0x1 + new-array v3, v2, [Ljava/lang/Object; - new-array v5, v4, [Ljava/lang/Object; + const/4 v4, 0x2 + + invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + + move-result-object v5 + + const/4 v6, 0x0 + + aput-object v5, v3, v6 + + invoke-virtual {v0, v1, v4, v3}, Landroid/content/res/Resources;->getQuantityString(II[Ljava/lang/Object;)Ljava/lang/String; + + move-result-object v0 + + const-string v1, "resources.getQuantityStr\u2026PTIONS_WITH_PREMIUM\n )" + + invoke-static {v0, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + iget-object v1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->d:Landroid/widget/TextView; + + new-array v3, v2, [Ljava/lang/Object; invoke-static {}, Ljava/text/NumberFormat;->getPercentInstance()Ljava/text/NumberFormat; - move-result-object v6 + move-result-object v5 const v7, 0x3e99999a # 0.3f @@ -301,204 +321,192 @@ move-result-object v8 - invoke-virtual {v6, v8}, Ljava/text/NumberFormat;->format(Ljava/lang/Object;)Ljava/lang/String; + invoke-virtual {v5, v8}, Ljava/text/NumberFormat;->format(Ljava/lang/Object;)Ljava/lang/String; - move-result-object v6 + move-result-object v5 const-string v8, "NumberFormat.getPercentI\u2026ISCOUNT_PERCENT\n )" - invoke-static {v6, v8}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v5, v8}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - const/4 v9, 0x0 + aput-object v5, v3, v6 - aput-object v6, v5, v9 + const v5, 0x7f12097c - const v6, 0x7f12097c + invoke-static {p0, v5, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String; - invoke-static {v0, v6, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String; + move-result-object v3 - move-result-object v5 + invoke-virtual {v1, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V - invoke-virtual {v3, v5}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + iget-object v1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->e:Landroid/widget/TextView; - iget-object v3, v0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->e:Landroid/widget/TextView; + const v3, 0x7f12097e - const v5, 0x7f12097e + new-array v9, v2, [Ljava/lang/Object; - new-array v10, v4, [Ljava/lang/Object; + aput-object v0, v9, v6 - const/4 v11, 0x2 + invoke-static {p0, v3, v9}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String; - invoke-static {v11}, Ljava/lang/String;->valueOf(I)Ljava/lang/String; + move-result-object v3 - move-result-object v12 + invoke-virtual {v1, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V - aput-object v12, v10, v9 + iget-object v1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->f:Landroid/widget/TextView; - invoke-static {v0, v5, v10}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String; - - move-result-object v5 - - invoke-virtual {v3, v5}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V - - iget-object v3, v0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->f:Landroid/widget/TextView; - - new-array v5, v4, [Ljava/lang/Object; + new-array v3, v2, [Ljava/lang/Object; invoke-static {}, Ljava/text/NumberFormat;->getPercentInstance()Ljava/text/NumberFormat; - move-result-object v10 + move-result-object v9 invoke-static {v7}, Ljava/lang/Float;->valueOf(F)Ljava/lang/Float; move-result-object v7 - invoke-virtual {v10, v7}, Ljava/text/NumberFormat;->format(Ljava/lang/Object;)Ljava/lang/String; + invoke-virtual {v9, v7}, Ljava/text/NumberFormat;->format(Ljava/lang/Object;)Ljava/lang/String; move-result-object v7 invoke-static {v7, v8}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - aput-object v7, v5, v9 + aput-object v7, v3, v6 - invoke-static {v0, v6, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String; + invoke-static {p0, v5, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String; - move-result-object v5 + move-result-object v3 - invoke-virtual {v3, v5}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + invoke-virtual {v1, v3}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V - iget-object v3, v0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->g:Landroid/widget/TextView; + iget-object v1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->g:Landroid/widget/TextView; - const v5, 0x7f12097d + const v3, 0x7f12097d - new-array v6, v4, [Ljava/lang/Object; + new-array v5, v2, [Ljava/lang/Object; - invoke-static {v11}, Ljava/lang/String;->valueOf(I)Ljava/lang/String; + aput-object v0, v5, v6 - move-result-object v7 + invoke-static {p0, v3, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String; - aput-object v7, v6, v9 + move-result-object v0 - invoke-static {v0, v5, v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String; + invoke-virtual {v1, v0}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V - move-result-object v5 + iget-object v0, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->h:Landroid/view/View; - invoke-virtual {v3, v5}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + new-instance v1, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView$a; - iget-object v3, v0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->h:Landroid/view/View; + invoke-direct {v1, p2}, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView$a;->(Lkotlin/jvm/functions/Function0;)V - new-instance v5, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView$a; + invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V - invoke-direct {v5, v2}, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView$a;->(Lkotlin/jvm/functions/Function0;)V + const/16 p2, 0x8 - invoke-virtual {v3, v5}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V + if-eqz p1, :cond_2 - const/16 v2, 0x8 + if-eq p1, v2, :cond_1 - if-eqz v1, :cond_2 + if-eq p1, v4, :cond_0 - if-eq v1, v4, :cond_1 + sget-object v7, Lcom/discord/app/AppLog;->c:Lcom/discord/app/AppLog; - if-eq v1, v11, :cond_0 + const-string p2, "Loaded PremiumUpsellView with invalid user premium tier: " - sget-object v12, Lcom/discord/app/AppLog;->c:Lcom/discord/app/AppLog; + invoke-static {p2, p1}, Le/e/b/a/a;->a(Ljava/lang/String;I)Ljava/lang/String; - const-string v2, "Loaded PremiumUpsellView with invalid user premium tier: " + move-result-object v8 - invoke-static {v2, v1}, Le/e/b/a/a;->a(Ljava/lang/String;I)Ljava/lang/String; + const/4 v9, 0x0 - move-result-object v13 + const/4 v10, 0x0 - const/4 v14, 0x0 + const/4 v11, 0x6 - const/4 v15, 0x0 + const/4 v12, 0x0 - const/16 v16, 0x6 - - const/16 v17, 0x0 - - invoke-static/range {v12 .. v17}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V + invoke-static/range {v7 .. v12}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V goto :goto_0 :cond_0 - iget-object v1, v0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->i:Landroid/view/View; + iget-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->i:Landroid/view/View; - invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V + invoke-virtual {p1, p2}, Landroid/view/View;->setVisibility(I)V goto :goto_0 :cond_1 - iget-object v1, v0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->i:Landroid/view/View; + iget-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->i:Landroid/view/View; - invoke-virtual {v1, v9}, Landroid/view/View;->setVisibility(I)V + invoke-virtual {p1, v6}, Landroid/view/View;->setVisibility(I)V - iget-object v1, v0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->j:Landroid/view/View; + iget-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->j:Landroid/view/View; - invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V + invoke-virtual {p1, p2}, Landroid/view/View;->setVisibility(I)V - iget-object v1, v0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->k:Landroid/widget/TextView; + iget-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->k:Landroid/widget/TextView; - const v2, 0x7f120981 + const p2, 0x7f120981 - invoke-static {v0, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String; + invoke-static {p0, p2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String; - move-result-object v2 + move-result-object p2 - invoke-static {v1, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V + invoke-static {p1, p2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V - iget-object v1, v0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->l:Landroid/widget/TextView; + iget-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->l:Landroid/widget/TextView; - const v2, 0x7f120982 + const p2, 0x7f120982 - new-array v3, v4, [Ljava/lang/Object; + new-array v0, v2, [Ljava/lang/Object; - invoke-static {v11}, Ljava/lang/String;->valueOf(I)Ljava/lang/String; + invoke-static {v4}, Ljava/lang/String;->valueOf(I)Ljava/lang/String; - move-result-object v4 + move-result-object v1 - aput-object v4, v3, v9 + aput-object v1, v0, v6 - invoke-static {v0, v2, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String; + invoke-static {p0, p2, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String; - move-result-object v2 + move-result-object p2 - invoke-static {v1, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V + invoke-static {p1, p2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V goto :goto_0 :cond_2 - iget-object v1, v0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->i:Landroid/view/View; + iget-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->i:Landroid/view/View; - invoke-virtual {v1, v9}, Landroid/view/View;->setVisibility(I)V + invoke-virtual {p1, v6}, Landroid/view/View;->setVisibility(I)V - iget-object v1, v0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->j:Landroid/view/View; + iget-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->j:Landroid/view/View; - invoke-virtual {v1, v9}, Landroid/view/View;->setVisibility(I)V + invoke-virtual {p1, v6}, Landroid/view/View;->setVisibility(I)V - iget-object v1, v0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->k:Landroid/widget/TextView; + iget-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->k:Landroid/widget/TextView; - const v3, 0x7f120980 + const v0, 0x7f120980 - invoke-static {v0, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String; + invoke-static {p0, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String; - move-result-object v3 + move-result-object v0 - invoke-static {v1, v3}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V + invoke-static {p1, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setTextAndVisibilityBy(Landroid/widget/TextView;Ljava/lang/CharSequence;)V - iget-object v1, v0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->l:Landroid/widget/TextView; + iget-object p1, p0, Lcom/discord/views/premiumguild/PremiumSubscriptionMarketingView;->l:Landroid/widget/TextView; - invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V + invoke-virtual {p1, p2}, Landroid/view/View;->setVisibility(I)V :goto_0 return-void :cond_3 - const-string v1, "onlearnMoreClickCallback" + const-string p1, "onlearnMoreClickCallback" - invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V + invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V - const/4 v1, 0x0 + const/4 p1, 0x0 - throw v1 + throw p1 .end method diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali index 39ad7f0457..3d3d08549b 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali @@ -676,12 +676,12 @@ if-eqz v3, :cond_2 - const v3, 0x7f0803f9 + const v3, 0x7f0803fa goto/16 :goto_0 :cond_2 - const v3, 0x7f0803fa + const v3, 0x7f0803fb goto/16 :goto_0 diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice.smali index 50039533dd..4b4a835c0f 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelVoice.smali @@ -312,7 +312,7 @@ if-eqz p2, :cond_0 - const p2, 0x7f080404 + const p2, 0x7f080405 goto :goto_0 diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali index bbfb2e7ac5..169cba96e7 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali @@ -169,13 +169,13 @@ goto :goto_0 :cond_0 - const p1, 0x7f0803b7 + const p1, 0x7f0803b8 goto :goto_1 :cond_1 :goto_0 - const p1, 0x7f0803bf + const p1, 0x7f0803c0 goto :goto_1 diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali index 08f155762d..c101a3f0a2 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali @@ -629,7 +629,7 @@ const p1, 0x7f040288 - const v2, 0x7f080491 + const v2, 0x7f080492 invoke-static {v0, p1, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/content/Context;II)I @@ -1039,7 +1039,7 @@ const v3, 0x7f0401d5 - const v12, 0x7f080482 + const v12, 0x7f080483 invoke-static {v2, v3, v12}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/content/Context;II)I diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali index 0f55378365..9f3a5d47b7 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali @@ -628,7 +628,7 @@ move-result-object v3 - const v5, 0x7f0804a1 + const v5, 0x7f0804a2 invoke-virtual {v3, v5}, Lcom/facebook/drawee/view/SimpleDraweeView;->setActualImageResource(I)V diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage.smali index 8e451c1ce5..b37f5189ba 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage.smali @@ -182,7 +182,7 @@ const v1, 0x7f0802b9 - const v2, 0x7f0803f0 + const v2, 0x7f0803f1 packed-switch p1, :pswitch_data_0 @@ -190,7 +190,7 @@ goto :goto_0 :pswitch_1 - const v0, 0x7f0803f0 + const v0, 0x7f0803f1 goto :goto_0 diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$14.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$14.smali index e8d7b6b5a8..5ea5e07656 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$14.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$14.smali @@ -45,6 +45,14 @@ invoke-virtual {p1}, Lcom/discord/app/AppBottomSheet;->dismiss()V + iget-object p1, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$14;->$data:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model; + + invoke-virtual {p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->getChannel()Lcom/discord/models/domain/ModelChannel; + + move-result-object p1 + + if-eqz p1, :cond_0 + iget-object p1, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$14;->this$0:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions; iget-object v0, p0, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$14;->$data:Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model; @@ -61,5 +69,6 @@ invoke-static {p1, v0, v1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->access$quoteMessage(Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;Lcom/discord/models/domain/ModelMessage;Lcom/discord/models/domain/ModelChannel;)V + :cond_0 return-void .end method diff --git a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions.smali b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions.smali index afaf97b836..03d1732e71 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/actions/WidgetChatListActions.smali @@ -1263,21 +1263,21 @@ move-result-object v0 - new-instance v2, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$12; + new-instance v3, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$12; - invoke-direct {v2, p0, p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$12;->(Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;)V + invoke-direct {v3, p0, p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$12;->(Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;)V - invoke-virtual {v0, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V + invoke-virtual {v0, v3}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V invoke-direct {p0}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->getChatActionsHeader()Landroid/view/View; move-result-object v0 - new-instance v2, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$13; + new-instance v3, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$13; - invoke-direct {v2, p0, p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$13;->(Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;)V + invoke-direct {v3, p0, p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$configureUI$13;->(Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;)V - invoke-virtual {v0, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V + invoke-virtual {v0, v3}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V invoke-virtual {p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->getChannel()Lcom/discord/models/domain/ModelChannel; @@ -1285,27 +1285,63 @@ if-eqz v0, :cond_9 - invoke-direct {p0}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->getChatActionsQuote()Landroid/view/View; + invoke-virtual {p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->getMessage()Lcom/discord/models/domain/ModelMessage; move-result-object v0 + invoke-virtual {v0}, Lcom/discord/models/domain/ModelMessage;->getContent()Ljava/lang/String; + + move-result-object v0 + + const-string v3, "data.message.content" + + invoke-static {v0, v3}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-interface {v0}, Ljava/lang/CharSequence;->length()I + + move-result v0 + + if-lez v0, :cond_8 + + const/4 v0, 0x1 + + goto :goto_5 + + :cond_8 + const/4 v0, 0x0 + + :goto_5 + if-eqz v0, :cond_9 + invoke-virtual {p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->getChannel()Lcom/discord/models/domain/ModelChannel; - move-result-object v2 + move-result-object v0 invoke-virtual {p1}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions$Model;->getPermissions()Ljava/lang/Integer; move-result-object v3 - invoke-static {v2, v3}, Lcom/discord/utilities/permissions/PermissionUtils;->hasAccessWrite(Lcom/discord/models/domain/ModelChannel;Ljava/lang/Integer;)Z + invoke-static {v0, v3}, Lcom/discord/utilities/permissions/PermissionUtils;->hasAccessWrite(Lcom/discord/models/domain/ModelChannel;Ljava/lang/Integer;)Z - move-result v2 + move-result v0 - if-eqz v2, :cond_8 + if-eqz v0, :cond_9 + + goto :goto_6 + + :cond_9 + const/4 v2, 0x0 + + :goto_6 + invoke-direct {p0}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->getChatActionsQuote()Landroid/view/View; + + move-result-object v0 + + if-eqz v2, :cond_a const/4 v1, 0x0 - :cond_8 + :cond_a invoke-virtual {v0, v1}, Landroid/view/View;->setVisibility(I)V invoke-direct {p0}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->getChatActionsQuote()Landroid/view/View; @@ -1318,16 +1354,6 @@ invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V - goto :goto_5 - - :cond_9 - invoke-direct {p0}, Lcom/discord/widgets/chat/list/actions/WidgetChatListActions;->getChatActionsQuote()Landroid/view/View; - - move-result-object p1 - - invoke-virtual {p1, v1}, Landroid/view/View;->setVisibility(I)V - - :goto_5 return-void .end method diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali index 043e1084e2..876675ebb9 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, "10.2.0" + const-string v3, "10.2.1" aput-object v3, v1, v4 diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$Companion.smali b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$Companion.smali index 41ad1c9d8d..47475e2a4d 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$Companion.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$Companion.smali @@ -34,23 +34,43 @@ # virtual methods .method public final create()Lcom/discord/widgets/guilds/invite/InviteSuggestionsService; - .locals 3 + .locals 7 - new-instance v0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService; + new-instance v6, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService; - sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion; + sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion; - invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getChannels()Lcom/discord/stores/StoreChannels; + invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getChannels()Lcom/discord/stores/StoreChannels; move-result-object v1 - sget-object v2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion; + sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion; - invoke-virtual {v2}, Lcom/discord/stores/StoreStream$Companion;->getMessagesMostRecent()Lcom/discord/stores/StoreMessagesMostRecent; + invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getMessagesMostRecent()Lcom/discord/stores/StoreMessagesMostRecent; move-result-object v2 - invoke-direct {v0, v1, v2}, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;->(Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreMessagesMostRecent;)V + sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion; - return-object v0 + invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getUserAffinities()Lcom/discord/stores/StoreUserAffinities; + + move-result-object v3 + + sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion; + + invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getUsers()Lcom/discord/stores/StoreUser; + + move-result-object v4 + + sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion; + + invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getUserRelationships()Lcom/discord/stores/StoreUserRelationships; + + move-result-object v5 + + move-object v0, v6 + + invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;->(Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreMessagesMostRecent;Lcom/discord/stores/StoreUserAffinities;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreUserRelationships;)V + + return-object v6 .end method diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1$1.smali new file mode 100644 index 0000000000..532692975f --- /dev/null +++ b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1$1.smali @@ -0,0 +1,102 @@ +.class public final Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1$1; +.super Ljava/lang/Object; +.source "InviteSuggestionsService.kt" + +# interfaces +.implements Lrx/functions/Func2; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1;->call(Ljava/util/List;)Lrx/Observable; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x19 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "", + "Ljava/lang/Object;", + "Lrx/functions/Func2<", + "TT1;TT2;TR;>;" + } +.end annotation + + +# instance fields +.field public final synthetic $affinityUserIds:Ljava/util/List; + + +# direct methods +.method public constructor (Ljava/util/List;)V + .locals 0 + + iput-object p1, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1$1;->$affinityUserIds:Ljava/util/List; + + invoke-direct {p0}, Ljava/lang/Object;->()V + + return-void +.end method + + +# virtual methods +.method public final call(Ljava/util/Map;Ljava/util/Map;)Lcom/discord/widgets/guilds/invite/UserAffinityData; + .locals 3 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Ljava/util/Map<", + "Ljava/lang/Long;", + "Lcom/discord/models/domain/ModelUser;", + ">;", + "Ljava/util/Map<", + "Ljava/lang/Long;", + "Ljava/lang/Integer;", + ">;)", + "Lcom/discord/widgets/guilds/invite/UserAffinityData;" + } + .end annotation + + new-instance v0, Lcom/discord/widgets/guilds/invite/UserAffinityData; + + iget-object v1, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1$1;->$affinityUserIds:Ljava/util/List; + + const-string v2, "affinityUserIds" + + invoke-static {v1, v2}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + const-string v2, "users" + + invoke-static {p1, v2}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + const-string v2, "relationships" + + invoke-static {p2, v2}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-direct {v0, v1, p1, p2}, Lcom/discord/widgets/guilds/invite/UserAffinityData;->(Ljava/util/List;Ljava/util/Map;Ljava/util/Map;)V + + return-object v0 +.end method + +.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + .locals 0 + + check-cast p1, Ljava/util/Map; + + check-cast p2, Ljava/util/Map; + + invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1$1;->call(Ljava/util/Map;Ljava/util/Map;)Lcom/discord/widgets/guilds/invite/UserAffinityData; + + move-result-object p1 + + return-object p1 +.end method diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1.smali index 0696ba07c0..7cecb49cc3 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1.smali @@ -3,7 +3,7 @@ .source "InviteSuggestionsService.kt" # interfaces -.implements Lrx/functions/Func2; +.implements Lb0/l/i; # annotations @@ -18,40 +18,30 @@ .annotation system Ldalvik/annotation/Signature; value = { - "", "Ljava/lang/Object;", - "Lrx/functions/Func2<", - "TT1;TT2;TR;>;" + "Lb0/l/i<", + "TT;", + "Lrx/Observable<", + "+TR;>;>;" } .end annotation -# static fields -.field public static final INSTANCE:Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1; +# instance fields +.field public final synthetic this$0:Lcom/discord/widgets/guilds/invite/InviteSuggestionsService; # direct methods -.method public static constructor ()V - .locals 1 - - new-instance v0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1; - - invoke-direct {v0}, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1;->()V - - sput-object v0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1;->INSTANCE:Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1; - - return-void -.end method - -.method public constructor ()V +.method public constructor (Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;)V .locals 0 + iput-object p1, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1;->this$0:Lcom/discord/widgets/guilds/invite/InviteSuggestionsService; + invoke-direct {p0}, Ljava/lang/Object;->()V return-void @@ -59,93 +49,67 @@ # virtual methods -.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; +.method public bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object; .locals 0 - check-cast p1, Ljava/util/Map; + check-cast p1, Ljava/util/List; - check-cast p2, Ljava/util/Map; - - invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1;->call(Ljava/util/Map;Ljava/util/Map;)Ljava/util/List; + invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1;->call(Ljava/util/List;)Lrx/Observable; move-result-object p1 return-object p1 .end method -.method public final call(Ljava/util/Map;Ljava/util/Map;)Ljava/util/List; - .locals 2 +.method public final call(Ljava/util/List;)Lrx/Observable; + .locals 3 .annotation system Ldalvik/annotation/Signature; value = { "(", - "Ljava/util/Map<", - "Ljava/lang/Long;", - "+", - "Lcom/discord/models/domain/ModelChannel;", - ">;", - "Ljava/util/Map<", - "Ljava/lang/Long;", + "Ljava/util/List<", "Ljava/lang/Long;", ">;)", - "Ljava/util/List<", - "Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;", + "Lrx/Observable<", + "Lcom/discord/widgets/guilds/invite/UserAffinityData;", ">;" } .end annotation - invoke-interface {p1}, Ljava/util/Map;->values()Ljava/util/Collection; + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1;->this$0:Lcom/discord/widgets/guilds/invite/InviteSuggestionsService; - move-result-object p1 - - sget-object v0, Lcom/discord/utilities/channel/ChannelUtils;->INSTANCE:Lcom/discord/utilities/channel/ChannelUtils; - - const-string v1, "mostRecentMessages" - - invoke-static {p2, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-virtual {v0, p2}, Lcom/discord/utilities/channel/ChannelUtils;->createMostRecentChannelComparator(Ljava/util/Map;)Ljava/util/Comparator; - - move-result-object p2 - - invoke-static {p1, p2}, Lt/q/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List; - - move-result-object p1 - - new-instance p2, Ljava/util/ArrayList; - - const/16 v0, 0xa - - invoke-static {p1, v0}, Le/k/a/b/e/p/g;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I - - move-result v0 - - invoke-direct {p2, v0}, Ljava/util/ArrayList;->(I)V - - invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; - - move-result-object p1 - - :goto_0 - invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z - - move-result v0 - - if-eqz v0, :cond_0 - - invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object; + invoke-virtual {v0}, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;->getStoreUsers()Lcom/discord/stores/StoreUser; move-result-object v0 - check-cast v0, Lcom/discord/models/domain/ModelChannel; + invoke-virtual {v0, p1}, Lcom/discord/stores/StoreUser;->get(Ljava/util/Collection;)Lrx/Observable; - new-instance v1, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel; + move-result-object v0 - invoke-direct {v1, v0}, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;->(Lcom/discord/models/domain/ModelChannel;)V + invoke-virtual {v0}, Lrx/Observable;->a()Lrx/Observable; - invoke-interface {p2, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z + move-result-object v0 - goto :goto_0 + iget-object v1, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1;->this$0:Lcom/discord/widgets/guilds/invite/InviteSuggestionsService; - :cond_0 - return-object p2 + invoke-virtual {v1}, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;->getStoreUserRelationships()Lcom/discord/stores/StoreUserRelationships; + + move-result-object v1 + + const-string v2, "affinityUserIds" + + invoke-static {p1, v2}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {v1, p1}, Lcom/discord/stores/StoreUserRelationships;->get(Ljava/util/Collection;)Lrx/Observable; + + move-result-object v1 + + new-instance v2, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1$1; + + invoke-direct {v2, p1}, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1$1;->(Ljava/util/List;)V + + invoke-static {v0, v1, v2}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable; + + move-result-object p1 + + return-object p1 .end method diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$2.smali b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$2.smali new file mode 100644 index 0000000000..9c3c64563d --- /dev/null +++ b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$2.smali @@ -0,0 +1,379 @@ +.class public final Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$2; +.super Ljava/lang/Object; +.source "InviteSuggestionsService.kt" + +# interfaces +.implements Lrx/functions/Func3; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;->observeInviteSuggestions()Lrx/Observable; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x19 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "", + "Ljava/lang/Object;", + "Lrx/functions/Func3<", + "TT1;TT2;TT3;TR;>;" + } +.end annotation + + +# static fields +.field public static final INSTANCE:Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$2; + + +# direct methods +.method public static constructor ()V + .locals 1 + + new-instance v0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$2; + + invoke-direct {v0}, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$2;->()V + + sput-object v0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$2;->INSTANCE:Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$2; + + return-void +.end method + +.method public constructor ()V + .locals 0 + + invoke-direct {p0}, Ljava/lang/Object;->()V + + return-void +.end method + + +# virtual methods +.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + .locals 0 + + check-cast p1, Ljava/util/Map; + + check-cast p2, Ljava/util/Map; + + check-cast p3, Lcom/discord/widgets/guilds/invite/UserAffinityData; + + invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$2;->call(Ljava/util/Map;Ljava/util/Map;Lcom/discord/widgets/guilds/invite/UserAffinityData;)Ljava/util/List; + + move-result-object p1 + + return-object p1 +.end method + +.method public final call(Ljava/util/Map;Ljava/util/Map;Lcom/discord/widgets/guilds/invite/UserAffinityData;)Ljava/util/List; + .locals 10 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Ljava/util/Map<", + "Ljava/lang/Long;", + "+", + "Lcom/discord/models/domain/ModelChannel;", + ">;", + "Ljava/util/Map<", + "Ljava/lang/Long;", + "Ljava/lang/Long;", + ">;", + "Lcom/discord/widgets/guilds/invite/UserAffinityData;", + ")", + "Ljava/util/List<", + "Lcom/discord/widgets/guilds/invite/InviteSuggestion;", + ">;" + } + .end annotation + + new-instance v0, Ljava/util/ArrayList; + + invoke-direct {v0}, Ljava/util/ArrayList;->()V + + invoke-interface {p1}, Ljava/util/Map;->values()Ljava/util/Collection; + + move-result-object p1 + + sget-object v1, Lcom/discord/utilities/channel/ChannelUtils;->INSTANCE:Lcom/discord/utilities/channel/ChannelUtils; + + const-string v2, "mostRecentMessages" + + invoke-static {p2, v2}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {v1, p2}, Lcom/discord/utilities/channel/ChannelUtils;->createMostRecentChannelComparator(Ljava/util/Map;)Ljava/util/Comparator; + + move-result-object p2 + + invoke-static {p1, p2}, Lt/q/l;->sortedWith(Ljava/lang/Iterable;Ljava/util/Comparator;)Ljava/util/List; + + move-result-object p1 + + invoke-interface {p1}, Ljava/util/Collection;->isEmpty()Z + + move-result p2 + + const/4 v1, 0x1 + + xor-int/2addr p2, v1 + + const/4 v2, 0x0 + + const/4 v3, 0x0 + + if-eqz p2, :cond_0 + + invoke-interface {p1, v3}, Ljava/util/List;->get(I)Ljava/lang/Object; + + move-result-object p2 + + check-cast p2, Lcom/discord/models/domain/ModelChannel; + + goto :goto_0 + + :cond_0 + move-object p2, v2 + + :goto_0 + if-eqz p2, :cond_1 + + new-instance v4, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel; + + invoke-direct {v4, p2}, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;->(Lcom/discord/models/domain/ModelChannel;)V + + invoke-interface {v0, v4}, Ljava/util/List;->add(Ljava/lang/Object;)Z + + :cond_1 + new-instance v4, Ljava/util/ArrayList; + + invoke-direct {v4}, Ljava/util/ArrayList;->()V + + invoke-virtual {p3}, Lcom/discord/widgets/guilds/invite/UserAffinityData;->getUserIds()Ljava/util/List; + + move-result-object v5 + + invoke-interface {v5}, Ljava/util/List;->iterator()Ljava/util/Iterator; + + move-result-object v5 + + :cond_2 + :goto_1 + invoke-interface {v5}, Ljava/util/Iterator;->hasNext()Z + + move-result v6 + + if-eqz v6, :cond_6 + + invoke-interface {v5}, Ljava/util/Iterator;->next()Ljava/lang/Object; + + move-result-object v6 + + check-cast v6, Ljava/lang/Number; + + invoke-virtual {v6}, Ljava/lang/Number;->longValue()J + + move-result-wide v6 + + invoke-virtual {p3}, Lcom/discord/widgets/guilds/invite/UserAffinityData;->getUsers()Ljava/util/Map; + + move-result-object v8 + + invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v9 + + invoke-interface {v8, v9}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + + move-result-object v8 + + check-cast v8, Lcom/discord/models/domain/ModelUser; + + if-eqz v8, :cond_2 + + invoke-virtual {p3}, Lcom/discord/widgets/guilds/invite/UserAffinityData;->getRelationships()Ljava/util/Map; + + move-result-object v9 + + invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v6 + + invoke-interface {v9, v6}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + + move-result-object v6 + + check-cast v6, Ljava/lang/Integer; + + if-eqz p2, :cond_3 + + invoke-virtual {p2}, Lcom/discord/models/domain/ModelChannel;->getDMRecipient()Lcom/discord/models/domain/ModelUser; + + move-result-object v7 + + invoke-static {v7, v8}, Lt/u/b/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z + + move-result v7 + + if-nez v7, :cond_2 + + :cond_3 + const/4 v7, 0x2 + + if-nez v6, :cond_4 + + goto :goto_2 + + :cond_4 + invoke-virtual {v6}, Ljava/lang/Integer;->intValue()I + + move-result v6 + + if-ne v6, v7, :cond_5 + + goto :goto_1 + + :cond_5 + :goto_2 + invoke-interface {v4, v8}, Ljava/util/List;->add(Ljava/lang/Object;)Z + + new-instance v6, Lcom/discord/widgets/guilds/invite/InviteSuggestion$User; + + invoke-direct {v6, v8}, Lcom/discord/widgets/guilds/invite/InviteSuggestion$User;->(Lcom/discord/models/domain/ModelUser;)V + + invoke-interface {v0, v6}, Ljava/util/List;->add(Ljava/lang/Object;)Z + + goto :goto_1 + + :cond_6 + new-instance p2, Ljava/util/ArrayList; + + invoke-direct {p2}, Ljava/util/ArrayList;->()V + + invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; + + move-result-object p1 + + const/4 p3, 0x0 + + :goto_3 + invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z + + move-result v5 + + if-eqz v5, :cond_b + + invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object; + + move-result-object v5 + + add-int/lit8 v6, p3, 0x1 + + if-ltz p3, :cond_a + + move-object v7, v5 + + check-cast v7, Lcom/discord/models/domain/ModelChannel; + + if-nez p3, :cond_8 + + invoke-virtual {v7}, Lcom/discord/models/domain/ModelChannel;->getDMRecipient()Lcom/discord/models/domain/ModelUser; + + move-result-object p3 + + if-eqz p3, :cond_8 + + invoke-virtual {v7}, Lcom/discord/models/domain/ModelChannel;->getDMRecipient()Lcom/discord/models/domain/ModelUser; + + move-result-object p3 + + invoke-interface {v4, p3}, Ljava/util/List;->contains(Ljava/lang/Object;)Z + + move-result p3 + + if-nez p3, :cond_7 + + goto :goto_4 + + :cond_7 + const/4 p3, 0x0 + + goto :goto_5 + + :cond_8 + :goto_4 + const/4 p3, 0x1 + + :goto_5 + if-eqz p3, :cond_9 + + invoke-interface {p2, v5}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z + + :cond_9 + move p3, v6 + + goto :goto_3 + + :cond_a + invoke-static {}, Le/k/a/b/e/p/g;->throwIndexOverflow()V + + throw v2 + + :cond_b + new-instance p1, Ljava/util/ArrayList; + + const/16 p3, 0xa + + invoke-static {p2, p3}, Le/k/a/b/e/p/g;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I + + move-result p3 + + invoke-direct {p1, p3}, Ljava/util/ArrayList;->(I)V + + invoke-interface {p2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; + + move-result-object p2 + + :goto_6 + invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z + + move-result p3 + + if-eqz p3, :cond_c + + invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object; + + move-result-object p3 + + check-cast p3, Lcom/discord/models/domain/ModelChannel; + + new-instance v1, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel; + + invoke-direct {v1, p3}, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;->(Lcom/discord/models/domain/ModelChannel;)V + + invoke-interface {v0, v1}, Ljava/util/List;->add(Ljava/lang/Object;)Z + + move-result p3 + + invoke-static {p3}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean; + + move-result-object p3 + + invoke-interface {p1, p3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z + + goto :goto_6 + + :cond_c + return-object v0 +.end method diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService.smali b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService.smali index 61531eb541..73a8cbffbc 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/InviteSuggestionsService.smali @@ -20,6 +20,12 @@ .field public final storeMessagesMostRecent:Lcom/discord/stores/StoreMessagesMostRecent; +.field public final storeUserAffinities:Lcom/discord/stores/StoreUserAffinities; + +.field public final storeUserRelationships:Lcom/discord/stores/StoreUserRelationships; + +.field public final storeUsers:Lcom/discord/stores/StoreUser; + # direct methods .method public static constructor ()V @@ -36,14 +42,20 @@ return-void .end method -.method public constructor (Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreMessagesMostRecent;)V +.method public constructor (Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreMessagesMostRecent;Lcom/discord/stores/StoreUserAffinities;Lcom/discord/stores/StoreUser;Lcom/discord/stores/StoreUserRelationships;)V .locals 1 const/4 v0, 0x0 - if-eqz p1, :cond_1 + if-eqz p1, :cond_4 - if-eqz p2, :cond_0 + if-eqz p2, :cond_3 + + if-eqz p3, :cond_2 + + if-eqz p4, :cond_1 + + if-eqz p5, :cond_0 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -51,16 +63,43 @@ iput-object p2, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;->storeMessagesMostRecent:Lcom/discord/stores/StoreMessagesMostRecent; + iput-object p3, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;->storeUserAffinities:Lcom/discord/stores/StoreUserAffinities; + + iput-object p4, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;->storeUsers:Lcom/discord/stores/StoreUser; + + iput-object p5, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;->storeUserRelationships:Lcom/discord/stores/StoreUserRelationships; + return-void :cond_0 - const-string p1, "storeMessagesMostRecent" + const-string p1, "storeUserRelationships" invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V throw v0 :cond_1 + const-string p1, "storeUsers" + + invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V + + throw v0 + + :cond_2 + const-string p1, "storeUserAffinities" + + invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V + + throw v0 + + :cond_3 + const-string p1, "storeMessagesMostRecent" + + invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V + + throw v0 + + :cond_4 const-string p1, "storeChannels" invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V @@ -86,8 +125,32 @@ return-object v0 .end method +.method public final getStoreUserAffinities()Lcom/discord/stores/StoreUserAffinities; + .locals 1 + + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;->storeUserAffinities:Lcom/discord/stores/StoreUserAffinities; + + return-object v0 +.end method + +.method public final getStoreUserRelationships()Lcom/discord/stores/StoreUserRelationships; + .locals 1 + + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;->storeUserRelationships:Lcom/discord/stores/StoreUserRelationships; + + return-object v0 +.end method + +.method public final getStoreUsers()Lcom/discord/stores/StoreUser; + .locals 1 + + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;->storeUsers:Lcom/discord/stores/StoreUser; + + return-object v0 +.end method + .method public final observeInviteSuggestions()Lrx/Observable; - .locals 3 + .locals 4 .annotation system Ldalvik/annotation/Signature; value = { "()", @@ -116,13 +179,27 @@ move-result-object v1 - sget-object v2, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1;->INSTANCE:Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1; + iget-object v2, p0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;->storeUserAffinities:Lcom/discord/stores/StoreUserAffinities; - invoke-static {v0, v1, v2}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable; + invoke-virtual {v2}, Lcom/discord/stores/StoreUserAffinities;->getAffinityUserIds()Lrx/Observable; + + move-result-object v2 + + new-instance v3, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1; + + invoke-direct {v3, p0}, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$1;->(Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;)V + + invoke-virtual {v2, v3}, Lrx/Observable;->k(Lb0/l/i;)Lrx/Observable; + + move-result-object v2 + + sget-object v3, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$2;->INSTANCE:Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$observeInviteSuggestions$2; + + invoke-static {v0, v1, v2, v3}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func3;)Lrx/Observable; move-result-object v0 - const-string v1, "Observable.combineLatest\u2026gestion.Channel(it) }\n }" + const-string v1, "Observable.combineLatest\u2026 inviteSuggestionList\n }" invoke-static {v0, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/UserAffinityData.smali b/com.discord/smali/com/discord/widgets/guilds/invite/UserAffinityData.smali new file mode 100644 index 0000000000..41a35bb2b1 --- /dev/null +++ b/com.discord/smali/com/discord/widgets/guilds/invite/UserAffinityData.smali @@ -0,0 +1,437 @@ +.class public final Lcom/discord/widgets/guilds/invite/UserAffinityData; +.super Ljava/lang/Object; +.source "InviteSuggestionsService.kt" + + +# instance fields +.field public final relationships:Ljava/util/Map; + .annotation system Ldalvik/annotation/Signature; + value = { + "Ljava/util/Map<", + "Ljava/lang/Long;", + "Ljava/lang/Integer;", + ">;" + } + .end annotation +.end field + +.field public final userIds:Ljava/util/List; + .annotation system Ldalvik/annotation/Signature; + value = { + "Ljava/util/List<", + "Ljava/lang/Long;", + ">;" + } + .end annotation +.end field + +.field public final users:Ljava/util/Map; + .annotation system Ldalvik/annotation/Signature; + value = { + "Ljava/util/Map<", + "Ljava/lang/Long;", + "Lcom/discord/models/domain/ModelUser;", + ">;" + } + .end annotation +.end field + + +# direct methods +.method public constructor (Ljava/util/List;Ljava/util/Map;Ljava/util/Map;)V + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Ljava/util/List<", + "Ljava/lang/Long;", + ">;", + "Ljava/util/Map<", + "Ljava/lang/Long;", + "+", + "Lcom/discord/models/domain/ModelUser;", + ">;", + "Ljava/util/Map<", + "Ljava/lang/Long;", + "Ljava/lang/Integer;", + ">;)V" + } + .end annotation + + const/4 v0, 0x0 + + if-eqz p1, :cond_2 + + if-eqz p2, :cond_1 + + if-eqz p3, :cond_0 + + invoke-direct {p0}, Ljava/lang/Object;->()V + + iput-object p1, p0, Lcom/discord/widgets/guilds/invite/UserAffinityData;->userIds:Ljava/util/List; + + iput-object p2, p0, Lcom/discord/widgets/guilds/invite/UserAffinityData;->users:Ljava/util/Map; + + iput-object p3, p0, Lcom/discord/widgets/guilds/invite/UserAffinityData;->relationships:Ljava/util/Map; + + return-void + + :cond_0 + const-string p1, "relationships" + + invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V + + throw v0 + + :cond_1 + const-string p1, "users" + + invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V + + throw v0 + + :cond_2 + const-string p1, "userIds" + + invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V + + throw v0 +.end method + +.method public static synthetic copy$default(Lcom/discord/widgets/guilds/invite/UserAffinityData;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;ILjava/lang/Object;)Lcom/discord/widgets/guilds/invite/UserAffinityData; + .locals 0 + + and-int/lit8 p5, p4, 0x1 + + if-eqz p5, :cond_0 + + iget-object p1, p0, Lcom/discord/widgets/guilds/invite/UserAffinityData;->userIds:Ljava/util/List; + + :cond_0 + and-int/lit8 p5, p4, 0x2 + + if-eqz p5, :cond_1 + + iget-object p2, p0, Lcom/discord/widgets/guilds/invite/UserAffinityData;->users:Ljava/util/Map; + + :cond_1 + and-int/lit8 p4, p4, 0x4 + + if-eqz p4, :cond_2 + + iget-object p3, p0, Lcom/discord/widgets/guilds/invite/UserAffinityData;->relationships:Ljava/util/Map; + + :cond_2 + invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/guilds/invite/UserAffinityData;->copy(Ljava/util/List;Ljava/util/Map;Ljava/util/Map;)Lcom/discord/widgets/guilds/invite/UserAffinityData; + + move-result-object p0 + + return-object p0 +.end method + + +# virtual methods +.method public final component1()Ljava/util/List; + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Ljava/util/List<", + "Ljava/lang/Long;", + ">;" + } + .end annotation + + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/UserAffinityData;->userIds:Ljava/util/List; + + return-object v0 +.end method + +.method public final component2()Ljava/util/Map; + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Ljava/util/Map<", + "Ljava/lang/Long;", + "Lcom/discord/models/domain/ModelUser;", + ">;" + } + .end annotation + + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/UserAffinityData;->users:Ljava/util/Map; + + return-object v0 +.end method + +.method public final component3()Ljava/util/Map; + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Ljava/util/Map<", + "Ljava/lang/Long;", + "Ljava/lang/Integer;", + ">;" + } + .end annotation + + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/UserAffinityData;->relationships:Ljava/util/Map; + + return-object v0 +.end method + +.method public final copy(Ljava/util/List;Ljava/util/Map;Ljava/util/Map;)Lcom/discord/widgets/guilds/invite/UserAffinityData; + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Ljava/util/List<", + "Ljava/lang/Long;", + ">;", + "Ljava/util/Map<", + "Ljava/lang/Long;", + "+", + "Lcom/discord/models/domain/ModelUser;", + ">;", + "Ljava/util/Map<", + "Ljava/lang/Long;", + "Ljava/lang/Integer;", + ">;)", + "Lcom/discord/widgets/guilds/invite/UserAffinityData;" + } + .end annotation + + const/4 v0, 0x0 + + if-eqz p1, :cond_2 + + if-eqz p2, :cond_1 + + if-eqz p3, :cond_0 + + new-instance v0, Lcom/discord/widgets/guilds/invite/UserAffinityData; + + invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/guilds/invite/UserAffinityData;->(Ljava/util/List;Ljava/util/Map;Ljava/util/Map;)V + + return-object v0 + + :cond_0 + const-string p1, "relationships" + + invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V + + throw v0 + + :cond_1 + const-string p1, "users" + + invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V + + throw v0 + + :cond_2 + const-string p1, "userIds" + + invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V + + throw v0 +.end method + +.method public equals(Ljava/lang/Object;)Z + .locals 2 + + if-eq p0, p1, :cond_1 + + instance-of v0, p1, Lcom/discord/widgets/guilds/invite/UserAffinityData; + + if-eqz v0, :cond_0 + + check-cast p1, Lcom/discord/widgets/guilds/invite/UserAffinityData; + + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/UserAffinityData;->userIds:Ljava/util/List; + + iget-object v1, p1, Lcom/discord/widgets/guilds/invite/UserAffinityData;->userIds:Ljava/util/List; + + invoke-static {v0, v1}, Lt/u/b/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z + + move-result v0 + + if-eqz v0, :cond_0 + + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/UserAffinityData;->users:Ljava/util/Map; + + iget-object v1, p1, Lcom/discord/widgets/guilds/invite/UserAffinityData;->users:Ljava/util/Map; + + invoke-static {v0, v1}, Lt/u/b/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z + + move-result v0 + + if-eqz v0, :cond_0 + + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/UserAffinityData;->relationships:Ljava/util/Map; + + iget-object p1, p1, Lcom/discord/widgets/guilds/invite/UserAffinityData;->relationships:Ljava/util/Map; + + invoke-static {v0, p1}, Lt/u/b/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z + + move-result p1 + + if-eqz p1, :cond_0 + + goto :goto_0 + + :cond_0 + const/4 p1, 0x0 + + return p1 + + :cond_1 + :goto_0 + const/4 p1, 0x1 + + return p1 +.end method + +.method public final getRelationships()Ljava/util/Map; + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Ljava/util/Map<", + "Ljava/lang/Long;", + "Ljava/lang/Integer;", + ">;" + } + .end annotation + + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/UserAffinityData;->relationships:Ljava/util/Map; + + return-object v0 +.end method + +.method public final getUserIds()Ljava/util/List; + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Ljava/util/List<", + "Ljava/lang/Long;", + ">;" + } + .end annotation + + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/UserAffinityData;->userIds:Ljava/util/List; + + return-object v0 +.end method + +.method public final getUsers()Ljava/util/Map; + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Ljava/util/Map<", + "Ljava/lang/Long;", + "Lcom/discord/models/domain/ModelUser;", + ">;" + } + .end annotation + + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/UserAffinityData;->users:Ljava/util/Map; + + return-object v0 +.end method + +.method public hashCode()I + .locals 3 + + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/UserAffinityData;->userIds:Ljava/util/List; + + const/4 v1, 0x0 + + if-eqz v0, :cond_0 + + invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I + + move-result v0 + + goto :goto_0 + + :cond_0 + const/4 v0, 0x0 + + :goto_0 + mul-int/lit8 v0, v0, 0x1f + + iget-object v2, p0, Lcom/discord/widgets/guilds/invite/UserAffinityData;->users:Ljava/util/Map; + + if-eqz v2, :cond_1 + + invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I + + move-result v2 + + goto :goto_1 + + :cond_1 + const/4 v2, 0x0 + + :goto_1 + add-int/2addr v0, v2 + + mul-int/lit8 v0, v0, 0x1f + + iget-object v2, p0, Lcom/discord/widgets/guilds/invite/UserAffinityData;->relationships:Ljava/util/Map; + + if-eqz v2, :cond_2 + + invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I + + move-result v1 + + :cond_2 + add-int/2addr v0, v1 + + return v0 +.end method + +.method public toString()Ljava/lang/String; + .locals 2 + + const-string v0, "UserAffinityData(userIds=" + + invoke-static {v0}, Le/e/b/a/a;->a(Ljava/lang/String;)Ljava/lang/StringBuilder; + + move-result-object v0 + + iget-object v1, p0, Lcom/discord/widgets/guilds/invite/UserAffinityData;->userIds:Ljava/util/List; + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + + const-string v1, ", users=" + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + iget-object v1, p0, Lcom/discord/widgets/guilds/invite/UserAffinityData;->users:Ljava/util/Map; + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + + const-string v1, ", relationships=" + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + iget-object v1, p0, Lcom/discord/widgets/guilds/invite/UserAffinityData;->relationships:Ljava/util/Map; + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + + const-string v1, ")" + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + + move-result-object v0 + + return-object v0 +.end method diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel.smali similarity index 59% rename from com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem.smali rename to com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel.smali index 1ed91db960..d6640f30cd 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel.smali @@ -1,19 +1,16 @@ -.class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem; -.super Ljava/lang/Object; +.class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel; +.super Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem; .source "WidgetGuildInviteShare.kt" -# interfaces -.implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload; - # annotations .annotation system Ldalvik/annotation/EnclosingClass; - value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare; + value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem; .end annotation .annotation system Ldalvik/annotation/InnerClass; accessFlags = 0x19 - name = "ChannelItem" + name = "Channel" .end annotation @@ -22,28 +19,20 @@ .field public final hasSent:Z -.field public final user:Lcom/discord/models/domain/ModelUser; - # direct methods .method public constructor (Lcom/discord/models/domain/ModelChannel;Z)V - .locals 0 + .locals 1 + + const/4 v0, 0x0 if-eqz p1, :cond_0 - invoke-direct {p0}, Ljava/lang/Object;->()V + invoke-direct {p0, v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;->(Lkotlin/jvm/internal/DefaultConstructorMarker;)V - iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->channel:Lcom/discord/models/domain/ModelChannel; + iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;->channel:Lcom/discord/models/domain/ModelChannel; - iput-boolean p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->hasSent:Z - - iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->channel:Lcom/discord/models/domain/ModelChannel; - - invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getDMRecipient()Lcom/discord/models/domain/ModelUser; - - move-result-object p1 - - iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->user:Lcom/discord/models/domain/ModelUser; + iput-boolean p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;->hasSent:Z return-void @@ -52,29 +41,27 @@ invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V - const/4 p1, 0x0 - - throw p1 + throw v0 .end method -.method public static synthetic copy$default(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;Lcom/discord/models/domain/ModelChannel;ZILjava/lang/Object;)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem; +.method public static synthetic copy$default(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;Lcom/discord/models/domain/ModelChannel;ZILjava/lang/Object;)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel; .locals 0 and-int/lit8 p4, p3, 0x1 if-eqz p4, :cond_0 - iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->channel:Lcom/discord/models/domain/ModelChannel; + iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;->channel:Lcom/discord/models/domain/ModelChannel; :cond_0 and-int/lit8 p3, p3, 0x2 if-eqz p3, :cond_1 - iget-boolean p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->hasSent:Z + iget-boolean p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;->hasSent:Z :cond_1 - invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->copy(Lcom/discord/models/domain/ModelChannel;Z)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem; + invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;->copy(Lcom/discord/models/domain/ModelChannel;Z)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel; move-result-object p0 @@ -86,7 +73,7 @@ .method public final component1()Lcom/discord/models/domain/ModelChannel; .locals 1 - iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->channel:Lcom/discord/models/domain/ModelChannel; + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;->channel:Lcom/discord/models/domain/ModelChannel; return-object v0 .end method @@ -94,19 +81,19 @@ .method public final component2()Z .locals 1 - iget-boolean v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->hasSent:Z + iget-boolean v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;->hasSent:Z return v0 .end method -.method public final copy(Lcom/discord/models/domain/ModelChannel;Z)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem; +.method public final copy(Lcom/discord/models/domain/ModelChannel;Z)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel; .locals 1 if-eqz p1, :cond_0 - new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem; + new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel; - invoke-direct {v0, p1, p2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->(Lcom/discord/models/domain/ModelChannel;Z)V + invoke-direct {v0, p1, p2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;->(Lcom/discord/models/domain/ModelChannel;Z)V return-object v0 @@ -125,15 +112,15 @@ if-eq p0, p1, :cond_1 - instance-of v0, p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem; + instance-of v0, p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel; if-eqz v0, :cond_0 - check-cast p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem; + check-cast p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel; - iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->channel:Lcom/discord/models/domain/ModelChannel; + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;->channel:Lcom/discord/models/domain/ModelChannel; - iget-object v1, p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->channel:Lcom/discord/models/domain/ModelChannel; + iget-object v1, p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;->channel:Lcom/discord/models/domain/ModelChannel; invoke-static {v0, v1}, Lt/u/b/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z @@ -141,9 +128,9 @@ if-eqz v0, :cond_0 - iget-boolean v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->hasSent:Z + iget-boolean v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;->hasSent:Z - iget-boolean p1, p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->hasSent:Z + iget-boolean p1, p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;->hasSent:Z if-ne v0, p1, :cond_0 @@ -164,7 +151,7 @@ .method public final getChannel()Lcom/discord/models/domain/ModelChannel; .locals 1 - iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->channel:Lcom/discord/models/domain/ModelChannel; + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;->channel:Lcom/discord/models/domain/ModelChannel; return-object v0 .end method @@ -172,21 +159,33 @@ .method public final getHasSent()Z .locals 1 - iget-boolean v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->hasSent:Z + iget-boolean v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;->hasSent:Z return v0 .end method .method public getKey()Ljava/lang/String; - .locals 2 + .locals 3 - iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->channel:Lcom/discord/models/domain/ModelChannel; + const-string v0, "c" - invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getId()J + invoke-static {v0}, Le/e/b/a/a;->a(Ljava/lang/String;)Ljava/lang/StringBuilder; - move-result-wide v0 + move-result-object v0 - invoke-static {v0, v1}, Ljava/lang/String;->valueOf(J)Ljava/lang/String; + iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;->channel:Lcom/discord/models/domain/ModelChannel; + + invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getId()J + + move-result-wide v1 + + invoke-static {v1, v2}, Ljava/lang/String;->valueOf(J)Ljava/lang/String; + + move-result-object v1 + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; move-result-object v0 @@ -196,23 +195,23 @@ .method public getType()I .locals 1 - const/4 v0, 0x0 + const/4 v0, 0x1 return v0 .end method -.method public final getUser()Lcom/discord/models/domain/ModelUser; +.method public hasSentInvite()Z .locals 1 - iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->user:Lcom/discord/models/domain/ModelUser; + iget-boolean v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;->hasSent:Z - return-object v0 + return v0 .end method .method public hashCode()I .locals 2 - iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->channel:Lcom/discord/models/domain/ModelChannel; + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;->channel:Lcom/discord/models/domain/ModelChannel; if-eqz v0, :cond_0 @@ -228,7 +227,7 @@ :goto_0 mul-int/lit8 v0, v0, 0x1f - iget-boolean v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->hasSent:Z + iget-boolean v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;->hasSent:Z if-eqz v1, :cond_1 @@ -243,13 +242,13 @@ .method public toString()Ljava/lang/String; .locals 3 - const-string v0, "ChannelItem(channel=" + const-string v0, "Channel(channel=" invoke-static {v0}, Le/e/b/a/a;->a(Ljava/lang/String;)Ljava/lang/StringBuilder; move-result-object v0 - iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->channel:Lcom/discord/models/domain/ModelChannel; + iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;->channel:Lcom/discord/models/domain/ModelChannel; invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; @@ -257,7 +256,7 @@ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - iget-boolean v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->hasSent:Z + iget-boolean v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;->hasSent:Z const-string v2, ")" diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$SearchNoResultsItem.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$SearchNoResultsItem.smali new file mode 100644 index 0000000000..06382979df --- /dev/null +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$SearchNoResultsItem.smali @@ -0,0 +1,52 @@ +.class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$SearchNoResultsItem; +.super Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem; +.source "WidgetGuildInviteShare.kt" + + +# annotations +.annotation system Ldalvik/annotation/EnclosingClass; + value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x19 + name = "SearchNoResultsItem" +.end annotation + + +# direct methods +.method public constructor ()V + .locals 1 + + const/4 v0, 0x0 + + invoke-direct {p0, v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;->(Lkotlin/jvm/internal/DefaultConstructorMarker;)V + + return-void +.end method + +.method public synthetic constructor (Lkotlin/jvm/internal/DefaultConstructorMarker;)V + .locals 0 + + invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$SearchNoResultsItem;->()V + + return-void +.end method + + +# virtual methods +.method public getKey()Ljava/lang/String; + .locals 1 + + const-string v0, "SEARCH_NO_RESULTS" + + return-object v0 +.end method + +.method public hasSentInvite()Z + .locals 1 + + const/4 v0, 0x1 + + return v0 +.end method diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User.smali new file mode 100644 index 0000000000..8db06a74fc --- /dev/null +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User.smali @@ -0,0 +1,268 @@ +.class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User; +.super Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem; +.source "WidgetGuildInviteShare.kt" + + +# annotations +.annotation system Ldalvik/annotation/EnclosingClass; + value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x19 + name = "User" +.end annotation + + +# instance fields +.field public final hasSent:Z + +.field public final user:Lcom/discord/models/domain/ModelUser; + + +# direct methods +.method public constructor (Lcom/discord/models/domain/ModelUser;Z)V + .locals 1 + + const/4 v0, 0x0 + + if-eqz p1, :cond_0 + + invoke-direct {p0, v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;->(Lkotlin/jvm/internal/DefaultConstructorMarker;)V + + iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;->user:Lcom/discord/models/domain/ModelUser; + + iput-boolean p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;->hasSent:Z + + return-void + + :cond_0 + const-string p1, "user" + + invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V + + throw v0 +.end method + +.method public static synthetic copy$default(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;Lcom/discord/models/domain/ModelUser;ZILjava/lang/Object;)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User; + .locals 0 + + and-int/lit8 p4, p3, 0x1 + + if-eqz p4, :cond_0 + + iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;->user:Lcom/discord/models/domain/ModelUser; + + :cond_0 + and-int/lit8 p3, p3, 0x2 + + if-eqz p3, :cond_1 + + iget-boolean p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;->hasSent:Z + + :cond_1 + invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;->copy(Lcom/discord/models/domain/ModelUser;Z)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User; + + move-result-object p0 + + return-object p0 +.end method + + +# virtual methods +.method public final component1()Lcom/discord/models/domain/ModelUser; + .locals 1 + + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;->user:Lcom/discord/models/domain/ModelUser; + + return-object v0 +.end method + +.method public final component2()Z + .locals 1 + + iget-boolean v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;->hasSent:Z + + return v0 +.end method + +.method public final copy(Lcom/discord/models/domain/ModelUser;Z)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User; + .locals 1 + + if-eqz p1, :cond_0 + + new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User; + + invoke-direct {v0, p1, p2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;->(Lcom/discord/models/domain/ModelUser;Z)V + + return-object v0 + + :cond_0 + const-string p1, "user" + + invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V + + const/4 p1, 0x0 + + throw p1 +.end method + +.method public equals(Ljava/lang/Object;)Z + .locals 2 + + if-eq p0, p1, :cond_1 + + instance-of v0, p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User; + + if-eqz v0, :cond_0 + + check-cast p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User; + + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;->user:Lcom/discord/models/domain/ModelUser; + + iget-object v1, p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;->user:Lcom/discord/models/domain/ModelUser; + + invoke-static {v0, v1}, Lt/u/b/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z + + move-result v0 + + if-eqz v0, :cond_0 + + iget-boolean v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;->hasSent:Z + + iget-boolean p1, p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;->hasSent:Z + + if-ne v0, p1, :cond_0 + + goto :goto_0 + + :cond_0 + const/4 p1, 0x0 + + return p1 + + :cond_1 + :goto_0 + const/4 p1, 0x1 + + return p1 +.end method + +.method public final getHasSent()Z + .locals 1 + + iget-boolean v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;->hasSent:Z + + return v0 +.end method + +.method public getKey()Ljava/lang/String; + .locals 3 + + const-string v0, "u" + + invoke-static {v0}, Le/e/b/a/a;->a(Ljava/lang/String;)Ljava/lang/StringBuilder; + + move-result-object v0 + + iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;->user:Lcom/discord/models/domain/ModelUser; + + invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J + + move-result-wide v1 + + invoke-static {v1, v2}, Ljava/lang/String;->valueOf(J)Ljava/lang/String; + + move-result-object v1 + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + + move-result-object v0 + + return-object v0 +.end method + +.method public getType()I + .locals 1 + + const/4 v0, 0x0 + + return v0 +.end method + +.method public final getUser()Lcom/discord/models/domain/ModelUser; + .locals 1 + + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;->user:Lcom/discord/models/domain/ModelUser; + + return-object v0 +.end method + +.method public hasSentInvite()Z + .locals 1 + + iget-boolean v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;->hasSent:Z + + return v0 +.end method + +.method public hashCode()I + .locals 2 + + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;->user:Lcom/discord/models/domain/ModelUser; + + if-eqz v0, :cond_0 + + invoke-virtual {v0}, Lcom/discord/models/domain/ModelUser;->hashCode()I + + move-result v0 + + goto :goto_0 + + :cond_0 + const/4 v0, 0x0 + + :goto_0 + mul-int/lit8 v0, v0, 0x1f + + iget-boolean v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;->hasSent:Z + + if-eqz v1, :cond_1 + + const/4 v1, 0x1 + + :cond_1 + add-int/2addr v0, v1 + + return v0 +.end method + +.method public toString()Ljava/lang/String; + .locals 3 + + const-string v0, "User(user=" + + invoke-static {v0}, Le/e/b/a/a;->a(Ljava/lang/String;)Ljava/lang/StringBuilder; + + move-result-object v0 + + iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;->user:Lcom/discord/models/domain/ModelUser; + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + + const-string v1, ", hasSent=" + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + iget-boolean v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;->hasSent:Z + + const-string v2, ")" + + invoke-static {v0, v1, v2}, Le/e/b/a/a;->a(Ljava/lang/StringBuilder;ZLjava/lang/String;)Ljava/lang/String; + + move-result-object v0 + + return-object v0 +.end method diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem.smali new file mode 100644 index 0000000000..1da5a98f66 --- /dev/null +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem.smali @@ -0,0 +1,74 @@ +.class public abstract Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem; +.super Ljava/lang/Object; +.source "WidgetGuildInviteShare.kt" + +# interfaces +.implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingClass; + value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x409 + name = "InviteSuggestionItem" +.end annotation + +.annotation system Ldalvik/annotation/MemberClasses; + value = { + Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;, + Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;, + Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$SearchNoResultsItem; + } +.end annotation + + +# static fields +.field public static final SearchNoResultsItem:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$SearchNoResultsItem; + + +# direct methods +.method public static constructor ()V + .locals 2 + + new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$SearchNoResultsItem; + + const/4 v1, 0x0 + + invoke-direct {v0, v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$SearchNoResultsItem;->(Lkotlin/jvm/internal/DefaultConstructorMarker;)V + + sput-object v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;->SearchNoResultsItem:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$SearchNoResultsItem; + + return-void +.end method + +.method public constructor ()V + .locals 0 + + invoke-direct {p0}, Ljava/lang/Object;->()V + + return-void +.end method + +.method public synthetic constructor (Lkotlin/jvm/internal/DefaultConstructorMarker;)V + .locals 0 + + invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;->()V + + return-void +.end method + + +# virtual methods +.method public getType()I + .locals 1 + + const/4 v0, -0x1 + + return v0 +.end method + +.method public abstract hasSentInvite()Z +.end method diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item$onConfigure$1.smali index 2615721164..da4593efb2 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item$onConfigure$1.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item$onConfigure$1.smali @@ -8,7 +8,7 @@ # annotations .annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item;->onConfigure(ILcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;)V + value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item;->onConfigure(ILcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;)V .end annotation .annotation system Ldalvik/annotation/InnerClass; @@ -18,18 +18,18 @@ # instance fields -.field public final synthetic $data:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem; +.field public final synthetic $data:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem; .field public final synthetic this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item; # direct methods -.method public constructor (Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;)V +.method public constructor (Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;)V .locals 0 iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item$onConfigure$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item; - iput-object p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item$onConfigure$1;->$data:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem; + iput-object p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item$onConfigure$1;->$data:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem; invoke-direct {p0}, Ljava/lang/Object;->()V @@ -51,11 +51,7 @@ move-result-object p1 - iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item$onConfigure$1;->$data:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem; - - invoke-virtual {v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->getChannel()Lcom/discord/models/domain/ModelChannel; - - move-result-object v0 + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item$onConfigure$1;->$data:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem; invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item.smali index 1fd586ee8e..0f4f2937b0 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item.smali @@ -17,7 +17,7 @@ value = { "Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder<", "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter;", - "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;", + "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;", ">;" } .end annotation @@ -277,76 +277,88 @@ # virtual methods -.method public onConfigure(ILcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;)V - .locals 17 +.method public onConfigure(ILcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;)V + .locals 19 move-object/from16 v0, p2 const/4 v1, 0x0 - if-eqz v0, :cond_1 + if-eqz v0, :cond_5 invoke-super/range {p0 .. p2}, Lcom/discord/utilities/mg_recycler/MGRecyclerViewHolder;->onConfigure(ILjava/lang/Object;)V - invoke-virtual/range {p2 .. p2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->getChannel()Lcom/discord/models/domain/ModelChannel; - - move-result-object v2 - - invoke-virtual {v2}, Lcom/discord/models/domain/ModelChannel;->getType()I - - move-result v2 + instance-of v2, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel; const/4 v3, 0x1 - if-eq v2, v3, :cond_0 + if-eqz v2, :cond_1 - invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item;->getIcon()Lcom/facebook/drawee/view/SimpleDraweeView; + move-object v4, v0 - move-result-object v4 + check-cast v4, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel; - invoke-virtual/range {p2 .. p2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->getChannel()Lcom/discord/models/domain/ModelChannel; + invoke-virtual {v4}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;->getChannel()Lcom/discord/models/domain/ModelChannel; move-result-object v5 - const/4 v6, 0x0 + invoke-virtual {v5}, Lcom/discord/models/domain/ModelChannel;->getType()I - const/4 v7, 0x0 + move-result v5 - const/16 v8, 0xc + if-eq v5, v3, :cond_0 + + invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item;->getIcon()Lcom/facebook/drawee/view/SimpleDraweeView; + + move-result-object v6 + + invoke-virtual {v4}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;->getChannel()Lcom/discord/models/domain/ModelChannel; + + move-result-object v7 + + const/4 v8, 0x0 const/4 v9, 0x0 - invoke-static/range {v4 .. v9}, 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 + const/16 v10, 0xc + + const/4 v11, 0x0 + + invoke-static/range {v6 .. v11}, 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 :goto_0 :cond_0 invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item;->getIcon()Lcom/facebook/drawee/view/SimpleDraweeView; - move-result-object v10 + move-result-object v12 - invoke-virtual/range {p2 .. p2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->getUser()Lcom/discord/models/domain/ModelUser; + invoke-virtual {v4}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;->getChannel()Lcom/discord/models/domain/ModelChannel; - move-result-object v11 + move-result-object v5 - const/4 v12, 0x0 + invoke-virtual {v5}, Lcom/discord/models/domain/ModelChannel;->getDMRecipient()Lcom/discord/models/domain/ModelUser; - const/4 v13, 0x0 + move-result-object v13 const/4 v14, 0x0 - const/16 v15, 0x1c + const/4 v15, 0x0 const/16 v16, 0x0 - invoke-static/range {v10 .. v16}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Lcom/discord/models/domain/ModelUser;ILkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V + const/16 v17, 0x1c + + const/16 v18, 0x0 + + invoke-static/range {v12 .. v18}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Lcom/discord/models/domain/ModelUser;ILkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V :goto_0 invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item;->getName()Landroid/widget/TextView; - move-result-object v2 + move-result-object v5 - invoke-virtual/range {p2 .. p2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->getChannel()Lcom/discord/models/domain/ModelChannel; + invoke-virtual {v4}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;->getChannel()Lcom/discord/models/domain/ModelChannel; move-result-object v4 @@ -354,13 +366,75 @@ move-result-object v4 - invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + invoke-virtual {v5, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + goto :goto_1 + + :cond_1 + instance-of v4, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User; + + if-eqz v4, :cond_2 + + invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item;->getIcon()Lcom/facebook/drawee/view/SimpleDraweeView; + + move-result-object v5 + + move-object v4, v0 + + check-cast v4, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User; + + invoke-virtual {v4}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;->getUser()Lcom/discord/models/domain/ModelUser; + + move-result-object v6 + + const/4 v7, 0x0 + + const/4 v8, 0x0 + + const/4 v9, 0x0 + + const/16 v10, 0x1c + + const/4 v11, 0x0 + + invoke-static/range {v5 .. v11}, Lcom/discord/utilities/icon/IconUtils;->setIcon$default(Landroid/widget/ImageView;Lcom/discord/models/domain/ModelUser;ILkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V + + invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item;->getName()Landroid/widget/TextView; + + move-result-object v5 + + invoke-virtual {v4}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;->getUser()Lcom/discord/models/domain/ModelUser; + + move-result-object v4 + + invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String; + + move-result-object v4 + + invoke-virtual {v5, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + + :cond_2 + :goto_1 + if-nez v2, :cond_4 + + instance-of v2, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User; + + if-eqz v2, :cond_3 + + goto :goto_2 + + :cond_3 + move-object/from16 v3, p0 + + goto :goto_3 + + :cond_4 + :goto_2 invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item;->getSent()Landroid/view/View; move-result-object v2 - invoke-virtual/range {p2 .. p2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->getHasSent()Z + invoke-virtual/range {p2 .. p2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;->hasSentInvite()Z move-result v4 @@ -374,7 +448,7 @@ move-result-object v2 - invoke-virtual/range {p2 .. p2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->getHasSent()Z + invoke-virtual/range {p2 .. p2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;->hasSentInvite()Z move-result v4 @@ -390,13 +464,14 @@ move-object/from16 v3, p0 - invoke-direct {v2, v3, v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item$onConfigure$1;->(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;)V + invoke-direct {v2, v3, v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item$onConfigure$1;->(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;)V invoke-virtual {v1, v2}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V + :goto_3 return-void - :cond_1 + :cond_5 move-object/from16 v3, p0 const-string v0, "data" @@ -409,9 +484,9 @@ .method public bridge synthetic onConfigure(ILjava/lang/Object;)V .locals 0 - check-cast p2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem; + check-cast p2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem; - invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item;->onConfigure(ILcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;)V + invoke-virtual {p0, p1, p2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$Item;->onConfigure(ILcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;)V return-void .end method diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$onClick$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$onClick$1.smali index 538df579e0..1487c591e2 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$onClick$1.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$onClick$1.smali @@ -20,7 +20,7 @@ value = { "Lt/u/b/k;", "Lkotlin/jvm/functions/Function1<", - "Lcom/discord/models/domain/ModelChannel;", + "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;", "Lkotlin/Unit;", ">;" } @@ -59,16 +59,16 @@ .method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object; .locals 0 - check-cast p1, Lcom/discord/models/domain/ModelChannel; + check-cast p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem; - invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$onClick$1;->invoke(Lcom/discord/models/domain/ModelChannel;)V + invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter$onClick$1;->invoke(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;)V sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit; return-object p1 .end method -.method public final invoke(Lcom/discord/models/domain/ModelChannel;)V +.method public final invoke(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;)V .locals 0 if-eqz p1, :cond_0 diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter.smali index fb0869d13a..937be10b9b 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter.smali @@ -22,7 +22,7 @@ .annotation system Ldalvik/annotation/Signature; value = { "Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple<", - "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;", + "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;", ">;" } .end annotation @@ -34,7 +34,7 @@ value = { "Lkotlin/jvm/functions/Function1<", "-", - "Lcom/discord/models/domain/ModelChannel;", + "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;", "Lkotlin/Unit;", ">;" } @@ -74,7 +74,7 @@ value = { "()", "Lkotlin/jvm/functions/Function1<", - "Lcom/discord/models/domain/ModelChannel;", + "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;", "Lkotlin/Unit;", ">;" } @@ -123,7 +123,7 @@ "(", "Lkotlin/jvm/functions/Function1<", "-", - "Lcom/discord/models/domain/ModelChannel;", + "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;", "Lkotlin/Unit;", ">;)V" } diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$SearchNoResultsItem.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$SearchNoResultsItem.smali deleted file mode 100644 index 6593c98868..0000000000 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$SearchNoResultsItem.smali +++ /dev/null @@ -1,61 +0,0 @@ -.class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$SearchNoResultsItem; -.super Ljava/lang/Object; -.source "WidgetGuildInviteShare.kt" - -# interfaces -.implements Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload; - - -# annotations -.annotation system Ldalvik/annotation/EnclosingClass; - value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare; -.end annotation - -.annotation system Ldalvik/annotation/InnerClass; - accessFlags = 0x19 - name = "SearchNoResultsItem" -.end annotation - - -# static fields -.field public static final INSTANCE:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$SearchNoResultsItem; - - -# direct methods -.method public static constructor ()V - .locals 1 - - new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$SearchNoResultsItem; - - invoke-direct {v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$SearchNoResultsItem;->()V - - sput-object v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$SearchNoResultsItem;->INSTANCE:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$SearchNoResultsItem; - - return-void -.end method - -.method public constructor ()V - .locals 0 - - invoke-direct {p0}, Ljava/lang/Object;->()V - - return-void -.end method - - -# virtual methods -.method public getKey()Ljava/lang/String; - .locals 1 - - const-string v0, "SEARCH_NO_RESULTS" - - return-object v0 -.end method - -.method public getType()I - .locals 1 - - const/4 v0, -0x1 - - return v0 -.end method diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2.smali deleted file mode 100644 index 652447380f..0000000000 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2.smali +++ /dev/null @@ -1,92 +0,0 @@ -.class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2; -.super Lt/u/b/k; -.source "WidgetGuildInviteShare.kt" - -# interfaces -.implements Lkotlin/jvm/functions/Function1; - - -# annotations -.annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->configureUI(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;)V -.end annotation - -.annotation system Ldalvik/annotation/InnerClass; - accessFlags = 0x19 - name = null -.end annotation - -.annotation system Ldalvik/annotation/Signature; - value = { - "Lt/u/b/k;", - "Lkotlin/jvm/functions/Function1<", - "Lcom/discord/models/domain/ModelChannel;", - "Lkotlin/Unit;", - ">;" - } -.end annotation - - -# instance fields -.field public final synthetic $invite:Lcom/discord/models/domain/ModelInvite; - -.field public final synthetic $viewState:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded; - -.field public final synthetic this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare; - - -# direct methods -.method public constructor (Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelInvite;)V - .locals 0 - - iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare; - - iput-object p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2;->$viewState:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded; - - iput-object p3, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2;->$invite:Lcom/discord/models/domain/ModelInvite; - - const/4 p1, 0x1 - - invoke-direct {p0, p1}, Lt/u/b/k;->(I)V - - return-void -.end method - - -# virtual methods -.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object; - .locals 0 - - check-cast p1, Lcom/discord/models/domain/ModelChannel; - - invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2;->invoke(Lcom/discord/models/domain/ModelChannel;)V - - sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit; - - return-object p1 -.end method - -.method public final invoke(Lcom/discord/models/domain/ModelChannel;)V - .locals 3 - - if-eqz p1, :cond_0 - - iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare; - - iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2;->$viewState:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded; - - iget-object v2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2;->$invite:Lcom/discord/models/domain/ModelInvite; - - invoke-static {v0, p1, v1, v2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$sendInvite(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/models/domain/ModelChannel;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelInvite;)V - - return-void - - :cond_0 - const-string p1, "channel" - - invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V - - const/4 p1, 0x0 - - throw p1 -.end method diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3.smali index a6a66cdcb1..bfc58f19f3 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3.smali @@ -1,9 +1,9 @@ .class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3; -.super Ljava/lang/Object; +.super Lt/u/b/k; .source "WidgetGuildInviteShare.kt" # interfaces -.implements Landroid/view/View$OnClickListener; +.implements Lkotlin/jvm/functions/Function1; # annotations @@ -16,48 +16,77 @@ name = null .end annotation +.annotation system Ldalvik/annotation/Signature; + value = { + "Lt/u/b/k;", + "Lkotlin/jvm/functions/Function1<", + "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;", + "Lkotlin/Unit;", + ">;" + } +.end annotation + # instance fields .field public final synthetic $invite:Lcom/discord/models/domain/ModelInvite; +.field public final synthetic $viewState:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded; + .field public final synthetic this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare; # direct methods -.method public constructor (Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/models/domain/ModelInvite;)V +.method public constructor (Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelInvite;)V .locals 0 iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare; - iput-object p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3;->$invite:Lcom/discord/models/domain/ModelInvite; + iput-object p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3;->$viewState:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded; - invoke-direct {p0}, Ljava/lang/Object;->()V + iput-object p3, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3;->$invite:Lcom/discord/models/domain/ModelInvite; + + const/4 p1, 0x1 + + invoke-direct {p0, p1}, Lt/u/b/k;->(I)V return-void .end method # virtual methods -.method public final onClick(Landroid/view/View;)V - .locals 2 +.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object; + .locals 0 - const-string v0, "it" + check-cast p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem; - const-string v1, "it.context" + invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3;->invoke(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;)V - invoke-static {p1, v0, v1}, Le/e/b/a/a;->a(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context; + sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit; - move-result-object p1 + return-object p1 +.end method - iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3;->$invite:Lcom/discord/models/domain/ModelInvite; +.method public final invoke(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;)V + .locals 3 - iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare; + if-eqz p1, :cond_0 - invoke-static {v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$getMostRecentIntent$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Landroid/content/Intent; + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare; - move-result-object v1 + iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3;->$viewState:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded; - invoke-static {p1, v0, v1}, Lcom/discord/widgets/guilds/invite/GuildInviteUiHelperKt;->copyLinkClick(Landroid/content/Context;Lcom/discord/models/domain/ModelInvite;Landroid/content/Intent;)V + iget-object v2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3;->$invite:Lcom/discord/models/domain/ModelInvite; + + invoke-static {v0, p1, v1, v2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$sendInvite(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelInvite;)V return-void + + :cond_0 + const-string p1, "item" + + invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V + + const/4 p1, 0x0 + + throw p1 .end method diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4.smali index a87901b101..2ca09a8470 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4.smali @@ -18,18 +18,18 @@ # instance fields -.field public final synthetic $widgetInviteModel:Lcom/discord/widgets/guilds/invite/WidgetInviteModel; +.field public final synthetic $invite:Lcom/discord/models/domain/ModelInvite; .field public final synthetic this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare; # direct methods -.method public constructor (Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/widgets/guilds/invite/WidgetInviteModel;)V +.method public constructor (Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/models/domain/ModelInvite;)V .locals 0 iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare; - iput-object p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4;->$widgetInviteModel:Lcom/discord/widgets/guilds/invite/WidgetInviteModel; + iput-object p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4;->$invite:Lcom/discord/models/domain/ModelInvite; invoke-direct {p0}, Ljava/lang/Object;->()V @@ -41,87 +41,23 @@ .method public final onClick(Landroid/view/View;)V .locals 2 - iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare; + const-string v0, "it" - invoke-static {p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$getNeverExpireSwitch$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Lcom/discord/views/CheckedSetting; + const-string v1, "it.context" + + invoke-static {p1, v0, v1}, Le/e/b/a/a;->a(Landroid/view/View;Ljava/lang/String;Ljava/lang/String;)Landroid/content/Context; move-result-object p1 - invoke-virtual {p1}, Lcom/discord/views/CheckedSetting;->toggle()V - - iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4;->$widgetInviteModel:Lcom/discord/widgets/guilds/invite/WidgetInviteModel; - - invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getSettings()Lcom/discord/models/domain/ModelInvite$Settings; - - move-result-object p1 - - if-eqz p1, :cond_1 - - iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare; - - invoke-static {v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$getViewModel$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel; - - move-result-object v0 + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4;->$invite:Lcom/discord/models/domain/ModelInvite; iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare; - invoke-static {v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$getNeverExpireSwitch$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Lcom/discord/views/CheckedSetting; + invoke-static {v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$getMostRecentIntent$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Landroid/content/Intent; move-result-object v1 - invoke-virtual {v1}, Lcom/discord/views/CheckedSetting;->isChecked()Z + invoke-static {p1, v0, v1}, Lcom/discord/widgets/guilds/invite/GuildInviteUiHelperKt;->copyLinkClick(Landroid/content/Context;Lcom/discord/models/domain/ModelInvite;Landroid/content/Intent;)V - move-result v1 - - if-eqz v1, :cond_0 - - const/4 v1, 0x0 - - goto :goto_0 - - :cond_0 - const v1, 0x15180 - - :goto_0 - invoke-virtual {p1, v1}, Lcom/discord/models/domain/ModelInvite$Settings;->mergeMaxAge(I)Lcom/discord/models/domain/ModelInvite$Settings; - - move-result-object p1 - - const-string v1, "settings.mergeMaxAge(\n \u2026ngs.ONE_DAY\n )" - - invoke-static {p1, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-virtual {v0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->updateInviteSettings(Lcom/discord/models/domain/ModelInvite$Settings;)V - - :cond_1 - iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4;->$widgetInviteModel:Lcom/discord/widgets/guilds/invite/WidgetInviteModel; - - invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getTargetChannel()Lcom/discord/models/domain/ModelChannel; - - move-result-object p1 - - if-eqz p1, :cond_2 - - invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J - - move-result-wide v0 - - invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - - move-result-object p1 - - invoke-virtual {p1}, Ljava/lang/Number;->longValue()J - - move-result-wide v0 - - iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare; - - invoke-static {p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$getViewModel$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel; - - move-result-object p1 - - invoke-virtual {p1, v0, v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->generateInviteLink(J)V - - :cond_2 return-void .end method diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5.smali index 39b94542e1..d0ed9b410b 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5.smali @@ -18,18 +18,18 @@ # instance fields -.field public final synthetic $invite:Lcom/discord/models/domain/ModelInvite; +.field public final synthetic $widgetInviteModel:Lcom/discord/widgets/guilds/invite/WidgetInviteModel; .field public final synthetic this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare; # direct methods -.method public constructor (Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/models/domain/ModelInvite;)V +.method public constructor (Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/widgets/guilds/invite/WidgetInviteModel;)V .locals 0 iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare; - iput-object p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5;->$invite:Lcom/discord/models/domain/ModelInvite; + iput-object p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5;->$widgetInviteModel:Lcom/discord/widgets/guilds/invite/WidgetInviteModel; invoke-direct {p0}, Ljava/lang/Object;->()V @@ -39,20 +39,89 @@ # virtual methods .method public final onClick(Landroid/view/View;)V - .locals 1 + .locals 2 - iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5;->$invite:Lcom/discord/models/domain/ModelInvite; + iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare; - if-eqz p1, :cond_0 + invoke-static {p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$getNeverExpireSwitch$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Lcom/discord/views/CheckedSetting; + + move-result-object p1 + + invoke-virtual {p1}, Lcom/discord/views/CheckedSetting;->toggle()V + + iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5;->$widgetInviteModel:Lcom/discord/widgets/guilds/invite/WidgetInviteModel; + + invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getSettings()Lcom/discord/models/domain/ModelInvite$Settings; + + move-result-object p1 + + if-eqz p1, :cond_1 iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare; - invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context; + invoke-static {v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$getViewModel$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel; move-result-object v0 - invoke-static {v0, p1}, Lcom/discord/widgets/guilds/invite/GuildInviteUiHelperKt;->shareLinkClick(Landroid/content/Context;Lcom/discord/models/domain/ModelInvite;)V + iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare; + + invoke-static {v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$getNeverExpireSwitch$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Lcom/discord/views/CheckedSetting; + + move-result-object v1 + + invoke-virtual {v1}, Lcom/discord/views/CheckedSetting;->isChecked()Z + + move-result v1 + + if-eqz v1, :cond_0 + + const/4 v1, 0x0 + + goto :goto_0 :cond_0 + const v1, 0x15180 + + :goto_0 + invoke-virtual {p1, v1}, Lcom/discord/models/domain/ModelInvite$Settings;->mergeMaxAge(I)Lcom/discord/models/domain/ModelInvite$Settings; + + move-result-object p1 + + const-string v1, "settings.mergeMaxAge(\n \u2026ngs.ONE_DAY\n )" + + invoke-static {p1, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {v0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->updateInviteSettings(Lcom/discord/models/domain/ModelInvite$Settings;)V + + :cond_1 + iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5;->$widgetInviteModel:Lcom/discord/widgets/guilds/invite/WidgetInviteModel; + + invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getTargetChannel()Lcom/discord/models/domain/ModelChannel; + + move-result-object p1 + + if-eqz p1, :cond_2 + + invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J + + move-result-wide v0 + + invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object p1 + + invoke-virtual {p1}, Ljava/lang/Number;->longValue()J + + move-result-wide v0 + + iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare; + + invoke-static {p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->access$getViewModel$p(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel; + + move-result-object p1 + + invoke-virtual {p1, v0, v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->generateInviteLink(J)V + + :cond_2 return-void .end method diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$6.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$6.smali new file mode 100644 index 0000000000..63911bb576 --- /dev/null +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$6.smali @@ -0,0 +1,58 @@ +.class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$6; +.super Ljava/lang/Object; +.source "WidgetGuildInviteShare.kt" + +# interfaces +.implements Landroid/view/View$OnClickListener; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->configureUI(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;)V +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x19 + name = null +.end annotation + + +# instance fields +.field public final synthetic $invite:Lcom/discord/models/domain/ModelInvite; + +.field public final synthetic this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare; + + +# direct methods +.method public constructor (Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/models/domain/ModelInvite;)V + .locals 0 + + iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$6;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare; + + iput-object p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$6;->$invite:Lcom/discord/models/domain/ModelInvite; + + invoke-direct {p0}, Ljava/lang/Object;->()V + + return-void +.end method + + +# virtual methods +.method public final onClick(Landroid/view/View;)V + .locals 1 + + iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$6;->$invite:Lcom/discord/models/domain/ModelInvite; + + if-eqz p1, :cond_0 + + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$6;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare; + + invoke-virtual {v0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context; + + move-result-object v0 + + invoke-static {v0, p1}, Lcom/discord/widgets/guilds/invite/GuildInviteUiHelperKt;->shareLinkClick(Landroid/content/Context;Lcom/discord/models/domain/ModelInvite;)V + + :cond_0 + return-void +.end method diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$sendInvite$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$sendInvite$1.smali deleted file mode 100644 index 769241ac13..0000000000 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare$sendInvite$1.smali +++ /dev/null @@ -1,88 +0,0 @@ -.class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$sendInvite$1; -.super Lt/u/b/k; -.source "WidgetGuildInviteShare.kt" - -# interfaces -.implements Lkotlin/jvm/functions/Function1; - - -# annotations -.annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->sendInvite(Lcom/discord/models/domain/ModelChannel;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelInvite;)V -.end annotation - -.annotation system Ldalvik/annotation/InnerClass; - accessFlags = 0x19 - name = null -.end annotation - -.annotation system Ldalvik/annotation/Signature; - value = { - "Lt/u/b/k;", - "Lkotlin/jvm/functions/Function1<", - "Lcom/discord/utilities/messagesend/MessageResult;", - "Lkotlin/Unit;", - ">;" - } -.end annotation - - -# instance fields -.field public final synthetic $invite:Lcom/discord/models/domain/ModelInvite; - - -# direct methods -.method public constructor (Lcom/discord/models/domain/ModelInvite;)V - .locals 0 - - iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$sendInvite$1;->$invite:Lcom/discord/models/domain/ModelInvite; - - const/4 p1, 0x1 - - invoke-direct {p0, p1}, Lt/u/b/k;->(I)V - - return-void -.end method - - -# virtual methods -.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object; - .locals 0 - - check-cast p1, Lcom/discord/utilities/messagesend/MessageResult; - - invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$sendInvite$1;->invoke(Lcom/discord/utilities/messagesend/MessageResult;)V - - sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit; - - return-object p1 -.end method - -.method public final invoke(Lcom/discord/utilities/messagesend/MessageResult;)V - .locals 3 - - instance-of v0, p1, Lcom/discord/utilities/messagesend/MessageResult$Success; - - if-eqz v0, :cond_0 - - sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion; - - invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getAnalytics()Lcom/discord/stores/StoreAnalytics; - - move-result-object v0 - - iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$sendInvite$1;->$invite:Lcom/discord/models/domain/ModelInvite; - - check-cast p1, Lcom/discord/utilities/messagesend/MessageResult$Success; - - invoke-virtual {p1}, Lcom/discord/utilities/messagesend/MessageResult$Success;->getMessage()Lcom/discord/models/domain/ModelMessage; - - move-result-object p1 - - const-string v2, "Guild Create Invite Suggestion" - - invoke-virtual {v0, v1, p1, v2}, Lcom/discord/stores/StoreAnalytics;->inviteSent(Lcom/discord/models/domain/ModelInvite;Lcom/discord/models/domain/ModelMessage;Ljava/lang/String;)V - - :cond_0 - return-void -.end method diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.smali index cd15abaf41..d4c5fe5b42 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.smali @@ -6,8 +6,7 @@ # annotations .annotation system Ldalvik/annotation/MemberClasses; value = { - Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;, - Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$SearchNoResultsItem;, + Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter;, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$Companion; } @@ -549,10 +548,10 @@ throw p0 .end method -.method public static final synthetic access$sendInvite(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/models/domain/ModelChannel;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelInvite;)V +.method public static final synthetic access$sendInvite(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelInvite;)V .locals 0 - invoke-direct {p0, p1, p2, p3}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->sendInvite(Lcom/discord/models/domain/ModelChannel;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelInvite;)V + invoke-direct {p0, p1, p2, p3}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->sendInvite(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelInvite;)V return-void .end method @@ -574,317 +573,373 @@ .end method .method private final configureUI(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;)V - .locals 12 + .locals 16 - invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;->getWidgetInviteModel()Lcom/discord/widgets/guilds/invite/WidgetInviteModel; + move-object/from16 v0, p0 - move-result-object v0 - - invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;->getInviteSuggestionItems()Ljava/util/List; + invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;->getWidgetInviteModel()Lcom/discord/widgets/guilds/invite/WidgetInviteModel; move-result-object v1 - invoke-virtual {v0}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getInvite()Lcom/discord/models/domain/ModelInvite; + invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;->getInviteSuggestionItems()Ljava/util/List; move-result-object v2 - invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getSuggestionsFlipper()Lcom/discord/app/AppViewFlipper; + invoke-virtual {v1}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getInvite()Lcom/discord/models/domain/ModelInvite; move-result-object v3 - invoke-interface {v1}, Ljava/util/List;->isEmpty()Z + invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getSuggestionsFlipper()Lcom/discord/app/AppViewFlipper; + + move-result-object v4 + + invoke-interface {v2}, Ljava/util/List;->isEmpty()Z + + move-result v5 + + const/4 v6, 0x1 + + xor-int/2addr v5, v6 + + invoke-virtual {v4, v5}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V + + invoke-interface {v2}, Ljava/util/List;->size()I move-result v4 - const/4 v5, 0x1 + const/4 v5, 0x0 - xor-int/2addr v4, v5 + if-ne v4, v6, :cond_0 - invoke-virtual {v3, v4}, Lcom/discord/app/AppViewFlipper;->setDisplayedChild(I)V + invoke-static {v2}, Lt/q/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object; - invoke-interface {v1}, Ljava/util/List;->size()I + move-result-object v4 - move-result v3 + instance-of v4, v4, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$SearchNoResultsItem; - const/4 v4, 0x0 + if-eqz v4, :cond_0 - if-ne v3, v5, :cond_0 - - invoke-static {v1}, Lt/q/l;->firstOrNull(Ljava/util/List;)Ljava/lang/Object; - - move-result-object v3 - - instance-of v3, v3, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$SearchNoResultsItem; - - if-eqz v3, :cond_0 - - const/4 v3, 0x1 + const/4 v4, 0x1 goto :goto_0 :cond_0 - const/4 v3, 0x0 + const/4 v4, 0x0 :goto_0 - const/4 v6, 0x0 + const/4 v7, 0x0 - if-nez v3, :cond_1 + if-nez v4, :cond_1 goto :goto_1 :cond_1 - move-object v1, v6 + move-object v2, v7 :goto_1 - const/16 v3, 0xa - - if-eqz v1, :cond_3 - - new-instance v7, Ljava/util/ArrayList; - - invoke-static {v1, v3}, Le/k/a/b/e/p/g;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I - - move-result v8 - - invoke-direct {v7, v8}, Ljava/util/ArrayList;->(I)V - - invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; - - move-result-object v1 - - :goto_2 - invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z - - move-result v8 - - if-eqz v8, :cond_4 - - invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object; - - move-result-object v8 - - check-cast v8, Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload; - - if-eqz v8, :cond_2 - - check-cast v8, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem; - - invoke-interface {v7, v8}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z + if-eqz v2, :cond_2 goto :goto_2 :cond_2 - new-instance p1, Lt/l; + sget-object v2, Lt/q/o;->d:Lt/q/o; - const-string v0, "null cannot be cast to non-null type com.discord.widgets.guilds.invite.WidgetGuildInviteShare.ChannelItem" + :goto_2 + invoke-interface {v2}, Ljava/util/Collection;->isEmpty()Z - invoke-direct {p1, v0}, Lt/l;->(Ljava/lang/String;)V + move-result v4 - throw p1 + xor-int/2addr v4, v6 - :cond_3 - sget-object v7, Lt/q/o;->d:Lt/q/o; + if-eqz v4, :cond_a - :cond_4 - invoke-interface {v7}, Ljava/util/Collection;->isEmpty()Z + iget-boolean v4, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->hasTrackedSuggestionsViewed:Z - move-result v1 + if-nez v4, :cond_a - xor-int/2addr v1, v5 + invoke-virtual {v1}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getInvite()Lcom/discord/models/domain/ModelInvite; - if-eqz v1, :cond_7 + move-result-object v4 - iget-boolean v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->hasTrackedSuggestionsViewed:Z + if-eqz v4, :cond_3 - if-nez v1, :cond_7 + invoke-virtual {v4}, Lcom/discord/models/domain/ModelInvite;->getGuild()Lcom/discord/models/domain/ModelGuild; - invoke-virtual {v0}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getInvite()Lcom/discord/models/domain/ModelInvite; + move-result-object v4 - move-result-object v1 + if-eqz v4, :cond_3 - if-eqz v1, :cond_5 - - invoke-virtual {v1}, Lcom/discord/models/domain/ModelInvite;->getGuild()Lcom/discord/models/domain/ModelGuild; - - move-result-object v1 - - if-eqz v1, :cond_5 - - invoke-virtual {v1}, Lcom/discord/models/domain/ModelGuild;->getId()J + invoke-virtual {v4}, Lcom/discord/models/domain/ModelGuild;->getId()J move-result-wide v8 goto :goto_3 - :cond_5 + :cond_3 const-wide/16 v8, 0x0 :goto_3 - sget-object v1, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker; + sget-object v4, Lcom/discord/utilities/analytics/AnalyticsTracker;->INSTANCE:Lcom/discord/utilities/analytics/AnalyticsTracker; new-instance v10, Ljava/util/ArrayList; - invoke-static {v7, v3}, Le/k/a/b/e/p/g;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I + invoke-direct {v10}, Ljava/util/ArrayList;->()V - move-result v3 + invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; - invoke-direct {v10, v3}, Ljava/util/ArrayList;->(I)V - - invoke-interface {v7}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; - - move-result-object v3 + move-result-object v11 + :cond_4 :goto_4 - invoke-interface {v3}, Ljava/util/Iterator;->hasNext()Z + invoke-interface {v11}, Ljava/util/Iterator;->hasNext()Z - move-result v11 + move-result v12 - if-eqz v11, :cond_6 + if-eqz v12, :cond_5 - invoke-interface {v3}, Ljava/util/Iterator;->next()Ljava/lang/Object; + invoke-interface {v11}, Ljava/util/Iterator;->next()Ljava/lang/Object; - move-result-object v11 + move-result-object v12 - check-cast v11, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem; + instance-of v13, v12, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel; - invoke-virtual {v11}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->getChannel()Lcom/discord/models/domain/ModelChannel; + if-eqz v13, :cond_4 - move-result-object v11 - - invoke-interface {v10, v11}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z + invoke-interface {v10, v12}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z goto :goto_4 - :cond_6 - invoke-virtual {v1, v8, v9, v10}, Lcom/discord/utilities/analytics/AnalyticsTracker;->inviteSuggestionOpened(JLjava/util/List;)V + :cond_5 + new-instance v11, Ljava/util/ArrayList; - iput-boolean v5, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->hasTrackedSuggestionsViewed:Z + const/16 v12, 0xa + + invoke-static {v10, v12}, Le/k/a/b/e/p/g;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I + + move-result v13 + + invoke-direct {v11, v13}, Ljava/util/ArrayList;->(I)V + + invoke-interface {v10}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; + + move-result-object v10 + + :goto_5 + invoke-interface {v10}, Ljava/util/Iterator;->hasNext()Z + + move-result v13 + + if-eqz v13, :cond_6 + + invoke-interface {v10}, Ljava/util/Iterator;->next()Ljava/lang/Object; + + move-result-object v13 + + check-cast v13, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel; + + invoke-virtual {v13}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;->getChannel()Lcom/discord/models/domain/ModelChannel; + + move-result-object v13 + + invoke-interface {v11, v13}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z + + goto :goto_5 + + :cond_6 + new-instance v10, Ljava/util/ArrayList; + + invoke-direct {v10}, Ljava/util/ArrayList;->()V + + invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; + + move-result-object v13 :cond_7 - invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getEmptyResults()Landroid/view/View; + :goto_6 + invoke-interface {v13}, Ljava/util/Iterator;->hasNext()Z - move-result-object v1 + move-result v14 - invoke-interface {v7}, Ljava/util/List;->isEmpty()Z + if-eqz v14, :cond_8 - move-result v3 + invoke-interface {v13}, Ljava/util/Iterator;->next()Ljava/lang/Object; - const/4 v8, 0x2 + move-result-object v14 - invoke-static {v1, v3, v4, v8, v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V + instance-of v15, v14, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User; - invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getSuggestionRv()Landroidx/recyclerview/widget/RecyclerView; + if-eqz v15, :cond_7 - move-result-object v1 + invoke-interface {v10, v14}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z - invoke-interface {v7}, Ljava/util/Collection;->isEmpty()Z - - move-result v3 - - xor-int/2addr v3, v5 - - invoke-static {v1, v3, v4, v8, v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V - - iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->adapter:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter; - - const-string v3, "adapter" - - if-eqz v1, :cond_a - - invoke-virtual {v1, v7}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;->setData(Ljava/util/List;)V - - iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->adapter:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter; - - if-eqz v1, :cond_9 - - new-instance v3, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2; - - invoke-direct {v3, p0, p1, v2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$2;->(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelInvite;)V - - invoke-virtual {v1, v3}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter;->setOnClick(Lkotlin/jvm/functions/Function1;)V - - invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getBottomSheet()Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet; - - move-result-object v1 - - invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;->getWidgetInviteModel()Lcom/discord/widgets/guilds/invite/WidgetInviteModel; - - move-result-object p1 - - invoke-virtual {v1, p1}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->configureUi(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;)V - - invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getInviteLinkTv()Landroid/widget/TextView; - - move-result-object p1 - - invoke-direct {p0, v2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getInviteLink(Lcom/discord/models/domain/ModelInvite;)Ljava/lang/String; - - move-result-object v1 - - invoke-virtual {p1, v1}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V - - invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getInviteLinkTv()Landroid/widget/TextView; - - move-result-object p1 - - new-instance v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3; - - invoke-direct {v1, p0, v2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3;->(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/models/domain/ModelInvite;)V - - invoke-virtual {p1, v1}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V - - invoke-virtual {v0}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getSettings()Lcom/discord/models/domain/ModelInvite$Settings; - - move-result-object p1 - - if-eqz p1, :cond_8 - - invoke-virtual {p1}, Lcom/discord/models/domain/ModelInvite$Settings;->getMaxAge()I - - move-result p1 - - if-nez p1, :cond_8 - - const/4 v4, 0x1 + goto :goto_6 :cond_8 - invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getNeverExpireSwitch()Lcom/discord/views/CheckedSetting; + new-instance v13, Ljava/util/ArrayList; - move-result-object p1 + invoke-static {v10, v12}, Le/k/a/b/e/p/g;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I - invoke-virtual {p1, v4}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V + move-result v12 - invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getNeverExpireSwitch()Lcom/discord/views/CheckedSetting; + invoke-direct {v13, v12}, Ljava/util/ArrayList;->(I)V - move-result-object p1 + invoke-interface {v10}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; - new-instance v1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4; + move-result-object v10 - invoke-direct {v1, p0, v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4;->(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/widgets/guilds/invite/WidgetInviteModel;)V + :goto_7 + invoke-interface {v10}, Ljava/util/Iterator;->hasNext()Z - invoke-virtual {p1, v1}, Lcom/discord/views/CheckedSetting;->a(Landroid/view/View$OnClickListener;)V + move-result v12 - invoke-direct {p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getShareBtn()Landroid/widget/Button; + if-eqz v12, :cond_9 - move-result-object p1 + invoke-interface {v10}, Ljava/util/Iterator;->next()Ljava/lang/Object; - new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5; + move-result-object v12 - invoke-direct {v0, p0, v2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5;->(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/models/domain/ModelInvite;)V + check-cast v12, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User; - invoke-virtual {p1, v0}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V + invoke-virtual {v12}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;->getUser()Lcom/discord/models/domain/ModelUser; + + move-result-object v12 + + invoke-interface {v13, v12}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z + + goto :goto_7 + + :cond_9 + invoke-virtual {v4, v8, v9, v11, v13}, Lcom/discord/utilities/analytics/AnalyticsTracker;->inviteSuggestionOpened(JLjava/util/List;Ljava/util/List;)V + + iput-boolean v6, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->hasTrackedSuggestionsViewed:Z + + :cond_a + invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getEmptyResults()Landroid/view/View; + + move-result-object v4 + + invoke-interface {v2}, Ljava/util/List;->isEmpty()Z + + move-result v8 + + const/4 v9, 0x2 + + invoke-static {v4, v8, v5, v9, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V + + invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getSuggestionRv()Landroidx/recyclerview/widget/RecyclerView; + + move-result-object v4 + + invoke-interface {v2}, Ljava/util/Collection;->isEmpty()Z + + move-result v8 + + xor-int/2addr v8, v6 + + invoke-static {v4, v8, v5, v9, v7}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V + + iget-object v4, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->adapter:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter; + + const-string v8, "adapter" + + if-eqz v4, :cond_d + + invoke-virtual {v4, v2}, Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;->setData(Ljava/util/List;)V + + iget-object v2, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->adapter:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter; + + if-eqz v2, :cond_c + + new-instance v4, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3; + + move-object/from16 v7, p1 + + invoke-direct {v4, v0, v7, v3}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$3;->(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelInvite;)V + + invoke-virtual {v2, v4}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$PrivateChannelAdapter;->setOnClick(Lkotlin/jvm/functions/Function1;)V + + invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getBottomSheet()Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet; + + move-result-object v2 + + invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;->getWidgetInviteModel()Lcom/discord/widgets/guilds/invite/WidgetInviteModel; + + move-result-object v4 + + invoke-virtual {v2, v4}, Lcom/discord/widgets/guilds/invite/ViewInviteSettingsSheet;->configureUi(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;)V + + invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getInviteLinkTv()Landroid/widget/TextView; + + move-result-object v2 + + invoke-direct {v0, v3}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getInviteLink(Lcom/discord/models/domain/ModelInvite;)Ljava/lang/String; + + move-result-object v4 + + invoke-virtual {v2, v4}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + + invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getInviteLinkTv()Landroid/widget/TextView; + + move-result-object v2 + + new-instance v4, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4; + + invoke-direct {v4, v0, v3}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$4;->(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/models/domain/ModelInvite;)V + + invoke-virtual {v2, v4}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V + + invoke-virtual {v1}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getSettings()Lcom/discord/models/domain/ModelInvite$Settings; + + move-result-object v2 + + if-eqz v2, :cond_b + + invoke-virtual {v2}, Lcom/discord/models/domain/ModelInvite$Settings;->getMaxAge()I + + move-result v2 + + if-nez v2, :cond_b + + const/4 v5, 0x1 + + :cond_b + invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getNeverExpireSwitch()Lcom/discord/views/CheckedSetting; + + move-result-object v2 + + invoke-virtual {v2, v5}, Lcom/discord/views/CheckedSetting;->setChecked(Z)V + + invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getNeverExpireSwitch()Lcom/discord/views/CheckedSetting; + + move-result-object v2 + + new-instance v4, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5; + + invoke-direct {v4, v0, v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$5;->(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/widgets/guilds/invite/WidgetInviteModel;)V + + invoke-virtual {v2, v4}, Lcom/discord/views/CheckedSetting;->a(Landroid/view/View$OnClickListener;)V + + invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getShareBtn()Landroid/widget/Button; + + move-result-object v1 + + new-instance v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$6; + + invoke-direct {v2, v0, v3}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$configureUI$6;->(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;Lcom/discord/models/domain/ModelInvite;)V + + invoke-virtual {v1, v2}, Landroid/widget/Button;->setOnClickListener(Landroid/view/View$OnClickListener;)V return-void - :cond_9 - invoke-static {v3}, Lt/u/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V + :cond_c + invoke-static {v8}, Lt/u/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V - throw v6 + throw v7 - :cond_a - invoke-static {v3}, Lt/u/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V + :cond_d + invoke-static {v8}, Lt/u/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V - throw v6 + throw v7 .end method .method private final getBackgroundTint()Landroid/view/View; @@ -1210,153 +1265,71 @@ return-void .end method -.method private final sendInvite(Lcom/discord/models/domain/ModelChannel;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelInvite;)V - .locals 15 +.method private final sendInvite(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelInvite;)V + .locals 3 - move-object v0, p0 - - move-object/from16 v1, p3 - - invoke-direct {p0, v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getInviteLink(Lcom/discord/models/domain/ModelInvite;)Ljava/lang/String; - - move-result-object v14 - - sget-object v2, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion; - - invoke-virtual {v2}, Lcom/discord/stores/StoreStream$Companion;->getMessages()Lcom/discord/stores/StoreMessages; - - move-result-object v2 - - invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelChannel;->getId()J - - move-result-wide v3 - - invoke-virtual/range {p2 .. p2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;->getWidgetInviteModel()Lcom/discord/widgets/guilds/invite/WidgetInviteModel; - - move-result-object v5 - - invoke-virtual {v5}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getMe()Lcom/discord/models/domain/ModelUser; - - move-result-object v5 - - const-string v6, "inviteLink" - - invoke-static {v14, v6}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - - const/4 v7, 0x0 - - const/4 v8, 0x0 - - const/4 v9, 0x0 - - const/4 v10, 0x0 - - const/4 v11, 0x0 - - const/16 v12, 0xe0 - - const/4 v13, 0x0 - - move-object v6, v14 - - invoke-static/range {v2 .. v13}, Lcom/discord/stores/StoreMessages;->sendMessage$default(Lcom/discord/stores/StoreMessages;JLcom/discord/models/domain/ModelUser;Ljava/lang/String;Ljava/util/List;Ljava/util/List;Lcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/activity/ModelActivity;Lcom/discord/models/domain/ModelMessage$Activity;ILjava/lang/Object;)Lrx/Observable; - - move-result-object v2 - - const/4 v3, 0x0 - - const/4 v4, 0x1 - - invoke-static {v3, v4}, Le/a/b/k;->a(ZI)Lrx/Observable$c; - - move-result-object v3 - - invoke-virtual {v2, v3}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable; - - move-result-object v2 - - const-string v3, "StoreStream\n .get\u2026ormers.restSubscribeOn())" - - invoke-static {v2, v3}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-static {v2}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable; - - move-result-object v2 - - sget-object v3, Le/a/b/k;->a:Le/a/b/k; - - invoke-virtual {p0}, Landroidx/fragment/app/Fragment;->getContext()Landroid/content/Context; - - move-result-object v4 - - new-instance v5, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$sendInvite$1; - - invoke-direct {v5, v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$sendInvite$1;->(Lcom/discord/models/domain/ModelInvite;)V + instance-of v0, p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel; const/4 v1, 0x0 - invoke-virtual {v3, v4, v5, v1}, Le/a/b/k;->a(Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lrx/functions/Action1;)Lrx/Observable$c; + const-string v2, "viewModel" - move-result-object v3 + if-eqz v0, :cond_1 - invoke-virtual {v2, v3}, Lrx/Observable;->a(Lrx/Observable$c;)Lrx/Observable; + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->viewModel:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel; - invoke-virtual/range {p2 .. p2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;->getSentInvites()Ljava/util/Map; + if-eqz v0, :cond_0 - move-result-object v2 + check-cast p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel; - invoke-interface {v2, v14}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;->getChannel()Lcom/discord/models/domain/ModelChannel; - move-result-object v3 + move-result-object p1 - if-eqz v3, :cond_0 + invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J + + move-result-wide v1 + + invoke-virtual {v0, v1, v2, p2, p3}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->sendInviteToChannel(JLcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelInvite;)V goto :goto_0 :cond_0 - sget-object v3, Lt/q/q;->d:Lt/q/q; - - :goto_0 - check-cast v3, Ljava/util/Set; - - invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelChannel;->getId()J - - move-result-wide v4 - - invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - - move-result-object v4 - - invoke-static {v3, v4}, Le/k/a/b/e/p/g;->plus(Ljava/util/Set;Ljava/lang/Object;)Ljava/util/Set; - - move-result-object v3 - - invoke-static {v14, v3}, Ljava/util/Collections;->singletonMap(Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map; - - move-result-object v3 - - const-string v4, "java.util.Collections.si\u2026(pair.first, pair.second)" - - invoke-static {v3, v4}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-static {v2, v3}, Lt/q/l;->plus(Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map; - - move-result-object v2 - - iget-object v3, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->viewModel:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel; - - if-eqz v3, :cond_1 - - invoke-virtual {v3, v2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->updateSentInvites(Ljava/util/Map;)V - - return-void - - :cond_1 - const-string v2, "viewModel" - invoke-static {v2}, Lt/u/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V throw v1 + + :cond_1 + instance-of v0, p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User; + + if-eqz v0, :cond_3 + + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->viewModel:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel; + + if-eqz v0, :cond_2 + + check-cast p1, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User; + + invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;->getUser()Lcom/discord/models/domain/ModelUser; + + move-result-object p1 + + invoke-virtual {p1}, Lcom/discord/models/domain/ModelUser;->getId()J + + move-result-wide v1 + + invoke-virtual {v0, v1, v2, p2, p3}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->sendInviteToUser(JLcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelInvite;)V + + goto :goto_0 + + :cond_2 + invoke-static {v2}, Lt/u/b/j;->throwUninitializedPropertyAccessException(Ljava/lang/String;)V + + throw v1 + + :cond_3 + :goto_0 + return-void .end method diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$1.smali index 0c0654795f..a6a6a1718f 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$1.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$1.smali @@ -8,7 +8,7 @@ # annotations .annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->(Lcom/discord/stores/StoreInviteSettings;Lcom/discord/stores/StoreUser;Lcom/discord/widgets/guilds/invite/InviteGenerator;Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;Landroid/content/res/Resources;Z)V + value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->(Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreInviteSettings;Lcom/discord/stores/StoreUser;Lcom/discord/widgets/guilds/invite/InviteGenerator;Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;Landroid/content/res/Resources;Z)V .end annotation .annotation system Ldalvik/annotation/InnerClass; diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$2.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$2.smali index 9947148ac1..d252439157 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$2.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$2.smali @@ -8,7 +8,7 @@ # annotations .annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->(Lcom/discord/stores/StoreInviteSettings;Lcom/discord/stores/StoreUser;Lcom/discord/widgets/guilds/invite/InviteGenerator;Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;Landroid/content/res/Resources;Z)V + value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->(Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreInviteSettings;Lcom/discord/stores/StoreUser;Lcom/discord/widgets/guilds/invite/InviteGenerator;Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;Landroid/content/res/Resources;Z)V .end annotation .annotation system Ldalvik/annotation/InnerClass; diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded.smali index 04555691f8..e00608700a 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded.smali @@ -19,7 +19,7 @@ .annotation system Ldalvik/annotation/Signature; value = { "Ljava/util/List<", - "Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;", + "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;", ">;" } .end annotation @@ -51,7 +51,7 @@ "Lcom/discord/widgets/guilds/invite/WidgetInviteModel;", "Ljava/util/List<", "+", - "Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;", + "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;", ">;", "Ljava/lang/String;", "Ljava/util/Map<", @@ -183,7 +183,7 @@ value = { "()", "Ljava/util/List<", - "Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;", + "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;", ">;" } .end annotation @@ -227,7 +227,7 @@ "Lcom/discord/widgets/guilds/invite/WidgetInviteModel;", "Ljava/util/List<", "+", - "Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;", + "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;", ">;", "Ljava/lang/String;", "Ljava/util/Map<", @@ -356,7 +356,7 @@ value = { "()", "Ljava/util/List<", - "Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload;", + "Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;", ">;" } .end annotation diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeViewStateFromStores$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeViewStateFromStores$1.smali index 24028872d9..885d34cb03 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeViewStateFromStores$1.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeViewStateFromStores$1.smali @@ -56,7 +56,7 @@ # virtual methods .method public final call(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;Ljava/util/List;Ljava/lang/String;Ljava/util/Map;Lkotlin/Unit;)Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded; - .locals 6 + .locals 9 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -194,11 +194,27 @@ goto :goto_4 :cond_5 - instance-of v4, v4, Lcom/discord/widgets/guilds/invite/InviteSuggestion$User; + instance-of v5, v4, Lcom/discord/widgets/guilds/invite/InviteSuggestion$User; - if-eqz v4, :cond_6 + if-eqz v5, :cond_6 - const/4 v4, 0x0 + check-cast v4, Lcom/discord/widgets/guilds/invite/InviteSuggestion$User; + + invoke-virtual {v4}, Lcom/discord/widgets/guilds/invite/InviteSuggestion$User;->getUser()Lcom/discord/models/domain/ModelUser; + + move-result-object v4 + + invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String; + + move-result-object v4 + + const-string v5, "inviteSuggestion.user.username" + + invoke-static {v4, v5}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-static {v4, p3, v1}, Lt/a0/s;->contains(Ljava/lang/CharSequence;Ljava/lang/CharSequence;Z)Z + + move-result v4 :goto_4 if-eqz v4, :cond_4 @@ -218,46 +234,157 @@ move-object p2, v2 :goto_5 - invoke-interface {p2}, Ljava/util/Collection;->isEmpty()Z + invoke-virtual {p1}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getDms()Ljava/util/List; - move-result v2 + move-result-object v2 - xor-int/2addr v1, v2 + new-instance v3, Ljava/util/ArrayList; - if-nez v1, :cond_b + const/16 v4, 0xa - if-eqz p3, :cond_8 + invoke-static {v2, v4}, Le/k/a/b/e/p/g;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I - invoke-static {p3}, Lt/a0/n;->isBlank(Ljava/lang/CharSequence;)Z + move-result v5 - move-result v1 + invoke-direct {v3, v5}, Ljava/util/ArrayList;->(I)V - if-eqz v1, :cond_9 + invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; - :cond_8 - const/4 v0, 0x1 + move-result-object v2 - :cond_9 - if-eqz v0, :cond_a + :goto_6 + invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z + + move-result v5 + + if-eqz v5, :cond_8 + + invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object; + + move-result-object v5 + + check-cast v5, Lcom/discord/models/domain/ModelChannel; + + invoke-virtual {v5}, Lcom/discord/models/domain/ModelChannel;->getRecipients()Ljava/util/List; + + move-result-object v6 + + invoke-interface {v6, v0}, Ljava/util/List;->get(I)Ljava/lang/Object; + + move-result-object v6 + + const-string v7, "dm.recipients[0]" + + invoke-static {v6, v7}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + check-cast v6, Lcom/discord/models/domain/ModelUser; + + invoke-virtual {v6}, Lcom/discord/models/domain/ModelUser;->getId()J + + move-result-wide v6 + + invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v6 + + invoke-virtual {v5}, Lcom/discord/models/domain/ModelChannel;->getId()J + + move-result-wide v7 + + invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v5 + + new-instance v7, Lkotlin/Pair; + + invoke-direct {v7, v6, v5}, Lkotlin/Pair;->(Ljava/lang/Object;Ljava/lang/Object;)V + + invoke-interface {v3, v7}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z goto :goto_6 + :cond_8 + invoke-interface {v3}, Ljava/util/Collection;->size()I + + move-result v2 + + if-eqz v2, :cond_a + + if-eq v2, v1, :cond_9 + + new-instance v2, Ljava/util/LinkedHashMap; + + invoke-interface {v3}, Ljava/util/Collection;->size()I + + move-result v5 + + invoke-static {v5}, Lt/q/l;->mapCapacity(I)I + + move-result v5 + + invoke-direct {v2, v5}, Ljava/util/LinkedHashMap;->(I)V + + invoke-static {v3, v2}, Lt/q/l;->toMap(Ljava/lang/Iterable;Ljava/util/Map;)Ljava/util/Map; + + goto :goto_7 + + :cond_9 + invoke-interface {v3, v0}, Ljava/util/List;->get(I)Ljava/lang/Object; + + move-result-object v2 + + check-cast v2, Lkotlin/Pair; + + invoke-static {v2}, Le/k/a/b/e/p/g;->mapOf(Lkotlin/Pair;)Ljava/util/Map; + + move-result-object v2 + + goto :goto_7 + :cond_a - sget-object p2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$SearchNoResultsItem;->INSTANCE:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$SearchNoResultsItem; + invoke-static {}, Lt/q/l;->emptyMap()Ljava/util/Map; + + move-result-object v2 + + :goto_7 + invoke-interface {p2}, Ljava/util/Collection;->isEmpty()Z + + move-result v3 + + xor-int/2addr v3, v1 + + if-nez v3, :cond_e + + if-eqz p3, :cond_b + + invoke-static {p3}, Lt/a0/n;->isBlank(Ljava/lang/CharSequence;)Z + + move-result v3 + + if-eqz v3, :cond_c + + :cond_b + const/4 v0, 0x1 + + :cond_c + if-eqz v0, :cond_d + + goto :goto_8 + + :cond_d + sget-object p2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem;->SearchNoResultsItem:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$SearchNoResultsItem; invoke-static {p2}, Le/k/a/b/e/p/g;->listOf(Ljava/lang/Object;)Ljava/util/List; move-result-object p2 - goto :goto_8 + goto :goto_b - :cond_b - :goto_6 + :cond_e + :goto_8 new-instance v0, Ljava/util/ArrayList; - const/16 v1, 0xa - - invoke-static {p2, v1}, Le/k/a/b/e/p/g;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I + invoke-static {p2, v4}, Le/k/a/b/e/p/g;->collectionSizeOrDefault(Ljava/lang/Iterable;I)I move-result v1 @@ -267,12 +394,12 @@ move-result-object p2 - :goto_7 + :goto_9 invoke-interface {p2}, Ljava/util/Iterator;->hasNext()Z move-result v1 - if-eqz v1, :cond_e + if-eqz v1, :cond_11 invoke-interface {p2}, Ljava/util/Iterator;->next()Ljava/lang/Object; @@ -280,17 +407,17 @@ check-cast v1, Lcom/discord/widgets/guilds/invite/InviteSuggestion; - instance-of v2, v1, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel; + instance-of v3, v1, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel; - if-eqz v2, :cond_c + if-eqz v3, :cond_f - new-instance v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem; + new-instance v3, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel; check-cast v1, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel; invoke-virtual {v1}, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;->getChannel()Lcom/discord/models/domain/ModelChannel; - move-result-object v3 + move-result-object v4 invoke-virtual {v1}, Lcom/discord/widgets/guilds/invite/InviteSuggestion$Channel;->getChannel()Lcom/discord/models/domain/ModelChannel; @@ -298,9 +425,9 @@ invoke-virtual {v1}, Lcom/discord/models/domain/ModelChannel;->getId()J - move-result-wide v4 + move-result-wide v5 - invoke-static {v4, v5}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; move-result-object v1 @@ -308,42 +435,61 @@ move-result v1 - invoke-direct {v2, v3, v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$ChannelItem;->(Lcom/discord/models/domain/ModelChannel;Z)V + invoke-direct {v3, v4, v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$Channel;->(Lcom/discord/models/domain/ModelChannel;Z)V - invoke-interface {v0, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z + goto :goto_a - goto :goto_7 + :cond_f + instance-of v3, v1, Lcom/discord/widgets/guilds/invite/InviteSuggestion$User; - :cond_c - instance-of p1, v1, Lcom/discord/widgets/guilds/invite/InviteSuggestion$User; + if-eqz v3, :cond_10 - if-eqz p1, :cond_d + new-instance v3, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User; - new-instance p1, Lt/h; + check-cast v1, Lcom/discord/widgets/guilds/invite/InviteSuggestion$User; - const-string p2, "An operation is not implemented: " + invoke-virtual {v1}, Lcom/discord/widgets/guilds/invite/InviteSuggestion$User;->getUser()Lcom/discord/models/domain/ModelUser; - const-string p3, "unsupported suggestion type" + move-result-object v4 - invoke-static {p2, p3}, Le/e/b/a/a;->a(Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + invoke-virtual {v1}, Lcom/discord/widgets/guilds/invite/InviteSuggestion$User;->getUser()Lcom/discord/models/domain/ModelUser; - move-result-object p2 + move-result-object v1 - invoke-direct {p1, p2}, Lt/h;->(Ljava/lang/String;)V + invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J - throw p1 + move-result-wide v5 - :cond_d + invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v1 + + invoke-interface {v2, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + + move-result-object v1 + + invoke-static {p5, v1}, Lt/q/l;->contains(Ljava/lang/Iterable;Ljava/lang/Object;)Z + + move-result v1 + + invoke-direct {v3, v4, v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare$InviteSuggestionItem$User;->(Lcom/discord/models/domain/ModelUser;Z)V + + :goto_a + invoke-interface {v0, v3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z + + goto :goto_9 + + :cond_10 new-instance p1, Lt/g; invoke-direct {p1}, Lt/g;->()V throw p1 - :cond_e + :cond_11 move-object p2, v0 - :goto_8 + :goto_b new-instance p5, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded; const-string v0, "widgetInviteModel" diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeWidgetInviteViewModel$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeWidgetInviteViewModel$1.smali index 703cf64275..7c8dd1ece1 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeWidgetInviteViewModel$1.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeWidgetInviteViewModel$1.smali @@ -3,7 +3,7 @@ .source "WidgetGuildInviteShareViewModel.kt" # interfaces -.implements Lrx/functions/Func5; +.implements Lrx/functions/Func6; # annotations @@ -28,12 +28,14 @@ "Ljava/lang/Object;", "T5:", "Ljava/lang/Object;", + "T6:", + "Ljava/lang/Object;", "R:", "Ljava/lang/Object;", ">", "Ljava/lang/Object;", - "Lrx/functions/Func5<", - "TT1;TT2;TT3;TT4;TT5;TR;>;" + "Lrx/functions/Func6<", + "TT1;TT2;TT3;TT4;TT5;TT6;TR;>;" } .end annotation @@ -65,8 +67,8 @@ # virtual methods -.method public final call(Lcom/discord/models/domain/ModelInvite$Settings;Ljava/util/Map;Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;Ljava/lang/Long;Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/guilds/invite/WidgetInviteModel; - .locals 6 +.method public final call(Lcom/discord/models/domain/ModelInvite$Settings;Ljava/util/Map;Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;Ljava/lang/Long;Lcom/discord/models/domain/ModelUser;Ljava/util/List;)Lcom/discord/widgets/guilds/invite/WidgetInviteModel; + .locals 7 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -79,7 +81,10 @@ "Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;", "Ljava/lang/Long;", "Lcom/discord/models/domain/ModelUser;", - ")", + "Ljava/util/List<", + "+", + "Lcom/discord/models/domain/ModelChannel;", + ">;)", "Lcom/discord/widgets/guilds/invite/WidgetInviteModel;" } .end annotation @@ -102,6 +107,10 @@ invoke-static {p5, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + const-string v1, "dms" + + invoke-static {p6, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + move-object v1, p1 move-object v2, p2 @@ -112,14 +121,16 @@ move-object v5, p5 - invoke-virtual/range {v0 .. v5}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel$Companion;->create(Lcom/discord/models/domain/ModelInvite$Settings;Ljava/util/Map;Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;Ljava/lang/Long;Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/guilds/invite/WidgetInviteModel; + move-object v6, p6 + + invoke-virtual/range {v0 .. v6}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel$Companion;->create(Lcom/discord/models/domain/ModelInvite$Settings;Ljava/util/Map;Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;Ljava/lang/Long;Lcom/discord/models/domain/ModelUser;Ljava/util/List;)Lcom/discord/widgets/guilds/invite/WidgetInviteModel; move-result-object p1 return-object p1 .end method -.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; +.method public bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .locals 0 check-cast p1, Lcom/discord/models/domain/ModelInvite$Settings; @@ -132,7 +143,9 @@ check-cast p5, Lcom/discord/models/domain/ModelUser; - invoke-virtual/range {p0 .. p5}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeWidgetInviteViewModel$1;->call(Lcom/discord/models/domain/ModelInvite$Settings;Ljava/util/Map;Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;Ljava/lang/Long;Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/guilds/invite/WidgetInviteModel; + check-cast p6, Ljava/util/List; + + invoke-virtual/range {p0 .. p6}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeWidgetInviteViewModel$1;->call(Lcom/discord/models/domain/ModelInvite$Settings;Ljava/util/Map;Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;Ljava/lang/Long;Lcom/discord/models/domain/ModelUser;Ljava/util/List;)Lcom/discord/widgets/guilds/invite/WidgetInviteModel; move-result-object p1 diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1.smali new file mode 100644 index 0000000000..a78ddcce90 --- /dev/null +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1.smali @@ -0,0 +1,171 @@ +.class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1; +.super Lt/u/b/k; +.source "WidgetGuildInviteShareViewModel.kt" + +# interfaces +.implements Lkotlin/jvm/functions/Function1; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->sendInviteToChannel(JLcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelInvite;)V +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x19 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "Lt/u/b/k;", + "Lkotlin/jvm/functions/Function1<", + "Lcom/discord/utilities/messagesend/MessageResult;", + "Lkotlin/Unit;", + ">;" + } +.end annotation + + +# instance fields +.field public final synthetic $invite:Lcom/discord/models/domain/ModelInvite; + +.field public final synthetic $inviteLink:Ljava/lang/String; + +.field public final synthetic $viewState:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded; + +.field public final synthetic this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel; + + +# direct methods +.method public constructor (Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;Lcom/discord/models/domain/ModelInvite;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Ljava/lang/String;)V + .locals 0 + + iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel; + + iput-object p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1;->$invite:Lcom/discord/models/domain/ModelInvite; + + iput-object p3, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1;->$viewState:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded; + + iput-object p4, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1;->$inviteLink:Ljava/lang/String; + + const/4 p1, 0x1 + + invoke-direct {p0, p1}, Lt/u/b/k;->(I)V + + return-void +.end method + + +# virtual methods +.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object; + .locals 0 + + check-cast p1, Lcom/discord/utilities/messagesend/MessageResult; + + invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1;->invoke(Lcom/discord/utilities/messagesend/MessageResult;)V + + sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit; + + return-object p1 +.end method + +.method public final invoke(Lcom/discord/utilities/messagesend/MessageResult;)V + .locals 4 + + if-eqz p1, :cond_2 + + instance-of v0, p1, Lcom/discord/utilities/messagesend/MessageResult$Success; + + if-eqz v0, :cond_1 + + sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion; + + invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getAnalytics()Lcom/discord/stores/StoreAnalytics; + + move-result-object v0 + + iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1;->$invite:Lcom/discord/models/domain/ModelInvite; + + check-cast p1, Lcom/discord/utilities/messagesend/MessageResult$Success; + + invoke-virtual {p1}, Lcom/discord/utilities/messagesend/MessageResult$Success;->getMessage()Lcom/discord/models/domain/ModelMessage; + + move-result-object v2 + + const-string v3, "Guild Create Invite Suggestion" + + invoke-virtual {v0, v1, v2, v3}, Lcom/discord/stores/StoreAnalytics;->inviteSent(Lcom/discord/models/domain/ModelInvite;Lcom/discord/models/domain/ModelMessage;Ljava/lang/String;)V + + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1;->$viewState:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded; + + invoke-virtual {v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;->getSentInvites()Ljava/util/Map; + + move-result-object v0 + + iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1;->$inviteLink:Ljava/lang/String; + + const-string v2, "inviteLink" + + invoke-static {v1, v2}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + + move-result-object v1 + + if-eqz v1, :cond_0 + + goto :goto_0 + + :cond_0 + sget-object v1, Lt/q/q;->d:Lt/q/q; + + :goto_0 + check-cast v1, Ljava/util/Set; + + invoke-virtual {p1}, Lcom/discord/utilities/messagesend/MessageResult$Success;->getMessage()Lcom/discord/models/domain/ModelMessage; + + move-result-object p1 + + invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J + + move-result-wide v2 + + invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object p1 + + invoke-static {v1, p1}, Le/k/a/b/e/p/g;->plus(Ljava/util/Set;Ljava/lang/Object;)Ljava/util/Set; + + move-result-object p1 + + iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1;->$inviteLink:Ljava/lang/String; + + invoke-static {v1, p1}, Ljava/util/Collections;->singletonMap(Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map; + + move-result-object p1 + + const-string v1, "java.util.Collections.si\u2026(pair.first, pair.second)" + + invoke-static {p1, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-static {v0, p1}, Lt/q/l;->plus(Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map; + + move-result-object p1 + + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel; + + invoke-virtual {v0, p1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->updateSentInvites(Ljava/util/Map;)V + + :cond_1 + return-void + + :cond_2 + const-string p1, "result" + + invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V + + const/4 p1, 0x0 + + throw p1 +.end method diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToUser$1.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToUser$1.smali new file mode 100644 index 0000000000..62dd0dfdbb --- /dev/null +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToUser$1.smali @@ -0,0 +1,85 @@ +.class public final Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToUser$1; +.super Lt/u/b/k; +.source "WidgetGuildInviteShareViewModel.kt" + +# interfaces +.implements Lkotlin/jvm/functions/Function1; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->sendInviteToUser(JLcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelInvite;)V +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x19 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "Lt/u/b/k;", + "Lkotlin/jvm/functions/Function1<", + "Ljava/lang/Long;", + "Lkotlin/Unit;", + ">;" + } +.end annotation + + +# instance fields +.field public final synthetic $invite:Lcom/discord/models/domain/ModelInvite; + +.field public final synthetic $viewState:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded; + +.field public final synthetic this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel; + + +# direct methods +.method public constructor (Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelInvite;)V + .locals 0 + + iput-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToUser$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel; + + iput-object p2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToUser$1;->$viewState:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded; + + iput-object p3, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToUser$1;->$invite:Lcom/discord/models/domain/ModelInvite; + + const/4 p1, 0x1 + + invoke-direct {p0, p1}, Lt/u/b/k;->(I)V + + return-void +.end method + + +# virtual methods +.method public bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object; + .locals 2 + + check-cast p1, Ljava/lang/Number; + + invoke-virtual {p1}, Ljava/lang/Number;->longValue()J + + move-result-wide v0 + + invoke-virtual {p0, v0, v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToUser$1;->invoke(J)V + + sget-object p1, Lkotlin/Unit;->a:Lkotlin/Unit; + + return-object p1 +.end method + +.method public final invoke(J)V + .locals 3 + + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToUser$1;->this$0:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel; + + iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToUser$1;->$viewState:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded; + + iget-object v2, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToUser$1;->$invite:Lcom/discord/models/domain/ModelInvite; + + invoke-virtual {v0, p1, p2, v1, v2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->sendInviteToChannel(JLcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelInvite;)V + + return-void +.end method diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel.smali index 1bdfff93a8..af831abebd 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel.smali @@ -73,6 +73,8 @@ .end annotation .end field +.field public final storeChannels:Lcom/discord/stores/StoreChannels; + .field public final storeInviteSettings:Lcom/discord/stores/StoreInviteSettings; .field public final storeUser:Lcom/discord/stores/StoreUser; @@ -81,8 +83,8 @@ # direct methods -.method public constructor (Lcom/discord/stores/StoreInviteSettings;Lcom/discord/stores/StoreUser;Lcom/discord/widgets/guilds/invite/InviteGenerator;Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;Landroid/content/res/Resources;Z)V - .locals 16 +.method public constructor (Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreInviteSettings;Lcom/discord/stores/StoreUser;Lcom/discord/widgets/guilds/invite/InviteGenerator;Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;Landroid/content/res/Resources;Z)V + .locals 17 move-object/from16 v0, p0 @@ -96,33 +98,39 @@ move-object/from16 v5, p5 - const/4 v6, 0x0 + move-object/from16 v6, p6 - if-eqz v1, :cond_5 + const/4 v7, 0x0 - if-eqz v2, :cond_4 + if-eqz v1, :cond_6 - if-eqz v3, :cond_3 + if-eqz v2, :cond_5 - if-eqz v4, :cond_2 + if-eqz v3, :cond_4 - if-eqz v5, :cond_1 + if-eqz v4, :cond_3 - sget-object v7, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Uninitialized; + if-eqz v5, :cond_2 - invoke-direct {v0, v7}, Le/a/b/c0;->(Ljava/lang/Object;)V + if-eqz v6, :cond_1 - iput-object v1, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->storeInviteSettings:Lcom/discord/stores/StoreInviteSettings; + sget-object v8, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Uninitialized;->INSTANCE:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Uninitialized; - iput-object v2, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->storeUser:Lcom/discord/stores/StoreUser; + invoke-direct {v0, v8}, Le/a/b/c0;->(Ljava/lang/Object;)V - iput-object v3, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->inviteGenerator:Lcom/discord/widgets/guilds/invite/InviteGenerator; + iput-object v1, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->storeChannels:Lcom/discord/stores/StoreChannels; - iput-object v4, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->inviteSuggestionsService:Lcom/discord/widgets/guilds/invite/InviteSuggestionsService; + iput-object v2, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->storeInviteSettings:Lcom/discord/stores/StoreInviteSettings; - iput-object v5, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->resources:Landroid/content/res/Resources; + iput-object v3, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->storeUser:Lcom/discord/stores/StoreUser; - move/from16 v1, p6 + iput-object v4, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->inviteGenerator:Lcom/discord/widgets/guilds/invite/InviteGenerator; + + iput-object v5, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->inviteSuggestionsService:Lcom/discord/widgets/guilds/invite/InviteSuggestionsService; + + iput-object v6, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->resources:Landroid/content/res/Resources; + + move/from16 v1, p7 iput-boolean v1, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->subscribeOnInit:Z @@ -148,7 +156,7 @@ iput-object v1, v0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->filterPublisher:Lrx/subjects/BehaviorSubject; - invoke-static {v6}, Lrx/subjects/BehaviorSubject;->a(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject; + invoke-static {v7}, Lrx/subjects/BehaviorSubject;->a(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject; move-result-object v1 @@ -196,13 +204,11 @@ const/4 v2, 0x2 - invoke-static {v1, v0, v6, v2, v6}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable; + invoke-static {v1, v0, v7, v2, v7}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable; - move-result-object v7 + move-result-object v8 - const-class v8, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel; - - const/4 v9, 0x0 + const-class v9, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel; const/4 v10, 0x0 @@ -210,15 +216,17 @@ const/4 v12, 0x0 - new-instance v13, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$2; + const/4 v13, 0x0 - invoke-direct {v13, v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$2;->(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;)V + new-instance v14, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$2; - const/16 v14, 0x1e + invoke-direct {v14, v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$2;->(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;)V - const/4 v15, 0x0 + const/16 v15, 0x1e - invoke-static/range {v7 .. v15}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + const/16 v16, 0x0 + + invoke-static/range {v8 .. v16}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V :cond_0 return-void @@ -228,35 +236,42 @@ invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V - throw v6 + throw v7 :cond_2 const-string v1, "inviteSuggestionsService" invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V - throw v6 + throw v7 :cond_3 const-string v1, "inviteGenerator" invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V - throw v6 + throw v7 :cond_4 const-string v1, "storeUser" invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V - throw v6 + throw v7 :cond_5 const-string v1, "storeInviteSettings" invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V - throw v6 + throw v7 + + :cond_6 + const-string v1, "storeChannels" + + invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V + + throw v7 .end method .method public static final synthetic access$generateInviteLinkFromViewState(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;)V @@ -347,7 +362,7 @@ .end method .method private final observeWidgetInviteViewModel()Lrx/Observable; - .locals 7 + .locals 8 .annotation system Ldalvik/annotation/Signature; value = { "()", @@ -383,13 +398,19 @@ move-result-object v5 - sget-object v6, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeWidgetInviteViewModel$1;->INSTANCE:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeWidgetInviteViewModel$1; + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->storeChannels:Lcom/discord/stores/StoreChannels; - invoke-static/range {v1 .. v6}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func5;)Lrx/Observable; + invoke-virtual {v0}, Lcom/discord/stores/StoreChannels;->getDMs()Lrx/Observable; + + move-result-object v6 + + sget-object v7, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeWidgetInviteViewModel$1;->INSTANCE:Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$observeWidgetInviteViewModel$1; + + invoke-static/range {v1 .. v7}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func6;)Lrx/Observable; move-result-object v0 - const-string v1, "Observable\n .comb\u2026 me\n )\n }" + const-string v1, "Observable\n .comb\u2026dms\n )\n }" invoke-static {v0, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V @@ -444,6 +465,14 @@ return-object v0 .end method +.method public final getStoreChannels()Lcom/discord/stores/StoreChannels; + .locals 1 + + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->storeChannels:Lcom/discord/stores/StoreChannels; + + return-object v0 +.end method + .method public final getStoreInviteSettings()Lcom/discord/stores/StoreInviteSettings; .locals 1 @@ -536,6 +565,168 @@ return-void .end method +.method public final sendInviteToChannel(JLcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelInvite;)V + .locals 18 + + move-object/from16 v0, p0 + + move-object/from16 v1, p3 + + move-object/from16 v2, p4 + + const/4 v3, 0x0 + + if-eqz v1, :cond_0 + + invoke-direct {v0, v2}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->getInviteLink(Lcom/discord/models/domain/ModelInvite;)Ljava/lang/String; + + move-result-object v15 + + sget-object v4, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion; + + invoke-virtual {v4}, Lcom/discord/stores/StoreStream$Companion;->getMessages()Lcom/discord/stores/StoreMessages; + + move-result-object v4 + + invoke-virtual/range {p3 .. p3}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;->getWidgetInviteModel()Lcom/discord/widgets/guilds/invite/WidgetInviteModel; + + move-result-object v5 + + invoke-virtual {v5}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->getMe()Lcom/discord/models/domain/ModelUser; + + move-result-object v7 + + const-string v5, "inviteLink" + + invoke-static {v15, v5}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + + const/4 v9, 0x0 + + const/4 v10, 0x0 + + const/4 v11, 0x0 + + const/4 v12, 0x0 + + const/4 v13, 0x0 + + const/16 v14, 0xe0 + + const/16 v16, 0x0 + + move-wide/from16 v5, p1 + + move-object v8, v15 + + move-object/from16 v17, v15 + + move-object/from16 v15, v16 + + invoke-static/range {v4 .. v15}, Lcom/discord/stores/StoreMessages;->sendMessage$default(Lcom/discord/stores/StoreMessages;JLcom/discord/models/domain/ModelUser;Ljava/lang/String;Ljava/util/List;Ljava/util/List;Lcom/discord/models/domain/ModelApplication;Lcom/discord/models/domain/activity/ModelActivity;Lcom/discord/models/domain/ModelMessage$Activity;ILjava/lang/Object;)Lrx/Observable; + + move-result-object v4 + + const/4 v5, 0x0 + + const/4 v6, 0x1 + + invoke-static {v4, v5, v6, v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable; + + move-result-object v4 + + const/4 v5, 0x2 + + invoke-static {v4, v0, v3, v5, v3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable; + + move-result-object v6 + + const-class v7, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel; + + const/4 v8, 0x0 + + new-instance v12, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1; + + move-object/from16 v3, v17 + + invoke-direct {v12, v0, v2, v1, v3}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToChannel$1;->(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;Lcom/discord/models/domain/ModelInvite;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Ljava/lang/String;)V + + const/16 v13, 0x1e + + const/4 v14, 0x0 + + invoke-static/range {v6 .. v14}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + + return-void + + :cond_0 + const-string v1, "viewState" + + invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V + + throw v3 +.end method + +.method public final sendInviteToUser(JLcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelInvite;)V + .locals 10 + + const/4 v0, 0x0 + + if-eqz p3, :cond_0 + + sget-object v1, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion; + + invoke-virtual {v1}, Lcom/discord/stores/StoreStream$Companion;->getChannels()Lcom/discord/stores/StoreChannels; + + move-result-object v1 + + invoke-virtual {v1, p1, p2}, Lcom/discord/stores/StoreChannels;->createPrivateChannel(J)Lrx/Observable; + + move-result-object p1 + + const/4 p2, 0x0 + + const/4 v1, 0x1 + + invoke-static {p1, p2, v1, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->restSubscribeOn$default(Lrx/Observable;ZILjava/lang/Object;)Lrx/Observable; + + move-result-object p1 + + const/4 p2, 0x2 + + invoke-static {p1, p0, v0, p2, v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->ui$default(Lrx/Observable;Lcom/discord/app/AppComponent;Lcom/discord/utilities/mg_recycler/MGRecyclerAdapterSimple;ILjava/lang/Object;)Lrx/Observable; + + move-result-object v1 + + const-class v2, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel; + + const/4 v3, 0x0 + + const/4 v4, 0x0 + + const/4 v5, 0x0 + + const/4 v6, 0x0 + + new-instance v7, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToUser$1; + + invoke-direct {v7, p0, p3, p4}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$sendInviteToUser$1;->(Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel$ViewState$Loaded;Lcom/discord/models/domain/ModelInvite;)V + + const/16 v8, 0x1e + + const/4 v9, 0x0 + + invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V + + return-void + + :cond_0 + const-string p1, "viewState" + + invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V + + throw v0 +.end method + .method public final updateInviteSettings(Lcom/discord/models/domain/ModelInvite$Settings;)V .locals 1 diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory.smali index 933bd19b01..5037111b71 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory.smali @@ -35,7 +35,7 @@ # virtual methods .method public create(Ljava/lang/Class;)Landroidx/lifecycle/ViewModel; - .locals 7 + .locals 8 .annotation system Ldalvik/annotation/Signature; value = { "Companion:Lcom/discord/stores/StoreStream$Companion; - invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getInviteSettings()Lcom/discord/stores/StoreInviteSettings; + invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getChannels()Lcom/discord/stores/StoreChannels; move-result-object v1 sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion; - invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getUsers()Lcom/discord/stores/StoreUser; + invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getInviteSettings()Lcom/discord/stores/StoreInviteSettings; move-result-object v2 - new-instance v3, Lcom/discord/widgets/guilds/invite/InviteGenerator; + sget-object v0, Lcom/discord/stores/StoreStream;->Companion:Lcom/discord/stores/StoreStream$Companion; - invoke-direct {v3}, Lcom/discord/widgets/guilds/invite/InviteGenerator;->()V + invoke-virtual {v0}, Lcom/discord/stores/StoreStream$Companion;->getUsers()Lcom/discord/stores/StoreUser; + + move-result-object v3 + + new-instance v4, Lcom/discord/widgets/guilds/invite/InviteGenerator; + + invoke-direct {v4}, Lcom/discord/widgets/guilds/invite/InviteGenerator;->()V sget-object v0, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;->Companion:Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$Companion; invoke-virtual {v0}, Lcom/discord/widgets/guilds/invite/InviteSuggestionsService$Companion;->create()Lcom/discord/widgets/guilds/invite/InviteSuggestionsService; - move-result-object v4 + move-result-object v5 - iget-object v5, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory;->resources:Landroid/content/res/Resources; + iget-object v6, p0, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModelFactory;->resources:Landroid/content/res/Resources; - const/4 v6, 0x1 + const/4 v7, 0x1 move-object v0, p1 - invoke-direct/range {v0 .. v6}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->(Lcom/discord/stores/StoreInviteSettings;Lcom/discord/stores/StoreUser;Lcom/discord/widgets/guilds/invite/InviteGenerator;Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;Landroid/content/res/Resources;Z)V + invoke-direct/range {v0 .. v7}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShareViewModel;->(Lcom/discord/stores/StoreChannels;Lcom/discord/stores/StoreInviteSettings;Lcom/discord/stores/StoreUser;Lcom/discord/widgets/guilds/invite/InviteGenerator;Lcom/discord/widgets/guilds/invite/InviteSuggestionsService;Landroid/content/res/Resources;Z)V return-object p1 diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo.smali index bc330bd283..aaec30ea3c 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo.smali @@ -903,7 +903,7 @@ move-result-object v9 - const v10, 0x7f0803f9 + const v10, 0x7f0803fa const/4 v11, 0x0 diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel$Companion.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel$Companion.smali index bededa0eb9..6778533b77 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel$Companion.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel$Companion.smali @@ -33,8 +33,8 @@ # virtual methods -.method public final create(Lcom/discord/models/domain/ModelInvite$Settings;Ljava/util/Map;Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;Ljava/lang/Long;Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/guilds/invite/WidgetInviteModel; - .locals 10 +.method public final create(Lcom/discord/models/domain/ModelInvite$Settings;Ljava/util/Map;Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;Ljava/lang/Long;Lcom/discord/models/domain/ModelUser;Ljava/util/List;)Lcom/discord/widgets/guilds/invite/WidgetInviteModel; + .locals 12 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -47,157 +47,175 @@ "Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;", "Ljava/lang/Long;", "Lcom/discord/models/domain/ModelUser;", - ")", + "Ljava/util/List<", + "+", + "Lcom/discord/models/domain/ModelChannel;", + ">;)", "Lcom/discord/widgets/guilds/invite/WidgetInviteModel;" } .end annotation - const/4 v0, 0x0 + move-object v0, p2 - if-eqz p1, :cond_6 - - if-eqz p2, :cond_5 - - if-eqz p3, :cond_4 - - if-eqz p5, :cond_3 - - invoke-virtual {p3}, Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;->getLastGeneratedInvite()Lcom/discord/models/domain/ModelInvite; - - move-result-object v4 - - new-instance v7, Ljava/util/ArrayList; - - invoke-interface {p2}, Ljava/util/Map;->values()Ljava/util/Collection; - - move-result-object v1 - - invoke-direct {v7, v1}, Ljava/util/ArrayList;->(Ljava/util/Collection;)V - - invoke-static {}, Lcom/discord/models/domain/ModelChannel;->getSortByNameAndType()Ljava/util/Comparator; - - move-result-object v1 - - invoke-static {v7, v1}, Ljava/util/Collections;->sort(Ljava/util/List;Ljava/util/Comparator;)V - - invoke-interface {p2, p4}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z - - move-result v1 + move-object/from16 v1, p4 const/4 v2, 0x0 - if-eqz v1, :cond_0 + if-eqz p1, :cond_7 - invoke-interface {p2, p4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + if-eqz v0, :cond_6 - move-result-object p2 + if-eqz p3, :cond_5 - move-object v0, p2 + if-eqz p5, :cond_4 - check-cast v0, Lcom/discord/models/domain/ModelChannel; + if-eqz p6, :cond_3 + + invoke-virtual {p3}, Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;->getLastGeneratedInvite()Lcom/discord/models/domain/ModelInvite; + + move-result-object v6 + + new-instance v9, Ljava/util/ArrayList; + + invoke-interface {p2}, Ljava/util/Map;->values()Ljava/util/Collection; + + move-result-object v3 + + invoke-direct {v9, v3}, Ljava/util/ArrayList;->(Ljava/util/Collection;)V + + invoke-static {}, Lcom/discord/models/domain/ModelChannel;->getSortByNameAndType()Ljava/util/Comparator; + + move-result-object v3 + + invoke-static {v9, v3}, Ljava/util/Collections;->sort(Ljava/util/List;Ljava/util/Comparator;)V + + invoke-interface {p2, v1}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z + + move-result v3 + + const/4 v4, 0x0 + + if-eqz v3, :cond_0 + + invoke-interface {p2, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + + move-result-object v0 + + move-object v2, v0 + + check-cast v2, Lcom/discord/models/domain/ModelChannel; goto :goto_0 :cond_0 - invoke-virtual {v7}, Ljava/util/ArrayList;->isEmpty()Z + invoke-virtual {v9}, Ljava/util/ArrayList;->isEmpty()Z - move-result p2 + move-result v0 - if-nez p2, :cond_1 + if-nez v0, :cond_1 - invoke-virtual {v7, v2}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; + invoke-virtual {v9, v4}, Ljava/util/ArrayList;->get(I)Ljava/lang/Object; - move-result-object p2 + move-result-object v0 - move-object v0, p2 + move-object v2, v0 - check-cast v0, Lcom/discord/models/domain/ModelChannel; + check-cast v2, Lcom/discord/models/domain/ModelChannel; :cond_1 :goto_0 - if-eqz v4, :cond_2 + if-eqz v6, :cond_2 + + if-eqz v2, :cond_2 + + invoke-virtual {v6}, Lcom/discord/models/domain/ModelInvite;->getChannel()Lcom/discord/models/domain/ModelChannel; + + move-result-object v0 if-eqz v0, :cond_2 - invoke-virtual {v4}, Lcom/discord/models/domain/ModelInvite;->getChannel()Lcom/discord/models/domain/ModelChannel; + invoke-virtual {v6}, Lcom/discord/models/domain/ModelInvite;->getChannel()Lcom/discord/models/domain/ModelChannel; - move-result-object p2 + move-result-object v0 - if-eqz p2, :cond_2 + const-string v1, "generatedInvite.channel" - invoke-virtual {v4}, Lcom/discord/models/domain/ModelInvite;->getChannel()Lcom/discord/models/domain/ModelChannel; - - move-result-object p2 - - const-string p4, "generatedInvite.channel" - - invoke-static {p2, p4}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-virtual {p2}, Lcom/discord/models/domain/ModelChannel;->getId()J - - move-result-wide v5 + invoke-static {v0, v1}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V invoke-virtual {v0}, Lcom/discord/models/domain/ModelChannel;->getId()J - move-result-wide v8 + move-result-wide v0 - cmp-long p2, v5, v8 + invoke-virtual {v2}, Lcom/discord/models/domain/ModelChannel;->getId()J - if-nez p2, :cond_2 + move-result-wide v7 - const/4 p2, 0x1 + cmp-long v3, v0, v7 - const/4 v6, 0x1 + if-nez v3, :cond_2 + + const/4 v0, 0x1 + + const/4 v8, 0x1 goto :goto_1 :cond_2 - const/4 v6, 0x0 + const/4 v8, 0x0 :goto_1 - new-instance p2, Lcom/discord/widgets/guilds/invite/WidgetInviteModel; + new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel; invoke-virtual {p3}, Lcom/discord/widgets/guilds/invite/InviteGenerator$InviteGenerationState;->isGenerating()Z - move-result v5 + move-result v7 - move-object v1, p2 + move-object v3, v0 - move-object v2, v0 + move-object v4, v2 - move-object v3, p1 + move-object v5, p1 - move-object v8, p5 + move-object/from16 v10, p5 - invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelInvite$Settings;Lcom/discord/models/domain/ModelInvite;ZZLjava/util/List;Lcom/discord/models/domain/ModelUser;)V + move-object/from16 v11, p6 - return-object p2 + invoke-direct/range {v3 .. v11}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelInvite$Settings;Lcom/discord/models/domain/ModelInvite;ZZLjava/util/List;Lcom/discord/models/domain/ModelUser;Ljava/util/List;)V + + return-object v0 :cond_3 - const-string p1, "me" + const-string v0, "dms" - invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V + invoke-static {v0}, Lt/u/b/j;->a(Ljava/lang/String;)V - throw v0 + throw v2 :cond_4 - const-string p1, "inviteGenerationState" + const-string v0, "me" - invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V + invoke-static {v0}, Lt/u/b/j;->a(Ljava/lang/String;)V - throw v0 + throw v2 :cond_5 - const-string p1, "invitableChannels" + const-string v0, "inviteGenerationState" - invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V + invoke-static {v0}, Lt/u/b/j;->a(Ljava/lang/String;)V - throw v0 + throw v2 :cond_6 - const-string p1, "settings" + const-string v0, "invitableChannels" - invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V + invoke-static {v0}, Lt/u/b/j;->a(Ljava/lang/String;)V - throw v0 + throw v2 + + :cond_7 + const-string v0, "settings" + + invoke-static {v0}, Lt/u/b/j;->a(Ljava/lang/String;)V + + throw v2 .end method diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel.smali index bd9d1955cf..7733d7bbf2 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteModel.smali @@ -16,6 +16,16 @@ # instance fields +.field public final dms:Ljava/util/List; + .annotation system Ldalvik/annotation/Signature; + value = { + "Ljava/util/List<", + "Lcom/discord/models/domain/ModelChannel;", + ">;" + } + .end annotation +.end field + .field public final invitableChannels:Ljava/util/List; .annotation system Ldalvik/annotation/Signature; value = { @@ -54,7 +64,7 @@ return-void .end method -.method public constructor (Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelInvite$Settings;Lcom/discord/models/domain/ModelInvite;ZZLjava/util/List;Lcom/discord/models/domain/ModelUser;)V +.method public constructor (Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelInvite$Settings;Lcom/discord/models/domain/ModelInvite;ZZLjava/util/List;Lcom/discord/models/domain/ModelUser;Ljava/util/List;)V .locals 1 .annotation system Ldalvik/annotation/Signature; value = { @@ -68,15 +78,20 @@ "Lcom/discord/models/domain/ModelChannel;", ">;", "Lcom/discord/models/domain/ModelUser;", - ")V" + "Ljava/util/List<", + "+", + "Lcom/discord/models/domain/ModelChannel;", + ">;)V" } .end annotation const/4 v0, 0x0 - if-eqz p6, :cond_1 + if-eqz p6, :cond_2 - if-eqz p7, :cond_0 + if-eqz p7, :cond_1 + + if-eqz p8, :cond_0 invoke-direct {p0}, Ljava/lang/Object;->()V @@ -94,16 +109,25 @@ iput-object p7, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->me:Lcom/discord/models/domain/ModelUser; + iput-object p8, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->dms:Ljava/util/List; + return-void :cond_0 - const-string p1, "me" + const-string p1, "dms" invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V throw v0 :cond_1 + const-string p1, "me" + + invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V + + throw v0 + + :cond_2 const-string p1, "invitableChannels" invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V @@ -111,10 +135,10 @@ throw v0 .end method -.method public synthetic constructor (Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelInvite$Settings;Lcom/discord/models/domain/ModelInvite;ZZLjava/util/List;Lcom/discord/models/domain/ModelUser;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - .locals 10 +.method public synthetic constructor (Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelInvite$Settings;Lcom/discord/models/domain/ModelInvite;ZZLjava/util/List;Lcom/discord/models/domain/ModelUser;Ljava/util/List;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + .locals 11 - and-int/lit8 v0, p8, 0x8 + and-int/lit8 v0, p9, 0x8 const/4 v1, 0x0 @@ -128,7 +152,7 @@ move v6, p4 :goto_0 - and-int/lit8 v0, p8, 0x10 + and-int/lit8 v0, p9, 0x10 if-eqz v0, :cond_1 @@ -137,7 +161,7 @@ goto :goto_1 :cond_1 - move v7, p5 + move/from16 v7, p5 :goto_1 move-object v2, p0 @@ -152,96 +176,137 @@ move-object/from16 v9, p7 - invoke-direct/range {v2 .. v9}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelInvite$Settings;Lcom/discord/models/domain/ModelInvite;ZZLjava/util/List;Lcom/discord/models/domain/ModelUser;)V + move-object/from16 v10, p8 + + invoke-direct/range {v2 .. v10}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelInvite$Settings;Lcom/discord/models/domain/ModelInvite;ZZLjava/util/List;Lcom/discord/models/domain/ModelUser;Ljava/util/List;)V return-void .end method -.method public static synthetic copy$default(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelInvite$Settings;Lcom/discord/models/domain/ModelInvite;ZZLjava/util/List;Lcom/discord/models/domain/ModelUser;ILjava/lang/Object;)Lcom/discord/widgets/guilds/invite/WidgetInviteModel; - .locals 5 +.method public static synthetic copy$default(Lcom/discord/widgets/guilds/invite/WidgetInviteModel;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelInvite$Settings;Lcom/discord/models/domain/ModelInvite;ZZLjava/util/List;Lcom/discord/models/domain/ModelUser;Ljava/util/List;ILjava/lang/Object;)Lcom/discord/widgets/guilds/invite/WidgetInviteModel; + .locals 9 - and-int/lit8 p9, p8, 0x1 + move-object v0, p0 - if-eqz p9, :cond_0 + move/from16 v1, p9 - iget-object p1, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->targetChannel:Lcom/discord/models/domain/ModelChannel; + and-int/lit8 v2, v1, 0x1 + + if-eqz v2, :cond_0 + + iget-object v2, v0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->targetChannel:Lcom/discord/models/domain/ModelChannel; + + goto :goto_0 :cond_0 - and-int/lit8 p9, p8, 0x2 + move-object v2, p1 - if-eqz p9, :cond_1 + :goto_0 + and-int/lit8 v3, v1, 0x2 - iget-object p2, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->settings:Lcom/discord/models/domain/ModelInvite$Settings; + if-eqz v3, :cond_1 + + iget-object v3, v0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->settings:Lcom/discord/models/domain/ModelInvite$Settings; + + goto :goto_1 :cond_1 - move-object p9, p2 + move-object v3, p2 - and-int/lit8 p2, p8, 0x4 + :goto_1 + and-int/lit8 v4, v1, 0x4 - if-eqz p2, :cond_2 + if-eqz v4, :cond_2 - iget-object p3, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->invite:Lcom/discord/models/domain/ModelInvite; + iget-object v4, v0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->invite:Lcom/discord/models/domain/ModelInvite; + + goto :goto_2 :cond_2 - move-object v0, p3 + move-object v4, p3 - and-int/lit8 p2, p8, 0x8 + :goto_2 + and-int/lit8 v5, v1, 0x8 - if-eqz p2, :cond_3 + if-eqz v5, :cond_3 - iget-boolean p4, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->isGeneratingInvite:Z + iget-boolean v5, v0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->isGeneratingInvite:Z + + goto :goto_3 :cond_3 - move v1, p4 + move v5, p4 - and-int/lit8 p2, p8, 0x10 + :goto_3 + and-int/lit8 v6, v1, 0x10 - if-eqz p2, :cond_4 + if-eqz v6, :cond_4 - iget-boolean p5, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->isValidInvite:Z + iget-boolean v6, v0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->isValidInvite:Z + + goto :goto_4 :cond_4 - move v2, p5 + move v6, p5 - and-int/lit8 p2, p8, 0x20 + :goto_4 + and-int/lit8 v7, v1, 0x20 - if-eqz p2, :cond_5 + if-eqz v7, :cond_5 - iget-object p6, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->invitableChannels:Ljava/util/List; + iget-object v7, v0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->invitableChannels:Ljava/util/List; + + goto :goto_5 :cond_5 - move-object v3, p6 + move-object v7, p6 - and-int/lit8 p2, p8, 0x40 + :goto_5 + and-int/lit8 v8, v1, 0x40 - if-eqz p2, :cond_6 + if-eqz v8, :cond_6 - iget-object p7, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->me:Lcom/discord/models/domain/ModelUser; + iget-object v8, v0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->me:Lcom/discord/models/domain/ModelUser; + + goto :goto_6 :cond_6 - move-object v4, p7 + move-object/from16 v8, p7 - move-object p2, p0 + :goto_6 + and-int/lit16 v1, v1, 0x80 - move-object p3, p1 + if-eqz v1, :cond_7 - move-object p4, p9 + iget-object v1, v0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->dms:Ljava/util/List; - move-object p5, v0 + goto :goto_7 - move p6, v1 + :cond_7 + move-object/from16 v1, p8 - move p7, v2 + :goto_7 + move-object p1, v2 - move-object p8, v3 + move-object p2, v3 - move-object p9, v4 + move-object p3, v4 - invoke-virtual/range {p2 .. p9}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->copy(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelInvite$Settings;Lcom/discord/models/domain/ModelInvite;ZZLjava/util/List;Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/guilds/invite/WidgetInviteModel; + move p4, v5 - move-result-object p0 + move p5, v6 - return-object p0 + move-object p6, v7 + + move-object/from16 p7, v8 + + move-object/from16 p8, v1 + + invoke-virtual/range {p0 .. p8}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->copy(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelInvite$Settings;Lcom/discord/models/domain/ModelInvite;ZZLjava/util/List;Lcom/discord/models/domain/ModelUser;Ljava/util/List;)Lcom/discord/widgets/guilds/invite/WidgetInviteModel; + + move-result-object v0 + + return-object v0 .end method @@ -310,8 +375,24 @@ return-object v0 .end method -.method public final copy(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelInvite$Settings;Lcom/discord/models/domain/ModelInvite;ZZLjava/util/List;Lcom/discord/models/domain/ModelUser;)Lcom/discord/widgets/guilds/invite/WidgetInviteModel; - .locals 9 +.method public final component8()Ljava/util/List; + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Ljava/util/List<", + "Lcom/discord/models/domain/ModelChannel;", + ">;" + } + .end annotation + + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->dms:Ljava/util/List; + + return-object v0 +.end method + +.method public final copy(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelInvite$Settings;Lcom/discord/models/domain/ModelInvite;ZZLjava/util/List;Lcom/discord/models/domain/ModelUser;Ljava/util/List;)Lcom/discord/widgets/guilds/invite/WidgetInviteModel; + .locals 10 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -324,16 +405,21 @@ "Lcom/discord/models/domain/ModelChannel;", ">;", "Lcom/discord/models/domain/ModelUser;", - ")", + "Ljava/util/List<", + "+", + "Lcom/discord/models/domain/ModelChannel;", + ">;)", "Lcom/discord/widgets/guilds/invite/WidgetInviteModel;" } .end annotation const/4 v0, 0x0 - if-eqz p6, :cond_1 + if-eqz p6, :cond_2 - if-eqz p7, :cond_0 + if-eqz p7, :cond_1 + + if-eqz p8, :cond_0 new-instance v0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel; @@ -349,22 +435,31 @@ move v6, p5 - move-object v7, p6 + move-object/from16 v7, p6 move-object/from16 v8, p7 - invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelInvite$Settings;Lcom/discord/models/domain/ModelInvite;ZZLjava/util/List;Lcom/discord/models/domain/ModelUser;)V + move-object/from16 v9, p8 + + invoke-direct/range {v1 .. v9}, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelInvite$Settings;Lcom/discord/models/domain/ModelInvite;ZZLjava/util/List;Lcom/discord/models/domain/ModelUser;Ljava/util/List;)V return-object v0 :cond_0 - const-string v1, "me" + const-string v1, "dms" invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V throw v0 :cond_1 + const-string v1, "me" + + invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V + + throw v0 + + :cond_2 const-string v1, "invitableChannels" invoke-static {v1}, Lt/u/b/j;->a(Ljava/lang/String;)V @@ -437,7 +532,17 @@ iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->me:Lcom/discord/models/domain/ModelUser; - iget-object p1, p1, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->me:Lcom/discord/models/domain/ModelUser; + iget-object v1, p1, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->me:Lcom/discord/models/domain/ModelUser; + + invoke-static {v0, v1}, Lt/u/b/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z + + move-result v0 + + if-eqz v0, :cond_0 + + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->dms:Ljava/util/List; + + iget-object p1, p1, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->dms:Ljava/util/List; invoke-static {v0, p1}, Lt/u/b/j;->areEqual(Ljava/lang/Object;Ljava/lang/Object;)Z @@ -459,6 +564,22 @@ return p1 .end method +.method public final getDms()Ljava/util/List; + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Ljava/util/List<", + "Lcom/discord/models/domain/ModelChannel;", + ">;" + } + .end annotation + + iget-object v0, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->dms:Ljava/util/List; + + return-object v0 +.end method + .method public final getInvitableChannels()Ljava/util/List; .locals 1 .annotation system Ldalvik/annotation/Signature; @@ -612,9 +733,27 @@ invoke-virtual {v2}, Lcom/discord/models/domain/ModelUser;->hashCode()I - move-result v1 + move-result v2 + + goto :goto_4 :cond_6 + const/4 v2, 0x0 + + :goto_4 + add-int/2addr v0, v2 + + mul-int/lit8 v0, v0, 0x1f + + iget-object v2, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->dms:Ljava/util/List; + + if-eqz v2, :cond_7 + + invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I + + move-result v1 + + :cond_7 add-int/2addr v0, v1 return v0 @@ -637,7 +776,7 @@ .end method .method public toString()Ljava/lang/String; - .locals 2 + .locals 3 const-string v0, "WidgetInviteModel(targetChannel=" @@ -697,11 +836,15 @@ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; - const-string v1, ")" + const-string v1, ", dms=" invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + iget-object v1, p0, Lcom/discord/widgets/guilds/invite/WidgetInviteModel;->dms:Ljava/util/List; + + const-string v2, ")" + + invoke-static {v0, v1, v2}, Le/e/b/a/a;->a(Ljava/lang/StringBuilder;Ljava/util/List;Ljava/lang/String;)Ljava/lang/String; move-result-object v0 diff --git a/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder.smali b/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder.smali index 96a204ed7e..d2c4385bf6 100644 --- a/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder.smali +++ b/com.discord/smali/com/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder.smali @@ -355,69 +355,172 @@ if-eqz v0, :cond_0 - iget-object v0, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatar:Lcom/facebook/drawee/view/SimpleDraweeView; + iget-object v0, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatarContainer:Landroid/view/ViewGroup; const/high16 v1, 0x3f000000 # 0.5f - invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setAlpha(F)V + invoke-virtual {v0, v1}, Landroid/view/ViewGroup;->setAlpha(F)V goto :goto_0 :cond_0 - iget-object v0, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatar:Lcom/facebook/drawee/view/SimpleDraweeView; + iget-object v0, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatarContainer:Landroid/view/ViewGroup; const/high16 v1, 0x3f800000 # 1.0f - invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setAlpha(F)V + invoke-virtual {v0, v1}, Landroid/view/ViewGroup;->setAlpha(F)V :goto_0 return-void .end method -.method private final configureGuildIconImage(Lcom/discord/models/domain/ModelGuild;Z)V - .locals 15 +.method private final configureGuildIconBackground(ZZZ)V + .locals 4 - move-object v0, p0 + iget-object v0, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatar:Lcom/facebook/drawee/view/SimpleDraweeView; + + invoke-virtual {v0}, Landroid/widget/ImageView;->getResources()Landroid/content/res/Resources; + + move-result-object v0 + + const v1, 0x7f070192 + + invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I + + move-result v0 + + int-to-float v0, v0 + + iget-object v1, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatar:Lcom/facebook/drawee/view/SimpleDraweeView; + + xor-int/lit8 v2, p1, 0x1 if-eqz p2, :cond_0 - const-string v1, "asset://asset/images/default_icon_selected.jpg" + iget v3, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->overlayColorInFolder:I goto :goto_0 :cond_0 - const-string v1, "asset://asset/images/default_icon.jpg" + iget v3, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->overlayColor:I :goto_0 - move-object v2, v1 + invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + + move-result-object v3 + + invoke-static {v1, v0, v2, v3}, Lcom/discord/utilities/images/MGImages;->setCornerRadius(Landroid/widget/ImageView;FZLjava/lang/Integer;)V + + const/4 v0, 0x0 + + if-eqz p3, :cond_2 + + if-eqz p1, :cond_1 + + iget-object p1, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatarContainer:Landroid/view/ViewGroup; + + const p2, 0x7f080161 + + invoke-virtual {p1, p2}, Landroid/view/ViewGroup;->setBackgroundResource(I)V + + goto :goto_1 + + :cond_1 + iget-object p1, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatarContainer:Landroid/view/ViewGroup; + + const p2, 0x7f080114 + + invoke-virtual {p1, p2}, Landroid/view/ViewGroup;->setBackgroundResource(I)V + + :goto_1 + iget-object p1, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatarContainer:Landroid/view/ViewGroup; + + invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->setBackgroundTintList(Landroid/content/res/ColorStateList;)V + + goto :goto_3 + + :cond_2 + if-eqz p1, :cond_3 + + iget-object p1, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatarContainer:Landroid/view/ViewGroup; + + const p2, 0x7f08015e + + invoke-virtual {p1, p2}, Landroid/view/ViewGroup;->setBackgroundResource(I)V + + iget-object p1, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatarContainer:Landroid/view/ViewGroup; + + invoke-virtual {p1, v0}, Landroid/view/ViewGroup;->setBackgroundTintList(Landroid/content/res/ColorStateList;)V + + goto :goto_3 + + :cond_3 + iget-object p1, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatarContainer:Landroid/view/ViewGroup; + + const p3, 0x7f080108 + + invoke-virtual {p1, p3}, Landroid/view/ViewGroup;->setBackgroundResource(I)V + + if-eqz p2, :cond_4 + + const p1, 0x7f0400e2 + + goto :goto_2 + + :cond_4 + const p1, 0x7f0400e1 + + :goto_2 + iget-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatarContainer:Landroid/view/ViewGroup; + + invoke-static {p2, p1}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/view/View;I)I + + move-result p1 + + iget-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatarContainer:Landroid/view/ViewGroup; + + invoke-static {p1}, Landroid/content/res/ColorStateList;->valueOf(I)Landroid/content/res/ColorStateList; + + move-result-object p1 + + invoke-virtual {p2, p1}, Landroid/view/ViewGroup;->setBackgroundTintList(Landroid/content/res/ColorStateList;)V + + :goto_3 + return-void +.end method + +.method private final configureGuildIconImage(Lcom/discord/models/domain/ModelGuild;Z)V + .locals 18 + + move-object/from16 v0, p0 invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelGuild;->canHaveAnimatedServerIcon()Z move-result v1 - const-string v3, "itemAvatar.hierarchy" + const-string v2, "itemAvatar.hierarchy" - if-eqz v1, :cond_1 + const/4 v3, 0x0 + + if-eqz v1, :cond_0 invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelGuild;->getIcon()Ljava/lang/String; move-result-object v1 - if-eqz v1, :cond_1 + if-eqz v1, :cond_0 const/4 v4, 0x2 - const/4 v5, 0x0 + const-string v5, "a" - const-string v6, "a" - - invoke-static {v1, v6, v5, v4}, Lt/a0/n;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z + invoke-static {v1, v5, v3, v4}, Lt/a0/n;->startsWith$default(Ljava/lang/String;Ljava/lang/String;ZI)Z move-result v1 const/4 v4, 0x1 - if-ne v1, v4, :cond_1 + if-ne v1, v4, :cond_0 iget-object v1, v0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatar:Lcom/facebook/drawee/view/SimpleDraweeView; @@ -439,13 +542,13 @@ check-cast v1, Lcom/facebook/drawee/generic/GenericDraweeHierarchy; - invoke-static {v1, v3}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v1, v2}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - invoke-virtual {v1, v5}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->e(I)V + invoke-virtual {v1, v3}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->e(I)V - goto :goto_1 + goto :goto_0 - :cond_1 + :cond_0 iget-object v1, v0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatar:Lcom/facebook/drawee/view/SimpleDraweeView; invoke-virtual {v1}, Lcom/facebook/drawee/view/DraweeView;->getHierarchy()Le/j/g/h/b; @@ -466,26 +569,34 @@ check-cast v1, Lcom/facebook/drawee/generic/GenericDraweeHierarchy; - invoke-static {v1, v3}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {v1, v2}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - const/16 v3, 0x32 + const/16 v2, 0x32 - invoke-virtual {v1, v3}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->e(I)V + invoke-virtual {v1, v2}, Lcom/facebook/drawee/generic/GenericDraweeHierarchy;->e(I)V - :goto_1 - const/4 v4, 0x0 + :goto_0 + invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelGuild;->hasIcon()Z - const/16 v5, 0x8 + move-result v1 - const/4 v11, 0x0 + if-eqz v1, :cond_1 - const/4 v6, 0x0 + const/4 v5, 0x0 - move-object/from16 v1, p1 + const/4 v7, 0x0 - move/from16 v3, p2 + const/16 v8, 0xa - invoke-static/range {v1 .. v6}, Lcom/discord/utilities/icon/IconUtils;->getForGuild$default(Lcom/discord/models/domain/ModelGuild;Ljava/lang/String;ZLjava/lang/Integer;ILjava/lang/Object;)Ljava/lang/String; + const/4 v14, 0x0 + + const/4 v9, 0x0 + + move-object/from16 v4, p1 + + move/from16 v6, p2 + + invoke-static/range {v4 .. v9}, Lcom/discord/utilities/icon/IconUtils;->getForGuild$default(Lcom/discord/models/domain/ModelGuild;Ljava/lang/String;ZLjava/lang/Integer;ILjava/lang/Object;)Ljava/lang/String; move-result-object v1 @@ -495,41 +606,45 @@ move-result-object v2 - iget v3, v0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->imageRequestSize:I + iget v4, v0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->imageRequestSize:I - invoke-virtual {v2, v3}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; + invoke-virtual {v2, v4}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; invoke-virtual {v2}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; move-result-object v2 - new-instance v3, Ljava/lang/StringBuilder; + new-instance v4, Ljava/lang/StringBuilder; - invoke-direct {v3}, Ljava/lang/StringBuilder;->()V + invoke-direct {v4}, Ljava/lang/StringBuilder;->()V - invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + invoke-virtual {v4, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + invoke-virtual {v4, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; - invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v7 + move-result-object v10 - iget-object v6, v0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatar:Lcom/facebook/drawee/view/SimpleDraweeView; + iget-object v9, v0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatar:Lcom/facebook/drawee/view/SimpleDraweeView; - iget v9, v0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->imageRequestSize:I + iget v12, v0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->imageRequestSize:I - const/4 v10, 0x0 + const/4 v13, 0x0 - const/4 v12, 0x0 + const/4 v15, 0x0 - const/16 v13, 0x70 + const/16 v16, 0x70 - const/4 v14, 0x0 + const/16 v17, 0x0 - move v8, v9 + move v11, v12 - invoke-static/range {v6 .. v14}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V + invoke-static/range {v9 .. v17}, Lcom/discord/utilities/images/MGImages;->setImage$default(Landroid/widget/ImageView;Ljava/lang/String;IIZLkotlin/jvm/functions/Function1;Lcom/discord/utilities/images/MGImages$ChangeDetector;ILjava/lang/Object;)V + + iget-object v1, v0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatar:Lcom/facebook/drawee/view/SimpleDraweeView; + + invoke-virtual {v1, v3}, Landroid/view/View;->setVisibility(I)V iget-object v1, v0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatar:Lcom/facebook/drawee/view/SimpleDraweeView; @@ -539,6 +654,16 @@ invoke-virtual {v1, v2}, Landroid/widget/ImageView;->setContentDescription(Ljava/lang/CharSequence;)V + goto :goto_1 + + :cond_1 + iget-object v1, v0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatar:Lcom/facebook/drawee/view/SimpleDraweeView; + + const/16 v2, 0x8 + + invoke-virtual {v1, v2}, Landroid/view/View;->setVisibility(I)V + + :goto_1 return-void .end method @@ -658,60 +783,6 @@ throw p1 .end method -.method private final configureGuildIconRounding(ZZ)V - .locals 3 - - iget-object v0, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatar:Lcom/facebook/drawee/view/SimpleDraweeView; - - invoke-virtual {v0}, Landroid/widget/ImageView;->getResources()Landroid/content/res/Resources; - - move-result-object v0 - - const v1, 0x7f070192 - - invoke-virtual {v0, v1}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I - - move-result v0 - - int-to-float v0, v0 - - iget-object v1, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatar:Lcom/facebook/drawee/view/SimpleDraweeView; - - xor-int/lit8 v2, p1, 0x1 - - if-eqz p2, :cond_0 - - iget p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->overlayColorInFolder:I - - goto :goto_0 - - :cond_0 - iget p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->overlayColor:I - - :goto_0 - invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - - move-result-object p2 - - invoke-static {v1, v0, v2, p2}, Lcom/discord/utilities/images/MGImages;->setCornerRadius(Landroid/widget/ImageView;FZLjava/lang/Integer;)V - - iget-object p2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatarContainer:Landroid/view/ViewGroup; - - if-eqz p1, :cond_1 - - const p1, 0x7f080161 - - goto :goto_1 - - :cond_1 - const p1, 0x7f080114 - - :goto_1 - invoke-virtual {p2, p1}, Landroid/view/ViewGroup;->setBackgroundResource(I)V - - return-void -.end method - # virtual methods .method public canDrag()Z @@ -739,11 +810,11 @@ .end method .method public final configure(Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;)V - .locals 9 + .locals 10 const/4 v0, 0x0 - if-eqz p1, :cond_11 + if-eqz p1, :cond_13 iget-object v1, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->data:Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem; @@ -974,7 +1045,15 @@ const/4 v8, 0x1 :goto_a - invoke-direct {p0, v7, v8}, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->configureGuildIconRounding(ZZ)V + invoke-virtual {p1}, Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;->getGuild()Lcom/discord/models/domain/ModelGuild; + + move-result-object v9 + + invoke-virtual {v9}, Lcom/discord/models/domain/ModelGuild;->hasIcon()Z + + move-result v9 + + invoke-direct {p0, v7, v8, v9}, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->configureGuildIconBackground(ZZZ)V if-eqz v5, :cond_c @@ -996,9 +1075,9 @@ invoke-virtual {p1}, Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;->isSelected()Z - move-result v2 + move-result v5 - invoke-direct {p0, v1, v2}, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->configureGuildIconImage(Lcom/discord/models/domain/ModelGuild;Z)V + invoke-direct {p0, v1, v5}, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->configureGuildIconImage(Lcom/discord/models/domain/ModelGuild;Z)V :cond_e invoke-direct {p0}, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->configureDraggingAlpha()V @@ -1007,22 +1086,63 @@ if-eqz v6, :cond_f - move-object v2, v0 + move-object v5, v0 goto :goto_b :cond_f invoke-virtual {p1}, Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;->getGuild()Lcom/discord/models/domain/ModelGuild; - move-result-object v2 + move-result-object v5 - invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuild;->getShortName()Ljava/lang/String; + invoke-virtual {v5}, Lcom/discord/models/domain/ModelGuild;->getShortName()Ljava/lang/String; - move-result-object v2 + move-result-object v5 :goto_b - invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + invoke-virtual {v1, v5}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V + if-eqz v2, :cond_11 + + invoke-virtual {p1}, Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;->isSelected()Z + + move-result v1 + + if-eqz v1, :cond_10 + + iget-object v1, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatarText:Landroid/widget/TextView; + + invoke-virtual {v1}, Landroid/widget/TextView;->getContext()Landroid/content/Context; + + move-result-object v1 + + const v2, 0x7f06019e + + invoke-static {v1, v2}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I + + move-result v1 + + goto :goto_c + + :cond_10 + iget-object v1, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatarText:Landroid/widget/TextView; + + invoke-virtual {v1}, Landroid/widget/TextView;->getContext()Landroid/content/Context; + + move-result-object v1 + + const v2, 0x7f0400ec + + invoke-static {v1, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I + + move-result v1 + + :goto_c + iget-object v2, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemAvatarText:Landroid/widget/TextView; + + invoke-virtual {v2, v1}, Landroid/widget/TextView;->setTextColor(I)V + + :cond_11 iget-object v1, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemMentions:Landroid/widget/TextView; invoke-virtual {p1}, Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;->getMentionCount()I @@ -1047,20 +1167,20 @@ move-result v2 - if-nez v2, :cond_10 + if-nez v2, :cond_12 invoke-virtual {p1}, Lcom/discord/widgets/guilds/list/GuildListItem$GuildItem;->getHasOngoingApplicationStream()Z move-result v2 - if-eqz v2, :cond_10 + if-eqz v2, :cond_12 - goto :goto_c + goto :goto_d - :cond_10 + :cond_12 const/4 v3, 0x0 - :goto_c + :goto_d invoke-static {v1, v3, v4, v5, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V iget-object v1, p0, Lcom/discord/widgets/guilds/list/GuildListViewHolder$GuildViewHolder;->itemUnread:Landroid/view/View; @@ -1081,7 +1201,7 @@ return-void - :cond_11 + :cond_13 const-string p1, "data" invoke-static {p1}, Lt/u/b/j;->a(Ljava/lang/String;)V diff --git a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.smali b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.smali index f662c5f083..d2eeaed667 100644 --- a/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.smali +++ b/com.discord/smali/com/discord/widgets/guilds/profile/WidgetGuildProfileSheet.smali @@ -861,7 +861,7 @@ move-result-object v2 - const v4, 0x7f0803f9 + const v4, 0x7f0803fa invoke-virtual {v2, v4}, Landroid/widget/ImageView;->setImageResource(I)V diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.smali index 17f5a9ffa3..db03c7a3c8 100644 --- a/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.smali +++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView.smali @@ -571,7 +571,7 @@ const v14, 0x7f120960 - const v15, 0x7f0803ae + const v15, 0x7f0803af if-eq v1, v3, :cond_13 @@ -656,7 +656,7 @@ new-instance v5, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem; - const v7, 0x7f0803df + const v7, 0x7f0803e0 invoke-virtual {v2, v7, v6}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I @@ -702,7 +702,7 @@ new-instance v3, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem; - const v4, 0x7f0803b6 + const v4, 0x7f0803b7 invoke-virtual {v2, v4, v6}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I @@ -793,7 +793,7 @@ new-instance v5, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkViewAdapter$PremiumGuildSubscriptionPerkViewListItem; - const v7, 0x7f0803df + const v7, 0x7f0803e0 invoke-virtual {v2, v7, v6}, Lcom/discord/widgets/servers/premiumguild/PremiumGuildSubscriptionPerkView$configure$1;->invoke(IZ)I diff --git a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.smali b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.smali index a71a6dcfb5..b6c256f686 100644 --- a/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.smali +++ b/com.discord/smali/com/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription.smali @@ -1966,12 +1966,6 @@ invoke-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar; - new-instance v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter; - - invoke-direct {v0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->()V - - iput-object v0, p0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->pagerAdapter:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter; - invoke-direct {p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->getViewPager()Lcom/discord/utilities/simple_pager/SimplePager; move-result-object v0 @@ -2261,6 +2255,12 @@ invoke-virtual {v0, v1}, Landroid/view/View;->setOnClickListener(Landroid/view/View$OnClickListener;)V + new-instance v0, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter; + + invoke-direct {v0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter;->()V + + iput-object v0, v6, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->pagerAdapter:Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription$PerksPagerAdapter; + invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/servers/premiumguild/WidgetPremiumGuildSubscription;->fetchData()V return-void diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali index e51595bca8..9fd50f13c4 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali @@ -1663,7 +1663,7 @@ invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v0, " - 10.2.0 (1020)" + const-string v0, " - 10.2.1 (1021)" invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali index 2c2b4f5175..618fdaab22 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali @@ -1068,139 +1068,139 @@ const/4 p0, -0x1 :goto_1 - const v0, 0x7f080421 + const v0, 0x7f080422 packed-switch p0, :pswitch_data_0 return v0 :pswitch_0 - const p0, 0x7f080428 - - return p0 - - :pswitch_1 - const p0, 0x7f080436 - - return p0 - - :pswitch_2 - const p0, 0x7f08043a - - return p0 - - :pswitch_3 - const p0, 0x7f08043b - - return p0 - - :pswitch_4 - const p0, 0x7f080432 - - return p0 - - :pswitch_5 const p0, 0x7f080429 return p0 - :pswitch_6 - const p0, 0x7f08042d - - return p0 - - :pswitch_7 - const p0, 0x7f08041f - - return p0 - - :pswitch_8 - const p0, 0x7f08042f - - return p0 - - :pswitch_9 - const p0, 0x7f080424 - - return p0 - - :pswitch_a - const p0, 0x7f08042c - - return p0 - - :pswitch_b - const p0, 0x7f08043c - - return p0 - - :pswitch_c - const p0, 0x7f08042b - - return p0 - - :pswitch_d - const p0, 0x7f080438 - - return p0 - - :pswitch_e - const p0, 0x7f080433 - - return p0 - - :pswitch_f - const p0, 0x7f08041b - - return p0 - - :pswitch_10 - const p0, 0x7f08041c - - return p0 - - :pswitch_11 + :pswitch_1 const p0, 0x7f080437 return p0 - :pswitch_12 - const p0, 0x7f080435 + :pswitch_2 + const p0, 0x7f08043b return p0 - :pswitch_13 - const p0, 0x7f080431 + :pswitch_3 + const p0, 0x7f08043c return p0 - :pswitch_14 - const p0, 0x7f080430 + :pswitch_4 + const p0, 0x7f080433 return p0 - :pswitch_15 - const p0, 0x7f08042e - - return p0 - - :pswitch_16 + :pswitch_5 const p0, 0x7f08042a return p0 - :pswitch_17 + :pswitch_6 + const p0, 0x7f08042e + + return p0 + + :pswitch_7 + const p0, 0x7f080420 + + return p0 + + :pswitch_8 + const p0, 0x7f080430 + + return p0 + + :pswitch_9 const p0, 0x7f080425 return p0 + :pswitch_a + const p0, 0x7f08042d + + return p0 + + :pswitch_b + const p0, 0x7f08043d + + return p0 + + :pswitch_c + const p0, 0x7f08042c + + return p0 + + :pswitch_d + const p0, 0x7f080439 + + return p0 + + :pswitch_e + const p0, 0x7f080434 + + return p0 + + :pswitch_f + const p0, 0x7f08041c + + return p0 + + :pswitch_10 + const p0, 0x7f08041d + + return p0 + + :pswitch_11 + const p0, 0x7f080438 + + return p0 + + :pswitch_12 + const p0, 0x7f080436 + + return p0 + + :pswitch_13 + const p0, 0x7f080432 + + return p0 + + :pswitch_14 + const p0, 0x7f080431 + + return p0 + + :pswitch_15 + const p0, 0x7f08042f + + return p0 + + :pswitch_16 + const p0, 0x7f08042b + + return p0 + + :pswitch_17 + const p0, 0x7f080426 + + return p0 + :pswitch_18 - const p0, 0x7f080422 + const p0, 0x7f080423 return p0 :pswitch_19 - const p0, 0x7f080420 + const p0, 0x7f080421 return p0 @@ -1208,12 +1208,12 @@ return v0 :pswitch_1b - const p0, 0x7f08041e + const p0, 0x7f08041f return p0 :pswitch_1c - const p0, 0x7f08041d + const p0, 0x7f08041e return p0 diff --git a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali index 562d8df213..7659c6e8cc 100644 --- a/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali +++ b/com.discord/smali/com/discord/widgets/settings/premium/WidgetSettingsPremium.smali @@ -2893,12 +2893,12 @@ if-eq p1, v0, :cond_0 - const p1, 0x7f080479 + const p1, 0x7f08047a goto :goto_0 :cond_0 - const p1, 0x7f080476 + const p1, 0x7f080477 :goto_0 return p1 diff --git a/com.discord/smali/com/discord/widgets/user/Badge$Companion.smali b/com.discord/smali/com/discord/widgets/user/Badge$Companion.smali index cadad6fcff..724b53588a 100644 --- a/com.discord/smali/com/discord/widgets/user/Badge$Companion.smali +++ b/com.discord/smali/com/discord/widgets/user/Badge$Companion.smali @@ -34,7 +34,7 @@ # virtual methods .method public final getBadgesForUser(Lcom/discord/models/domain/ModelUserProfile;IZLandroid/content/Context;)Ljava/util/List; - .locals 18 + .locals 19 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -56,9 +56,9 @@ const/4 v3, 0x0 - if-eqz v0, :cond_19 + if-eqz v0, :cond_1a - if-eqz v2, :cond_18 + if-eqz v2, :cond_19 new-instance v3, Ljava/util/ArrayList; @@ -82,7 +82,7 @@ new-instance v4, Lcom/discord/widgets/user/Badge; - const v7, 0x7f080386 + const v7, 0x7f080387 const v6, 0x7f06002d @@ -127,7 +127,7 @@ new-instance v4, Lcom/discord/widgets/user/Badge; - const v7, 0x7f08037b + const v7, 0x7f08037c const v6, 0x7f040103 @@ -172,7 +172,7 @@ new-instance v4, Lcom/discord/widgets/user/Badge; - const v7, 0x7f080379 + const v7, 0x7f08037a const v6, 0x7f06016c @@ -462,41 +462,41 @@ invoke-static {v1, v5}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->isBugHunter()Z + invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->isBugHunterLevel1()Z move-result v1 + const v4, 0x7f120341 + + const v9, 0x7f060148 + if-eqz v1, :cond_c new-instance v1, Lcom/discord/widgets/user/Badge; - const v10, 0x7f080378 + const v11, 0x7f080378 - const v4, 0x7f060148 + invoke-static {v2, v9}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I - invoke-static {v2, v4}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I - - move-result v11 - - const v4, 0x7f120341 + move-result v12 invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String; - move-result-object v12 - - const/4 v13, 0x0 + move-result-object v13 const/4 v14, 0x0 const/4 v15, 0x0 - const/16 v16, 0x38 + const/16 v16, 0x0 - const/16 v17, 0x0 + const/16 v17, 0x38 - move-object v9, v1 + const/16 v18, 0x0 - invoke-direct/range {v9 .. v17}, Lcom/discord/widgets/user/Badge;->(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + move-object v10, v1 + + invoke-direct/range {v10 .. v18}, Lcom/discord/widgets/user/Badge;->(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V invoke-virtual {v3, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z @@ -507,17 +507,58 @@ invoke-static {v1, v5}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->isBugHunterLevel2()Z + + move-result v1 + + if-eqz v1, :cond_d + + new-instance v1, Lcom/discord/widgets/user/Badge; + + const v11, 0x7f080379 + + invoke-static {v2, v9}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I + + move-result v12 + + invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String; + + move-result-object v13 + + const/4 v14, 0x0 + + const/4 v15, 0x0 + + const/16 v16, 0x0 + + const/16 v17, 0x38 + + const/16 v18, 0x0 + + move-object v10, v1 + + invoke-direct/range {v10 .. v18}, Lcom/discord/widgets/user/Badge;->(IILjava/lang/String;Ljava/lang/String;ZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + + invoke-virtual {v3, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z + + :cond_d + invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserProfile;->getUser()Lcom/discord/models/domain/ModelUser; + + move-result-object v1 + + invoke-static {v1, v5}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V + invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->isPremiumEarlySupporter()Z move-result v1 const v4, 0x7f040382 - if-eqz v1, :cond_d + if-eqz v1, :cond_e new-instance v1, Lcom/discord/widgets/user/Badge; - const v10, 0x7f08037c + const v10, 0x7f08037d invoke-static {v2, v4}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I @@ -545,18 +586,18 @@ invoke-virtual {v3, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z - :cond_d + :cond_e invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserProfile;->isPremium()Z move-result v1 const v5, 0x7f120f5e - if-eqz v1, :cond_e + if-eqz v1, :cond_f new-instance v1, Lcom/discord/widgets/user/Badge; - const v10, 0x7f08037a + const v10, 0x7f08037b invoke-static {v2, v4}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I @@ -590,12 +631,12 @@ invoke-virtual {v3, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z - :cond_e + :cond_f invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserProfile;->isPremiumGuildSubscriber()Z move-result v1 - if-eqz v1, :cond_17 + if-eqz v1, :cond_18 invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelUserProfile;->getPremiumGuildMonthsSubscribed()Ljava/lang/Integer; @@ -611,17 +652,17 @@ move-result v9 - const v10, 0x7f08037d + const v10, 0x7f08037e - if-ltz v9, :cond_f + if-ltz v9, :cond_10 - const v10, 0x7f080385 + const v10, 0x7f080386 - const v12, 0x7f080385 + const v12, 0x7f080386 goto/16 :goto_6 - :cond_f + :cond_10 invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I move-result v9 @@ -632,15 +673,15 @@ move-result v9 - if-ltz v9, :cond_10 + if-ltz v9, :cond_11 - const v10, 0x7f080384 + const v10, 0x7f080385 - const v12, 0x7f080384 + const v12, 0x7f080385 goto/16 :goto_6 - :cond_10 + :cond_11 invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I move-result v9 @@ -651,15 +692,15 @@ move-result v9 - if-ltz v9, :cond_11 + if-ltz v9, :cond_12 - const v10, 0x7f080383 + const v10, 0x7f080384 - const v12, 0x7f080383 + const v12, 0x7f080384 goto :goto_6 - :cond_11 + :cond_12 invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I move-result v9 @@ -670,15 +711,15 @@ move-result v9 - if-ltz v9, :cond_12 + if-ltz v9, :cond_13 - const v10, 0x7f080382 + const v10, 0x7f080383 - const v12, 0x7f080382 + const v12, 0x7f080383 goto :goto_6 - :cond_12 + :cond_13 invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I move-result v9 @@ -689,15 +730,15 @@ move-result v9 - if-ltz v9, :cond_13 + if-ltz v9, :cond_14 - const v10, 0x7f080381 + const v10, 0x7f080382 - const v12, 0x7f080381 + const v12, 0x7f080382 goto :goto_6 - :cond_13 + :cond_14 invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I move-result v9 @@ -708,15 +749,15 @@ move-result v9 - if-ltz v9, :cond_14 + if-ltz v9, :cond_15 - const v10, 0x7f080380 + const v10, 0x7f080381 - const v12, 0x7f080380 + const v12, 0x7f080381 goto :goto_6 - :cond_14 + :cond_15 invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I move-result v9 @@ -725,15 +766,15 @@ move-result v6 - if-ltz v6, :cond_15 + if-ltz v6, :cond_16 - const v10, 0x7f08037f + const v10, 0x7f080380 - const v12, 0x7f08037f + const v12, 0x7f080380 goto :goto_6 - :cond_15 + :cond_16 invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I move-result v6 @@ -744,15 +785,15 @@ move-result v6 - if-ltz v6, :cond_16 + if-ltz v6, :cond_17 - const v10, 0x7f08037e + const v10, 0x7f08037f - const v12, 0x7f08037e + const v12, 0x7f08037f goto :goto_6 - :cond_16 + :cond_17 invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I move-result v1 @@ -761,7 +802,7 @@ move-result v1 - const v12, 0x7f08037d + const v12, 0x7f08037e :goto_6 new-instance v1, Lcom/discord/widgets/user/Badge; @@ -798,17 +839,17 @@ invoke-virtual {v3, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z - :cond_17 + :cond_18 return-object v3 - :cond_18 + :cond_19 const-string v0, "context" invoke-static {v0}, Lt/u/b/j;->a(Ljava/lang/String;)V throw v3 - :cond_19 + :cond_1a const-string v0, "profile" invoke-static {v0}, Lt/u/b/j;->a(Ljava/lang/String;)V diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserSetCustomStatus.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserSetCustomStatus.smali index 55f1a886b2..c2cadf4ea3 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserSetCustomStatus.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserSetCustomStatus.smali @@ -741,7 +741,7 @@ move-result-object v3 - const v6, 0x7f0803af + const v6, 0x7f0803b0 invoke-virtual {v3, v6}, Lcom/facebook/drawee/view/SimpleDraweeView;->setActualImageResource(I)V diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali index b70df86994..bbf0b54252 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali @@ -640,7 +640,7 @@ move-result-object v1 - const v2, 0x7f0803bb + const v2, 0x7f0803bc const v3, 0x7f121196 @@ -668,7 +668,7 @@ move-result-object v1 - const v2, 0x7f0803b9 + const v2, 0x7f0803ba const v3, 0x7f121192 @@ -688,7 +688,7 @@ move-result-object p1 - const p2, 0x7f0803b8 + const p2, 0x7f0803b9 const v0, 0x7f121190 @@ -714,7 +714,7 @@ move-result-object p1 - const p2, 0x7f0803ba + const p2, 0x7f0803bb const v0, 0x7f121193 diff --git a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali index f94bc181e7..82561ed8c8 100644 --- a/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali +++ b/com.discord/smali/com/discord/widgets/user/profile/WidgetUserProfileStrip.smali @@ -438,7 +438,7 @@ if-eqz v0, :cond_3 - const v2, 0x7f0803a2 + const v2, 0x7f0803a3 goto :goto_2 diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView.smali index c6cf156323..5e773e813d 100644 --- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView.smali +++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView.smali @@ -368,12 +368,12 @@ if-eqz v1, :cond_2 - const v2, 0x7f0803ff + const v2, 0x7f080400 goto :goto_2 :cond_2 - const v2, 0x7f0803fe + const v2, 0x7f0803ff :goto_2 invoke-virtual {v0, v2}, Landroid/widget/ImageView;->setImageResource(I)V diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali index 45b2a5d82d..5f42115998 100644 --- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali +++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali @@ -475,7 +475,7 @@ if-eqz v0, :cond_7 - const v0, 0x7f0803ff + const v0, 0x7f080400 goto :goto_4 diff --git a/com.discord/smali/e/a/a/a/a.smali b/com.discord/smali/e/a/a/a/a.smali index d97e8320c9..954e09f8b2 100644 --- a/com.discord/smali/e/a/a/a/a.smali +++ b/com.discord/smali/e/a/a/a/a.smali @@ -234,7 +234,7 @@ invoke-static {v5, v6}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - const v6, 0x7f080499 + const v6, 0x7f08049a invoke-direct {v3, v6, v4, v5}, Le/a/a/a/a$c;->(ILjava/lang/String;Ljava/lang/String;)V @@ -262,7 +262,7 @@ invoke-static {v5, v6}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - const v6, 0x7f08046c + const v6, 0x7f08046d invoke-direct {v3, v6, v4, v5}, Le/a/a/a/a$c;->(ILjava/lang/String;Ljava/lang/String;)V @@ -292,7 +292,7 @@ invoke-static {v6, v7}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - const v7, 0x7f080444 + const v7, 0x7f080445 invoke-direct {v3, v7, v5, v6}, Le/a/a/a/a$c;->(ILjava/lang/String;Ljava/lang/String;)V @@ -340,7 +340,7 @@ invoke-static {v5, v7}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - const v7, 0x7f08049a + const v7, 0x7f08049b invoke-direct {v3, v7, v6, v5}, Le/a/a/a/a$c;->(ILjava/lang/String;Ljava/lang/String;)V @@ -370,7 +370,7 @@ invoke-static {v6, v7}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - const v7, 0x7f08044c + const v7, 0x7f08044d invoke-direct {v3, v7, v5, v6}, Le/a/a/a/a$c;->(ILjava/lang/String;Ljava/lang/String;)V @@ -398,7 +398,7 @@ invoke-static {v5, v6}, Lt/u/b/j;->checkExpressionValueIsNotNull(Ljava/lang/Object;Ljava/lang/String;)V - const v6, 0x7f08044f + const v6, 0x7f080450 invoke-direct {v0, v6, v3, v5}, Le/a/a/a/a$c;->(ILjava/lang/String;Ljava/lang/String;)V diff --git a/com.discord/smali/e/a/j/v.smali b/com.discord/smali/e/a/j/v.smali index 073e850d77..e77f8db0fa 100644 --- a/com.discord/smali/e/a/j/v.smali +++ b/com.discord/smali/e/a/j/v.smali @@ -53,7 +53,7 @@ goto :goto_0 :cond_0 - const v1, 0x7f080408 + const v1, 0x7f080409 :goto_0 invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageResource(I)V diff --git a/com.discord/smali/WidgetRemoteAuthViewModel$f.smali b/com.discord/smali_classes2/WidgetRemoteAuthViewModel$f.smali similarity index 100% rename from com.discord/smali/WidgetRemoteAuthViewModel$f.smali rename to com.discord/smali_classes2/WidgetRemoteAuthViewModel$f.smali diff --git a/com.discord/smali_classes2/com/google/android/material/R$drawable.smali b/com.discord/smali_classes2/com/google/android/material/R$drawable.smali index 5a9129d42d..9aae984975 100644 --- a/com.discord/smali_classes2/com/google/android/material/R$drawable.smali +++ b/com.discord/smali_classes2/com/google/android/material/R$drawable.smali @@ -241,55 +241,55 @@ .field public static final ic_mtrl_chip_close_circle:I = 0x7f08032e -.field public static final mtrl_dialog_background:I = 0x7f0804a8 +.field public static final mtrl_dialog_background:I = 0x7f0804a9 -.field public static final mtrl_dropdown_arrow:I = 0x7f0804a9 +.field public static final mtrl_dropdown_arrow:I = 0x7f0804aa -.field public static final mtrl_ic_arrow_drop_down:I = 0x7f0804aa +.field public static final mtrl_ic_arrow_drop_down:I = 0x7f0804ab -.field public static final mtrl_ic_arrow_drop_up:I = 0x7f0804ab +.field public static final mtrl_ic_arrow_drop_up:I = 0x7f0804ac -.field public static final mtrl_ic_cancel:I = 0x7f0804ac +.field public static final mtrl_ic_cancel:I = 0x7f0804ad -.field public static final mtrl_ic_error:I = 0x7f0804ad +.field public static final mtrl_ic_error:I = 0x7f0804ae -.field public static final mtrl_popupmenu_background:I = 0x7f0804ae +.field public static final mtrl_popupmenu_background:I = 0x7f0804af -.field public static final mtrl_popupmenu_background_dark:I = 0x7f0804af +.field public static final mtrl_popupmenu_background_dark:I = 0x7f0804b0 -.field public static final mtrl_tabs_default_indicator:I = 0x7f0804b0 +.field public static final mtrl_tabs_default_indicator:I = 0x7f0804b1 -.field public static final navigation_empty_icon:I = 0x7f0804b1 +.field public static final navigation_empty_icon:I = 0x7f0804b2 -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be -.field public static final test_custom_background:I = 0x7f0804cb +.field public static final test_custom_background:I = 0x7f0804cc -.field public static final tooltip_frame_dark:I = 0x7f0804cc +.field public static final tooltip_frame_dark:I = 0x7f0804cd -.field public static final tooltip_frame_light:I = 0x7f0804cd +.field public static final tooltip_frame_light:I = 0x7f0804ce # direct methods diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/R$d.smali b/com.discord/smali_classes2/com/lytefast/flexinput/R$d.smali index 028b2068da..faf46d4ddd 100644 --- a/com.discord/smali_classes2/com/lytefast/flexinput/R$d.smali +++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$d.smali @@ -285,59 +285,59 @@ .field public static final ic_mtrl_chip_close_circle:I = 0x7f08032e -.field public static final ic_send_24dp:I = 0x7f08039e +.field public static final ic_send_24dp:I = 0x7f08039f -.field public static final ic_take_photo:I = 0x7f0803c4 +.field public static final ic_take_photo:I = 0x7f0803c5 -.field public static final mtrl_dialog_background:I = 0x7f0804a8 +.field public static final mtrl_dialog_background:I = 0x7f0804a9 -.field public static final mtrl_dropdown_arrow:I = 0x7f0804a9 +.field public static final mtrl_dropdown_arrow:I = 0x7f0804aa -.field public static final mtrl_ic_arrow_drop_down:I = 0x7f0804aa +.field public static final mtrl_ic_arrow_drop_down:I = 0x7f0804ab -.field public static final mtrl_ic_arrow_drop_up:I = 0x7f0804ab +.field public static final mtrl_ic_arrow_drop_up:I = 0x7f0804ac -.field public static final mtrl_ic_cancel:I = 0x7f0804ac +.field public static final mtrl_ic_cancel:I = 0x7f0804ad -.field public static final mtrl_ic_error:I = 0x7f0804ad +.field public static final mtrl_ic_error:I = 0x7f0804ae -.field public static final mtrl_popupmenu_background:I = 0x7f0804ae +.field public static final mtrl_popupmenu_background:I = 0x7f0804af -.field public static final mtrl_popupmenu_background_dark:I = 0x7f0804af +.field public static final mtrl_popupmenu_background_dark:I = 0x7f0804b0 -.field public static final mtrl_tabs_default_indicator:I = 0x7f0804b0 +.field public static final mtrl_tabs_default_indicator:I = 0x7f0804b1 -.field public static final navigation_empty_icon:I = 0x7f0804b1 +.field public static final navigation_empty_icon:I = 0x7f0804b2 -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be -.field public static final test_custom_background:I = 0x7f0804cb +.field public static final test_custom_background:I = 0x7f0804cc -.field public static final tooltip_frame_dark:I = 0x7f0804cc +.field public static final tooltip_frame_dark:I = 0x7f0804cd -.field public static final tooltip_frame_light:I = 0x7f0804cd +.field public static final tooltip_frame_light:I = 0x7f0804ce # direct methods diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$drawable.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$drawable.smali index dc42260829..88d020677a 100644 --- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$drawable.smali +++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$drawable.smali @@ -183,57 +183,57 @@ .field public static final abc_vector_test:I = 0x7f08006f -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be -.field public static final tooltip_frame_dark:I = 0x7f0804cc +.field public static final tooltip_frame_dark:I = 0x7f0804cd -.field public static final tooltip_frame_light:I = 0x7f0804cd +.field public static final tooltip_frame_light:I = 0x7f0804ce -.field public static final ucrop_ic_angle:I = 0x7f0804cf +.field public static final ucrop_ic_angle:I = 0x7f0804d0 -.field public static final ucrop_ic_crop:I = 0x7f0804d0 +.field public static final ucrop_ic_crop:I = 0x7f0804d1 -.field public static final ucrop_ic_cross:I = 0x7f0804d1 +.field public static final ucrop_ic_cross:I = 0x7f0804d2 -.field public static final ucrop_ic_done:I = 0x7f0804d2 +.field public static final ucrop_ic_done:I = 0x7f0804d3 -.field public static final ucrop_ic_next:I = 0x7f0804d3 +.field public static final ucrop_ic_next:I = 0x7f0804d4 -.field public static final ucrop_ic_reset:I = 0x7f0804d4 +.field public static final ucrop_ic_reset:I = 0x7f0804d5 -.field public static final ucrop_ic_rotate:I = 0x7f0804d5 +.field public static final ucrop_ic_rotate:I = 0x7f0804d6 -.field public static final ucrop_ic_scale:I = 0x7f0804d6 +.field public static final ucrop_ic_scale:I = 0x7f0804d7 -.field public static final ucrop_shadow_upside:I = 0x7f0804d7 +.field public static final ucrop_shadow_upside:I = 0x7f0804d8 -.field public static final ucrop_vector_ic_crop:I = 0x7f0804d8 +.field public static final ucrop_vector_ic_crop:I = 0x7f0804d9 -.field public static final ucrop_vector_loader:I = 0x7f0804d9 +.field public static final ucrop_vector_loader:I = 0x7f0804da -.field public static final ucrop_vector_loader_animated:I = 0x7f0804da +.field public static final ucrop_vector_loader_animated:I = 0x7f0804db # direct methods diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/R$c.smali b/com.discord/smali_classes2/com/yalantis/ucrop/R$c.smali index 679571d0d3..e73fdd98bd 100644 --- a/com.discord/smali_classes2/com/yalantis/ucrop/R$c.smali +++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$c.smali @@ -181,57 +181,57 @@ .field public static final abc_vector_test:I = 0x7f08006f -.field public static final notification_action_background:I = 0x7f0804b2 +.field public static final notification_action_background:I = 0x7f0804b3 -.field public static final notification_bg:I = 0x7f0804b3 +.field public static final notification_bg:I = 0x7f0804b4 -.field public static final notification_bg_low:I = 0x7f0804b4 +.field public static final notification_bg_low:I = 0x7f0804b5 -.field public static final notification_bg_low_normal:I = 0x7f0804b5 +.field public static final notification_bg_low_normal:I = 0x7f0804b6 -.field public static final notification_bg_low_pressed:I = 0x7f0804b6 +.field public static final notification_bg_low_pressed:I = 0x7f0804b7 -.field public static final notification_bg_normal:I = 0x7f0804b7 +.field public static final notification_bg_normal:I = 0x7f0804b8 -.field public static final notification_bg_normal_pressed:I = 0x7f0804b8 +.field public static final notification_bg_normal_pressed:I = 0x7f0804b9 -.field public static final notification_icon_background:I = 0x7f0804b9 +.field public static final notification_icon_background:I = 0x7f0804ba -.field public static final notification_template_icon_bg:I = 0x7f0804ba +.field public static final notification_template_icon_bg:I = 0x7f0804bb -.field public static final notification_template_icon_low_bg:I = 0x7f0804bb +.field public static final notification_template_icon_low_bg:I = 0x7f0804bc -.field public static final notification_tile_bg:I = 0x7f0804bc +.field public static final notification_tile_bg:I = 0x7f0804bd -.field public static final notify_panel_notification_icon_bg:I = 0x7f0804bd +.field public static final notify_panel_notification_icon_bg:I = 0x7f0804be -.field public static final tooltip_frame_dark:I = 0x7f0804cc +.field public static final tooltip_frame_dark:I = 0x7f0804cd -.field public static final tooltip_frame_light:I = 0x7f0804cd +.field public static final tooltip_frame_light:I = 0x7f0804ce -.field public static final ucrop_ic_angle:I = 0x7f0804cf +.field public static final ucrop_ic_angle:I = 0x7f0804d0 -.field public static final ucrop_ic_crop:I = 0x7f0804d0 +.field public static final ucrop_ic_crop:I = 0x7f0804d1 -.field public static final ucrop_ic_cross:I = 0x7f0804d1 +.field public static final ucrop_ic_cross:I = 0x7f0804d2 -.field public static final ucrop_ic_done:I = 0x7f0804d2 +.field public static final ucrop_ic_done:I = 0x7f0804d3 -.field public static final ucrop_ic_next:I = 0x7f0804d3 +.field public static final ucrop_ic_next:I = 0x7f0804d4 -.field public static final ucrop_ic_reset:I = 0x7f0804d4 +.field public static final ucrop_ic_reset:I = 0x7f0804d5 -.field public static final ucrop_ic_rotate:I = 0x7f0804d5 +.field public static final ucrop_ic_rotate:I = 0x7f0804d6 -.field public static final ucrop_ic_scale:I = 0x7f0804d6 +.field public static final ucrop_ic_scale:I = 0x7f0804d7 -.field public static final ucrop_shadow_upside:I = 0x7f0804d7 +.field public static final ucrop_shadow_upside:I = 0x7f0804d8 -.field public static final ucrop_vector_ic_crop:I = 0x7f0804d8 +.field public static final ucrop_vector_ic_crop:I = 0x7f0804d9 -.field public static final ucrop_vector_loader:I = 0x7f0804d9 +.field public static final ucrop_vector_loader:I = 0x7f0804da -.field public static final ucrop_vector_loader_animated:I = 0x7f0804da +.field public static final ucrop_vector_loader_animated:I = 0x7f0804db # direct methods diff --git a/com.discord/smali_classes2/e/k/a/b/e/p/g.smali b/com.discord/smali_classes2/e/k/a/b/e/p/g.smali index 5a191500ba..1da744bb30 100644 --- a/com.discord/smali_classes2/e/k/a/b/e/p/g.smali +++ b/com.discord/smali_classes2/e/k/a/b/e/p/g.smali @@ -18230,6 +18230,62 @@ throw v0 .end method +.method public static final flatten(Ljava/lang/Iterable;)Ljava/util/List; + .locals 2 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Ljava/lang/Iterable<", + "+", + "Ljava/lang/Iterable<", + "+TT;>;>;)", + "Ljava/util/List<", + "TT;>;" + } + .end annotation + + if-eqz p0, :cond_1 + + new-instance v0, Ljava/util/ArrayList; + + invoke-direct {v0}, Ljava/util/ArrayList;->()V + + invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; + + move-result-object p0 + + :goto_0 + invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z + + move-result v1 + + if-eqz v1, :cond_0 + + invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object; + + move-result-object v1 + + check-cast v1, Ljava/lang/Iterable; + + invoke-static {v0, v1}, Le/k/a/b/e/p/g;->addAll(Ljava/util/Collection;Ljava/lang/Iterable;)Z + + goto :goto_0 + + :cond_0 + return-object v0 + + :cond_1 + const-string p0, "$this$flatten" + + invoke-static {p0}, Lt/u/b/j;->a(Ljava/lang/String;)V + + const/4 p0, 0x0 + + throw p0 +.end method + .method public static g([BI)D .locals 0 diff --git a/com.discord/smali_classes2/t/q/l.smali b/com.discord/smali_classes2/t/q/l.smali index c772aaf1b0..d3174621c6 100644 --- a/com.discord/smali_classes2/t/q/l.smali +++ b/com.discord/smali_classes2/t/q/l.smali @@ -2905,6 +2905,77 @@ throw p0 .end method +.method public static final toMap(Ljava/lang/Iterable;Ljava/util/Map;)Ljava/util/Map; + .locals 2 + .annotation system Ldalvik/annotation/Signature; + value = { + ";>(", + "Ljava/lang/Iterable<", + "+", + "Lkotlin/Pair<", + "+TK;+TV;>;>;TM;)TM;" + } + .end annotation + + const/4 v0, 0x0 + + if-eqz p0, :cond_2 + + if-eqz p1, :cond_1 + + invoke-interface {p0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; + + move-result-object p0 + + :goto_0 + invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z + + move-result v0 + + if-eqz v0, :cond_0 + + invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object; + + move-result-object v0 + + check-cast v0, Lkotlin/Pair; + + invoke-virtual {v0}, Lkotlin/Pair;->component1()Ljava/lang/Object; + + move-result-object v1 + + invoke-virtual {v0}, Lkotlin/Pair;->component2()Ljava/lang/Object; + + move-result-object v0 + + invoke-interface {p1, v1, v0}, Ljava/util/Map;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + + goto :goto_0 + + :cond_0 + return-object p1 + + :cond_1 + const-string p0, "destination" + + invoke-static {p0}, Lt/u/b/j;->a(Ljava/lang/String;)V + + throw v0 + + :cond_2 + const-string p0, "$this$toMap" + + invoke-static {p0}, Lt/u/b/j;->a(Ljava/lang/String;)V + + throw v0 +.end method + .method public static final toMutableList(Ljava/lang/Iterable;)Ljava/util/List; .locals 1 .annotation system Ldalvik/annotation/Signature;