diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml
index ffb35067d4..35641e270a 100644
--- a/com.discord/apktool.yml
+++ b/com.discord/apktool.yml
@@ -1,5 +1,5 @@
!!brut.androlib.meta.MetaInfo
-apkFileName: com.discord-899.apk
+apkFileName: com.discord-900.apk
compressionType: false
doNotCompress:
- arsc
@@ -308,5 +308,5 @@ usesFramework:
tag: null
version: 2.4.1-cc194d-SNAPSHOT
versionInfo:
- versionCode: '899'
- versionName: 8.9.9
+ versionCode: '900'
+ versionName: 9.0.0
diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties
index f1cfc7bf64..f2f6f90176 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!
#
-#Thu May 16 21:14:24 UTC 2019
-version_name=8.9.9
+#Sat May 18 00:12:05 UTC 2019
+version_name=9.0.0
package_name=com.discord
-build_id=9ec31162-042b-4b7f-98cc-515f700a1ace
-version_code=899
+build_id=ce62f3f4-37cc-4902-88d7-680c54d11b1e
+version_code=900
app_name=com.discord
diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml
index e6d1e6a053..07dc80486f 100644
Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ
diff --git a/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_1.xml b/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_1.xml
new file mode 100644
index 0000000000..b3026162ca
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_1.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_1_banner.xml b/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_1_banner.xml
new file mode 100644
index 0000000000..954f727548
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_1_banner.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_2.xml b/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_2.xml
new file mode 100644
index 0000000000..11a335dd26
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_2.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_2_banner.xml b/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_2_banner.xml
new file mode 100644
index 0000000000..d199dbccd8
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_2_banner.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_3.xml b/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_3.xml
new file mode 100644
index 0000000000..2433183282
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_3.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_3_banner.xml b/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_3_banner.xml
new file mode 100644
index 0000000000..ddd1c568d3
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v21/ic_guild_badge_premium_tier_3_banner.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/ic_guild_nitro_progress.xml b/com.discord/res/drawable-anydpi-v21/ic_guild_nitro_progress.xml
new file mode 100644
index 0000000000..106fdf7a9b
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v21/ic_guild_nitro_progress.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/ic_guild_nitro_progress_banner.xml b/com.discord/res/drawable-anydpi-v21/ic_guild_nitro_progress_banner.xml
new file mode 100644
index 0000000000..53a4df8089
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v21/ic_guild_nitro_progress_banner.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/ic_partnered_badge.xml b/com.discord/res/drawable-anydpi-v21/ic_partnered_badge.xml
new file mode 100644
index 0000000000..92f7e0c3f9
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v21/ic_partnered_badge.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/ic_partnered_badge_banner.xml b/com.discord/res/drawable-anydpi-v21/ic_partnered_badge_banner.xml
new file mode 100644
index 0000000000..d2b836af33
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v21/ic_partnered_badge_banner.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/ic_user_premium_guild_subscription.xml b/com.discord/res/drawable-anydpi-v21/ic_user_premium_guild_subscription.xml
new file mode 100644
index 0000000000..82478a135c
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v21/ic_user_premium_guild_subscription.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/ic_verified_badge.xml b/com.discord/res/drawable-anydpi-v21/ic_verified_badge.xml
new file mode 100644
index 0000000000..97d41dd95e
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v21/ic_verified_badge.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v21/ic_verified_badge_banner.xml b/com.discord/res/drawable-anydpi-v21/ic_verified_badge_banner.xml
new file mode 100644
index 0000000000..87362ddeb9
--- /dev/null
+++ b/com.discord/res/drawable-anydpi-v21/ic_verified_badge_banner.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v24/ic_verified_check.xml b/com.discord/res/drawable-anydpi-v24/ic_verified_check.xml
deleted file mode 100644
index a3a6f15d34..0000000000
--- a/com.discord/res/drawable-anydpi-v24/ic_verified_check.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable-anydpi-v24/ic_verified_check_brand.xml b/com.discord/res/drawable-anydpi-v24/ic_verified_check_brand.xml
deleted file mode 100644
index c9adafe16b..0000000000
--- a/com.discord/res/drawable-anydpi-v24/ic_verified_check_brand.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/com.discord/res/drawable-hdpi/ic_guild_badge_premium_tier_1.png b/com.discord/res/drawable-hdpi/ic_guild_badge_premium_tier_1.png
new file mode 100644
index 0000000000..ae122d2ae1
Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_guild_badge_premium_tier_1.png differ
diff --git a/com.discord/res/drawable-hdpi/ic_guild_badge_premium_tier_1_banner.png b/com.discord/res/drawable-hdpi/ic_guild_badge_premium_tier_1_banner.png
new file mode 100644
index 0000000000..0fe50f68f2
Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_guild_badge_premium_tier_1_banner.png differ
diff --git a/com.discord/res/drawable-hdpi/ic_guild_badge_premium_tier_2.png b/com.discord/res/drawable-hdpi/ic_guild_badge_premium_tier_2.png
new file mode 100644
index 0000000000..4195ecfc87
Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_guild_badge_premium_tier_2.png differ
diff --git a/com.discord/res/drawable-hdpi/ic_guild_badge_premium_tier_2_banner.png b/com.discord/res/drawable-hdpi/ic_guild_badge_premium_tier_2_banner.png
new file mode 100644
index 0000000000..52585f8766
Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_guild_badge_premium_tier_2_banner.png differ
diff --git a/com.discord/res/drawable-hdpi/ic_guild_badge_premium_tier_3.png b/com.discord/res/drawable-hdpi/ic_guild_badge_premium_tier_3.png
new file mode 100644
index 0000000000..04a2f5e452
Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_guild_badge_premium_tier_3.png differ
diff --git a/com.discord/res/drawable-hdpi/ic_guild_badge_premium_tier_3_banner.png b/com.discord/res/drawable-hdpi/ic_guild_badge_premium_tier_3_banner.png
new file mode 100644
index 0000000000..dee44cac71
Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_guild_badge_premium_tier_3_banner.png differ
diff --git a/com.discord/res/drawable-hdpi/ic_guild_nitro_progress.png b/com.discord/res/drawable-hdpi/ic_guild_nitro_progress.png
new file mode 100644
index 0000000000..56399a391c
Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_guild_nitro_progress.png differ
diff --git a/com.discord/res/drawable-hdpi/ic_guild_nitro_progress_banner.png b/com.discord/res/drawable-hdpi/ic_guild_nitro_progress_banner.png
new file mode 100644
index 0000000000..f3065e4e91
Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_guild_nitro_progress_banner.png differ
diff --git a/com.discord/res/drawable-hdpi/ic_partnered_badge.png b/com.discord/res/drawable-hdpi/ic_partnered_badge.png
new file mode 100644
index 0000000000..c3ab0d085b
Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_partnered_badge.png differ
diff --git a/com.discord/res/drawable-hdpi/ic_partnered_badge_banner.png b/com.discord/res/drawable-hdpi/ic_partnered_badge_banner.png
new file mode 100644
index 0000000000..e4e01342bd
Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_partnered_badge_banner.png differ
diff --git a/com.discord/res/drawable-hdpi/ic_user_premium_guild_subscription.png b/com.discord/res/drawable-hdpi/ic_user_premium_guild_subscription.png
new file mode 100644
index 0000000000..8b246759af
Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_user_premium_guild_subscription.png differ
diff --git a/com.discord/res/drawable-hdpi/ic_verified_badge.png b/com.discord/res/drawable-hdpi/ic_verified_badge.png
new file mode 100644
index 0000000000..894e304f6d
Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_verified_badge.png differ
diff --git a/com.discord/res/drawable-hdpi/ic_verified_badge_banner.png b/com.discord/res/drawable-hdpi/ic_verified_badge_banner.png
new file mode 100644
index 0000000000..e14cbde3a7
Binary files /dev/null and b/com.discord/res/drawable-hdpi/ic_verified_badge_banner.png differ
diff --git a/com.discord/res/drawable-hdpi/ic_verified_check.png b/com.discord/res/drawable-hdpi/ic_verified_check.png
deleted file mode 100644
index f5b5cfd358..0000000000
Binary files a/com.discord/res/drawable-hdpi/ic_verified_check.png and /dev/null differ
diff --git a/com.discord/res/drawable-hdpi/ic_verified_check_brand.png b/com.discord/res/drawable-hdpi/ic_verified_check_brand.png
deleted file mode 100644
index 1f6dbefaef..0000000000
Binary files a/com.discord/res/drawable-hdpi/ic_verified_check_brand.png and /dev/null differ
diff --git a/com.discord/res/drawable-ldpi/ic_guild_badge_premium_tier_1.png b/com.discord/res/drawable-ldpi/ic_guild_badge_premium_tier_1.png
new file mode 100644
index 0000000000..7977b8b02c
Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_guild_badge_premium_tier_1.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_guild_badge_premium_tier_1_banner.png b/com.discord/res/drawable-ldpi/ic_guild_badge_premium_tier_1_banner.png
new file mode 100644
index 0000000000..5dd4f7dd86
Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_guild_badge_premium_tier_1_banner.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_guild_badge_premium_tier_2.png b/com.discord/res/drawable-ldpi/ic_guild_badge_premium_tier_2.png
new file mode 100644
index 0000000000..7e8c8308e4
Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_guild_badge_premium_tier_2.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_guild_badge_premium_tier_2_banner.png b/com.discord/res/drawable-ldpi/ic_guild_badge_premium_tier_2_banner.png
new file mode 100644
index 0000000000..45cdadf46f
Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_guild_badge_premium_tier_2_banner.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_guild_badge_premium_tier_3.png b/com.discord/res/drawable-ldpi/ic_guild_badge_premium_tier_3.png
new file mode 100644
index 0000000000..21ed1cc4a3
Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_guild_badge_premium_tier_3.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_guild_badge_premium_tier_3_banner.png b/com.discord/res/drawable-ldpi/ic_guild_badge_premium_tier_3_banner.png
new file mode 100644
index 0000000000..9fc1b92a4e
Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_guild_badge_premium_tier_3_banner.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_guild_nitro_progress.png b/com.discord/res/drawable-ldpi/ic_guild_nitro_progress.png
new file mode 100644
index 0000000000..f9853db326
Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_guild_nitro_progress.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_guild_nitro_progress_banner.png b/com.discord/res/drawable-ldpi/ic_guild_nitro_progress_banner.png
new file mode 100644
index 0000000000..f053efe702
Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_guild_nitro_progress_banner.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_partnered_badge.png b/com.discord/res/drawable-ldpi/ic_partnered_badge.png
new file mode 100644
index 0000000000..cb9af1cff6
Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_partnered_badge.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_partnered_badge_banner.png b/com.discord/res/drawable-ldpi/ic_partnered_badge_banner.png
new file mode 100644
index 0000000000..377af72afd
Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_partnered_badge_banner.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_user_premium_guild_subscription.png b/com.discord/res/drawable-ldpi/ic_user_premium_guild_subscription.png
new file mode 100644
index 0000000000..9c105f653b
Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_user_premium_guild_subscription.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_verified_badge.png b/com.discord/res/drawable-ldpi/ic_verified_badge.png
new file mode 100644
index 0000000000..52a6e0d006
Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_verified_badge.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_verified_badge_banner.png b/com.discord/res/drawable-ldpi/ic_verified_badge_banner.png
new file mode 100644
index 0000000000..273ea8122b
Binary files /dev/null and b/com.discord/res/drawable-ldpi/ic_verified_badge_banner.png differ
diff --git a/com.discord/res/drawable-ldpi/ic_verified_check.png b/com.discord/res/drawable-ldpi/ic_verified_check.png
deleted file mode 100644
index 0b04975fb6..0000000000
Binary files a/com.discord/res/drawable-ldpi/ic_verified_check.png and /dev/null differ
diff --git a/com.discord/res/drawable-ldpi/ic_verified_check_brand.png b/com.discord/res/drawable-ldpi/ic_verified_check_brand.png
deleted file mode 100644
index 90ad5a9d6d..0000000000
Binary files a/com.discord/res/drawable-ldpi/ic_verified_check_brand.png and /dev/null differ
diff --git a/com.discord/res/drawable-ldpi/img_quick_switcher_empty_light_theme.png b/com.discord/res/drawable-ldpi/img_quick_switcher_empty_light_theme.png
index 09c2f55831..21f2d7faf4 100644
Binary files a/com.discord/res/drawable-ldpi/img_quick_switcher_empty_light_theme.png and b/com.discord/res/drawable-ldpi/img_quick_switcher_empty_light_theme.png differ
diff --git a/com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_1.png b/com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_1.png
new file mode 100644
index 0000000000..80a0159dbf
Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_1.png differ
diff --git a/com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_1_banner.png b/com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_1_banner.png
new file mode 100644
index 0000000000..0ecf7ac5d4
Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_1_banner.png differ
diff --git a/com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_2.png b/com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_2.png
new file mode 100644
index 0000000000..4ffb5043e4
Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_2.png differ
diff --git a/com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_2_banner.png b/com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_2_banner.png
new file mode 100644
index 0000000000..4ed36098de
Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_2_banner.png differ
diff --git a/com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_3.png b/com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_3.png
new file mode 100644
index 0000000000..31ff7289a8
Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_3.png differ
diff --git a/com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_3_banner.png b/com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_3_banner.png
new file mode 100644
index 0000000000..8bc025081f
Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_guild_badge_premium_tier_3_banner.png differ
diff --git a/com.discord/res/drawable-mdpi/ic_guild_nitro_progress.png b/com.discord/res/drawable-mdpi/ic_guild_nitro_progress.png
new file mode 100644
index 0000000000..5e9493a002
Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_guild_nitro_progress.png differ
diff --git a/com.discord/res/drawable-mdpi/ic_guild_nitro_progress_banner.png b/com.discord/res/drawable-mdpi/ic_guild_nitro_progress_banner.png
new file mode 100644
index 0000000000..187f213e2d
Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_guild_nitro_progress_banner.png differ
diff --git a/com.discord/res/drawable-mdpi/ic_partnered_badge.png b/com.discord/res/drawable-mdpi/ic_partnered_badge.png
new file mode 100644
index 0000000000..8460d78827
Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_partnered_badge.png differ
diff --git a/com.discord/res/drawable-mdpi/ic_partnered_badge_banner.png b/com.discord/res/drawable-mdpi/ic_partnered_badge_banner.png
new file mode 100644
index 0000000000..181cbd1e42
Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_partnered_badge_banner.png differ
diff --git a/com.discord/res/drawable-mdpi/ic_user_premium_guild_subscription.png b/com.discord/res/drawable-mdpi/ic_user_premium_guild_subscription.png
new file mode 100644
index 0000000000..cabddde490
Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_user_premium_guild_subscription.png differ
diff --git a/com.discord/res/drawable-mdpi/ic_verified_badge.png b/com.discord/res/drawable-mdpi/ic_verified_badge.png
new file mode 100644
index 0000000000..0dfe1d1a2c
Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_verified_badge.png differ
diff --git a/com.discord/res/drawable-mdpi/ic_verified_badge_banner.png b/com.discord/res/drawable-mdpi/ic_verified_badge_banner.png
new file mode 100644
index 0000000000..7e38af10ce
Binary files /dev/null and b/com.discord/res/drawable-mdpi/ic_verified_badge_banner.png differ
diff --git a/com.discord/res/drawable-mdpi/ic_verified_check.png b/com.discord/res/drawable-mdpi/ic_verified_check.png
deleted file mode 100644
index 0b982f97f2..0000000000
Binary files a/com.discord/res/drawable-mdpi/ic_verified_check.png and /dev/null differ
diff --git a/com.discord/res/drawable-mdpi/ic_verified_check_brand.png b/com.discord/res/drawable-mdpi/ic_verified_check_brand.png
deleted file mode 100644
index 7a43cf5e72..0000000000
Binary files a/com.discord/res/drawable-mdpi/ic_verified_check_brand.png and /dev/null differ
diff --git a/com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_1.png b/com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_1.png
new file mode 100644
index 0000000000..309e23bea3
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_1.png differ
diff --git a/com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_1_banner.png b/com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_1_banner.png
new file mode 100644
index 0000000000..7a3c8fe2de
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_1_banner.png differ
diff --git a/com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_2.png b/com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_2.png
new file mode 100644
index 0000000000..213d0906e1
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_2.png differ
diff --git a/com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_2_banner.png b/com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_2_banner.png
new file mode 100644
index 0000000000..28d0e710eb
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_2_banner.png differ
diff --git a/com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_3.png b/com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_3.png
new file mode 100644
index 0000000000..e4bab6dcec
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_3.png differ
diff --git a/com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_3_banner.png b/com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_3_banner.png
new file mode 100644
index 0000000000..b3683158f3
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_guild_badge_premium_tier_3_banner.png differ
diff --git a/com.discord/res/drawable-xhdpi/ic_guild_nitro_progress.png b/com.discord/res/drawable-xhdpi/ic_guild_nitro_progress.png
new file mode 100644
index 0000000000..5fd341c655
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_guild_nitro_progress.png differ
diff --git a/com.discord/res/drawable-xhdpi/ic_guild_nitro_progress_banner.png b/com.discord/res/drawable-xhdpi/ic_guild_nitro_progress_banner.png
new file mode 100644
index 0000000000..b4ea54c08d
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_guild_nitro_progress_banner.png differ
diff --git a/com.discord/res/drawable-xhdpi/ic_partnered_badge.png b/com.discord/res/drawable-xhdpi/ic_partnered_badge.png
new file mode 100644
index 0000000000..5e9851030e
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_partnered_badge.png differ
diff --git a/com.discord/res/drawable-xhdpi/ic_partnered_badge_banner.png b/com.discord/res/drawable-xhdpi/ic_partnered_badge_banner.png
new file mode 100644
index 0000000000..7012680592
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_partnered_badge_banner.png differ
diff --git a/com.discord/res/drawable-xhdpi/ic_user_premium_guild_subscription.png b/com.discord/res/drawable-xhdpi/ic_user_premium_guild_subscription.png
new file mode 100644
index 0000000000..e42eaacf23
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_user_premium_guild_subscription.png differ
diff --git a/com.discord/res/drawable-xhdpi/ic_verified_badge.png b/com.discord/res/drawable-xhdpi/ic_verified_badge.png
new file mode 100644
index 0000000000..2b10d5d938
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_verified_badge.png differ
diff --git a/com.discord/res/drawable-xhdpi/ic_verified_badge_banner.png b/com.discord/res/drawable-xhdpi/ic_verified_badge_banner.png
new file mode 100644
index 0000000000..6c714e24d0
Binary files /dev/null and b/com.discord/res/drawable-xhdpi/ic_verified_badge_banner.png differ
diff --git a/com.discord/res/drawable-xhdpi/ic_verified_check.png b/com.discord/res/drawable-xhdpi/ic_verified_check.png
deleted file mode 100644
index 9b00ecda61..0000000000
Binary files a/com.discord/res/drawable-xhdpi/ic_verified_check.png and /dev/null differ
diff --git a/com.discord/res/drawable-xhdpi/ic_verified_check_brand.png b/com.discord/res/drawable-xhdpi/ic_verified_check_brand.png
deleted file mode 100644
index 02cfe057db..0000000000
Binary files a/com.discord/res/drawable-xhdpi/ic_verified_check_brand.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_1.png b/com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_1.png
new file mode 100644
index 0000000000..41a34d4f99
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_1.png differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_1_banner.png b/com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_1_banner.png
new file mode 100644
index 0000000000..11b9335953
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_1_banner.png differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_2.png b/com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_2.png
new file mode 100644
index 0000000000..fc18c02fb2
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_2.png differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_2_banner.png b/com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_2_banner.png
new file mode 100644
index 0000000000..d790f121a0
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_2_banner.png differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_3.png b/com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_3.png
new file mode 100644
index 0000000000..5fde49ba2d
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_3.png differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_3_banner.png b/com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_3_banner.png
new file mode 100644
index 0000000000..1f0ebc2602
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_guild_badge_premium_tier_3_banner.png differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_guild_nitro_progress.png b/com.discord/res/drawable-xxhdpi/ic_guild_nitro_progress.png
new file mode 100644
index 0000000000..afb2d77e77
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_guild_nitro_progress.png differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_guild_nitro_progress_banner.png b/com.discord/res/drawable-xxhdpi/ic_guild_nitro_progress_banner.png
new file mode 100644
index 0000000000..5a829b3d9c
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_guild_nitro_progress_banner.png differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_partnered_badge.png b/com.discord/res/drawable-xxhdpi/ic_partnered_badge.png
new file mode 100644
index 0000000000..db847a9bd8
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_partnered_badge.png differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_partnered_badge_banner.png b/com.discord/res/drawable-xxhdpi/ic_partnered_badge_banner.png
new file mode 100644
index 0000000000..d3434c006b
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_partnered_badge_banner.png differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_user_premium_guild_subscription.png b/com.discord/res/drawable-xxhdpi/ic_user_premium_guild_subscription.png
new file mode 100644
index 0000000000..9de0ba8fde
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_user_premium_guild_subscription.png differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_verified_badge.png b/com.discord/res/drawable-xxhdpi/ic_verified_badge.png
new file mode 100644
index 0000000000..b7db2d0169
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_verified_badge.png differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_verified_badge_banner.png b/com.discord/res/drawable-xxhdpi/ic_verified_badge_banner.png
new file mode 100644
index 0000000000..194c2197f2
Binary files /dev/null and b/com.discord/res/drawable-xxhdpi/ic_verified_badge_banner.png differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_verified_check.png b/com.discord/res/drawable-xxhdpi/ic_verified_check.png
deleted file mode 100644
index 543565f32d..0000000000
Binary files a/com.discord/res/drawable-xxhdpi/ic_verified_check.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxhdpi/ic_verified_check_brand.png b/com.discord/res/drawable-xxhdpi/ic_verified_check_brand.png
deleted file mode 100644
index 00e6af76eb..0000000000
Binary files a/com.discord/res/drawable-xxhdpi/ic_verified_check_brand.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_1.png b/com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_1.png
new file mode 100644
index 0000000000..a8b71e3dc3
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_1.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_1_banner.png b/com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_1_banner.png
new file mode 100644
index 0000000000..a3f2a6e845
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_1_banner.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_2.png b/com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_2.png
new file mode 100644
index 0000000000..666a824ee0
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_2.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_2_banner.png b/com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_2_banner.png
new file mode 100644
index 0000000000..a7fd530c4e
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_2_banner.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_3.png b/com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_3.png
new file mode 100644
index 0000000000..2be33f42fa
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_3.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_3_banner.png b/com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_3_banner.png
new file mode 100644
index 0000000000..1e340c4965
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_guild_badge_premium_tier_3_banner.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_guild_nitro_progress.png b/com.discord/res/drawable-xxxhdpi/ic_guild_nitro_progress.png
new file mode 100644
index 0000000000..425757606a
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_guild_nitro_progress.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_guild_nitro_progress_banner.png b/com.discord/res/drawable-xxxhdpi/ic_guild_nitro_progress_banner.png
new file mode 100644
index 0000000000..4d6577e799
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_guild_nitro_progress_banner.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_partnered_badge.png b/com.discord/res/drawable-xxxhdpi/ic_partnered_badge.png
new file mode 100644
index 0000000000..4b5471e9bb
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_partnered_badge.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_partnered_badge_banner.png b/com.discord/res/drawable-xxxhdpi/ic_partnered_badge_banner.png
new file mode 100644
index 0000000000..70bca13405
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_partnered_badge_banner.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_user_premium_guild_subscription.png b/com.discord/res/drawable-xxxhdpi/ic_user_premium_guild_subscription.png
new file mode 100644
index 0000000000..7d60b11f89
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_user_premium_guild_subscription.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_verified_badge.png b/com.discord/res/drawable-xxxhdpi/ic_verified_badge.png
new file mode 100644
index 0000000000..e49b091ed4
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_verified_badge.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_verified_badge_banner.png b/com.discord/res/drawable-xxxhdpi/ic_verified_badge_banner.png
new file mode 100644
index 0000000000..1ec742faa1
Binary files /dev/null and b/com.discord/res/drawable-xxxhdpi/ic_verified_badge_banner.png differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_verified_check.png b/com.discord/res/drawable-xxxhdpi/ic_verified_check.png
deleted file mode 100644
index c8006e2a4f..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/ic_verified_check.png and /dev/null differ
diff --git a/com.discord/res/drawable-xxxhdpi/ic_verified_check_brand.png b/com.discord/res/drawable-xxxhdpi/ic_verified_check_brand.png
deleted file mode 100644
index ed54257b57..0000000000
Binary files a/com.discord/res/drawable-xxxhdpi/ic_verified_check_brand.png and /dev/null differ
diff --git a/com.discord/res/layout-v17/widget_guild_invite_info.xml b/com.discord/res/layout-v17/widget_guild_invite_info.xml
index ed1f43c516..9c3ddaccad 100644
--- a/com.discord/res/layout-v17/widget_guild_invite_info.xml
+++ b/com.discord/res/layout-v17/widget_guild_invite_info.xml
@@ -2,7 +2,7 @@
-
+
@@ -11,7 +11,7 @@
-
+
diff --git a/com.discord/res/layout-w600dp-v17/widget_guild_invite_info.xml b/com.discord/res/layout-w600dp-v17/widget_guild_invite_info.xml
index 400cb58db3..e4c836f1f0 100644
--- a/com.discord/res/layout-w600dp-v17/widget_guild_invite_info.xml
+++ b/com.discord/res/layout-w600dp-v17/widget_guild_invite_info.xml
@@ -4,14 +4,14 @@
-
+
-
+
diff --git a/com.discord/res/layout-w600dp/widget_guild_invite_info.xml b/com.discord/res/layout-w600dp/widget_guild_invite_info.xml
index ce093ad23e..db0fcdfbee 100644
--- a/com.discord/res/layout-w600dp/widget_guild_invite_info.xml
+++ b/com.discord/res/layout-w600dp/widget_guild_invite_info.xml
@@ -4,14 +4,14 @@
-
+
-
+
diff --git a/com.discord/res/layout/widget_guild_invite_info.xml b/com.discord/res/layout/widget_guild_invite_info.xml
index ea90e383bc..5318a25449 100644
--- a/com.discord/res/layout/widget_guild_invite_info.xml
+++ b/com.discord/res/layout/widget_guild_invite_info.xml
@@ -2,7 +2,7 @@
-
+
@@ -11,7 +11,7 @@
-
+
diff --git a/com.discord/res/values/plurals.xml b/com.discord/res/values/plurals.xml
index 3fab0747b2..2f46c240aa 100644
--- a/com.discord/res/values/plurals.xml
+++ b/com.discord/res/values/plurals.xml
@@ -449,8 +449,8 @@
- %d more boost
- - %d extremely cool people
- - %d extremely cool person
+ - %d extremely cool people have
+ - %d extremely cool person has
- %d Members
@@ -609,10 +609,26 @@
- %d minutes
- %d minute
-
+
- %d days
- %d day
+
+ - %d hours
+ - %d hour
+
+
+ - %d hours
+ - %d hour
+
+
+ - %d minutes
+ - %d minute
+
+
+ - %d minutes
+ - %d minute
+
- %d months
- %d month
@@ -708,6 +724,6 @@
- false
- false
- false
- - false
- - false
+ - false
+ - false
diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml
index 432c8b2905..fa3f75670c 100644
--- a/com.discord/res/values/public.xml
+++ b/com.discord/res/values/public.xml
@@ -2002,34 +2002,34 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2039,7 +2039,7 @@
-
+
@@ -2220,289 +2220,300 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2559,15 +2570,15 @@
-
-
-
-
-
+
+
+
+
+
-
-
+
+
@@ -2625,21 +2636,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2653,55 +2664,55 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -2712,19 +2723,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -5290,29 +5301,33 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -5324,8 +5339,8 @@
-
-
+
+
@@ -8088,1052 +8103,1052 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -10429,1286 +10444,1292 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml
index 81a3a6fb0e..58d0268d35 100644
--- a/com.discord/res/values/strings.xml
+++ b/com.discord/res/values/strings.xml
@@ -958,7 +958,6 @@ LOVE, DISCORD {fixed}
No topic set.
Channel Type
Channels
- Channels matching **%1$s**
"You find yourself in a strange place. You don't have access to any text channels, or there are none in this server."
No Text Channels
Character limit exceeded %1$d of %2$d
@@ -1004,7 +1003,7 @@ LOVE, DISCORD {fixed}
Unable to sync cloud saves
OR
Collapse Category
- 9ec31162-042b-4b7f-98cc-515f700a1ace
+ ce62f3f4-37cc-4902-88d7-680c54d11b1e
Coming Soon
Granular notification control only works on desktop apps at the moment. For now use the iOS notification settings.
COMING SOON!
@@ -1091,7 +1090,7 @@ LOVE, DISCORD {fixed}
No Route
RTC Connecting
RTC Disconnected
- Connected to Stream
+ "Watching %1$s's Stream"
Video Connected
Voice Connected
Verified
@@ -1452,7 +1451,7 @@ LOVE, DISCORD {fixed}
Automatically move members to this channel and mute them when they have been idle for longer than the AFK timeout. This does not affect browsers.
Lower the volume of other applications by this percent when someone is speaking. Set to 0%% to completely disable attenuation.
If the indicator is solid green then Discord is transmitting your beautiful voice.
- **ALL THE BITS!** Going above %1$skbps is not recommended unless you are an audiophile because it will adversely affect people on mobile devices or poor connections without noticeable benefit.
+ ALL THE BITS! Going above %1$skbps may adversely affect people on poor connections.
While using a Discord Certified microphone certain voice processing features are no longer handled by Discord itself, but rather the microphone.
Selecting roles will automatically setup basic permissions for this channel.
Use any alphanumeric value as a code.
@@ -2007,6 +2006,7 @@ LOVE, DISCORD {fixed}
Only @mentions
Server is currently muted, therefore these are disabled
Server Owner
+ View Server
Discord Nitro Status
Prevent potentially dangerous administrative actions for users without two-factor authentication enabled. **This setting can only be changed by the server owner if they have 2FA enabled on their account**.
[Enable on your account.](onClick)
@@ -2204,7 +2204,7 @@ LOVE, DISCORD {fixed}
Careful! You have unsaved changes!
Members of your server with an active Nitro subscription can help unlock tiers by bestowing their Nitro status. For every tier achieved, you’ll unlock perks for everyone in your server. Members can revoke their buff at any time. Your server will keep perks for three days if a tier is lost.
Only %1$s until the next tier!
- **%1$s** have boosted this server
+ **%1$s** boosted this server
%1$s Boosts
Nitro Server Status
Unlocked
@@ -3305,6 +3305,7 @@ To keep your sub, go to Settings and update your payment."
PLUS $1000 worth of PC games and perks
Free Games
Free Games and game perks.
+ Server Boosting
Want more? Get Nitro with PC games.
Send a gift
Upgrade your friends! Gift them Nitro games and chat perks.
@@ -3325,9 +3326,6 @@ To keep your sub, go to Settings and update your payment."
No Nitro Boosts
No Tier
Nitro Server Boost
- Tier 1
- Tier 2
- Tier 3
For every tier achieved, you’ll help unlock perks for everyone in your server. These perks are only in effect within the server. [Learn more about Nitro Boosting.](%1$s)
Get Nitro to Boost!
Boost this Server
@@ -3361,9 +3359,15 @@ To keep your sub, go to Settings and update your payment."
"Use your Nitro powers to boost a Server you've joined! Boosting a Server allows it to progress towards Tiers. Each Tier gives collective perks for the entire server."
Nitro Server Boost
Nitro boosting since %1$s
+ Tier 1
+ Tier 2
+ Tier 3
Are you sure you want to remove your Nitro Boost from:
Yes, Remove Boost
- This server will lose Tier progress if you remove your boost. **You will not be able to give another boost for %1$s.**
+ This server will lose Tier progress if you remove your boost.
+ This server will lose Tier progress if you remove your boost. **You will not be able to give another boost for %1$s and %2$s.**
+ This server will lose Tier progress if you remove your boost. **You will not be able to give another boost for %1$s and %2$s.**
+ This server will lose Tier progress if you remove your boost. **You will not be able to give another boost for %1$s.**
Remove Nitro Boost?
Included in Nitro:
%1$s (monthly) occurs on %2$s.
@@ -3911,6 +3915,7 @@ To keep your sub, go to Settings and update your payment."
Sounds
Speak
Spectators - %1$s
+ Spectators
Spellcheck
Spoiler
Click to hide spoiler
@@ -3966,6 +3971,7 @@ To keep your sub, go to Settings and update your payment."
Your stream currently has reduced video or audio quality. This may be due to network conditions.
Members with this permission can stream to the channel.
This stream has ended
+ There are no spectators because the stream has ended.
Sorry, this stream has the max amount of viewers.
Stream is Full
Stream Issue
@@ -3989,7 +3995,7 @@ To keep your sub, go to Settings and update your payment."
Streamer Mode
Streamer Mode Enabled
playing %1$s
- Streamer Settings
+ Stream Settings
Streaming **%1$s**
Volume
Unfortunately our payment processor is unable to load right now. Please try again later
diff --git a/com.discord/smali/androidx/appcompat/R$drawable.smali b/com.discord/smali/androidx/appcompat/R$drawable.smali
index 68b36a9c67..3952416390 100644
--- a/com.discord/smali/androidx/appcompat/R$drawable.smali
+++ b/com.discord/smali/androidx/appcompat/R$drawable.smali
@@ -183,33 +183,33 @@
.field public static final abc_vector_test:I = 0x7f080064
-.field public static final notification_action_background:I = 0x7f0803b9
+.field public static final notification_action_background:I = 0x7f0803c4
-.field public static final notification_bg:I = 0x7f0803ba
+.field public static final notification_bg:I = 0x7f0803c5
-.field public static final notification_bg_low:I = 0x7f0803bb
+.field public static final notification_bg_low:I = 0x7f0803c6
-.field public static final notification_bg_low_normal:I = 0x7f0803bc
+.field public static final notification_bg_low_normal:I = 0x7f0803c7
-.field public static final notification_bg_low_pressed:I = 0x7f0803bd
+.field public static final notification_bg_low_pressed:I = 0x7f0803c8
-.field public static final notification_bg_normal:I = 0x7f0803be
+.field public static final notification_bg_normal:I = 0x7f0803c9
-.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
+.field public static final notification_bg_normal_pressed:I = 0x7f0803ca
-.field public static final notification_icon_background:I = 0x7f0803c0
+.field public static final notification_icon_background:I = 0x7f0803cb
-.field public static final notification_template_icon_bg:I = 0x7f0803c1
+.field public static final notification_template_icon_bg:I = 0x7f0803cc
-.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
+.field public static final notification_template_icon_low_bg:I = 0x7f0803cd
-.field public static final notification_tile_bg:I = 0x7f0803c3
+.field public static final notification_tile_bg:I = 0x7f0803ce
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf
-.field public static final tooltip_frame_dark:I = 0x7f0803c9
+.field public static final tooltip_frame_dark:I = 0x7f0803d4
-.field public static final tooltip_frame_light:I = 0x7f0803ca
+.field public static final tooltip_frame_light:I = 0x7f0803d5
# direct methods
diff --git a/com.discord/smali/androidx/appcompat/R$string.smali b/com.discord/smali/androidx/appcompat/R$string.smali
index afe1c41ea4..dac3d9fb48 100644
--- a/com.discord/smali/androidx/appcompat/R$string.smali
+++ b/com.discord/smali/androidx/appcompat/R$string.smali
@@ -93,9 +93,9 @@
.field public static final abc_toolbar_collapse_description:I = 0x7f12002a
-.field public static final search_menu_title:I = 0x7f120e87
+.field public static final search_menu_title:I = 0x7f120e8b
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f48
# direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali b/com.discord/smali/androidx/asynclayoutinflater/R$drawable.smali
index 266d12c6ed..3bce269025 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 = 0x7f0803b9
+.field public static final notification_action_background:I = 0x7f0803c4
-.field public static final notification_bg:I = 0x7f0803ba
+.field public static final notification_bg:I = 0x7f0803c5
-.field public static final notification_bg_low:I = 0x7f0803bb
+.field public static final notification_bg_low:I = 0x7f0803c6
-.field public static final notification_bg_low_normal:I = 0x7f0803bc
+.field public static final notification_bg_low_normal:I = 0x7f0803c7
-.field public static final notification_bg_low_pressed:I = 0x7f0803bd
+.field public static final notification_bg_low_pressed:I = 0x7f0803c8
-.field public static final notification_bg_normal:I = 0x7f0803be
+.field public static final notification_bg_normal:I = 0x7f0803c9
-.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
+.field public static final notification_bg_normal_pressed:I = 0x7f0803ca
-.field public static final notification_icon_background:I = 0x7f0803c0
+.field public static final notification_icon_background:I = 0x7f0803cb
-.field public static final notification_template_icon_bg:I = 0x7f0803c1
+.field public static final notification_template_icon_bg:I = 0x7f0803cc
-.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
+.field public static final notification_template_icon_low_bg:I = 0x7f0803cd
-.field public static final notification_tile_bg:I = 0x7f0803c3
+.field public static final notification_tile_bg:I = 0x7f0803ce
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf
# direct methods
diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$string.smali b/com.discord/smali/androidx/asynclayoutinflater/R$string.smali
index d55f8df4ad..3676fa8128 100644
--- a/com.discord/smali/androidx/asynclayoutinflater/R$string.smali
+++ b/com.discord/smali/androidx/asynclayoutinflater/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f48
# direct methods
diff --git a/com.discord/smali/androidx/browser/R$drawable.smali b/com.discord/smali/androidx/browser/R$drawable.smali
index f09700c6ec..8c49f03cc7 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 = 0x7f0803b9
+.field public static final notification_action_background:I = 0x7f0803c4
-.field public static final notification_bg:I = 0x7f0803ba
+.field public static final notification_bg:I = 0x7f0803c5
-.field public static final notification_bg_low:I = 0x7f0803bb
+.field public static final notification_bg_low:I = 0x7f0803c6
-.field public static final notification_bg_low_normal:I = 0x7f0803bc
+.field public static final notification_bg_low_normal:I = 0x7f0803c7
-.field public static final notification_bg_low_pressed:I = 0x7f0803bd
+.field public static final notification_bg_low_pressed:I = 0x7f0803c8
-.field public static final notification_bg_normal:I = 0x7f0803be
+.field public static final notification_bg_normal:I = 0x7f0803c9
-.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
+.field public static final notification_bg_normal_pressed:I = 0x7f0803ca
-.field public static final notification_icon_background:I = 0x7f0803c0
+.field public static final notification_icon_background:I = 0x7f0803cb
-.field public static final notification_template_icon_bg:I = 0x7f0803c1
+.field public static final notification_template_icon_bg:I = 0x7f0803cc
-.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
+.field public static final notification_template_icon_low_bg:I = 0x7f0803cd
-.field public static final notification_tile_bg:I = 0x7f0803c3
+.field public static final notification_tile_bg:I = 0x7f0803ce
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf
# direct methods
diff --git a/com.discord/smali/androidx/browser/R$string.smali b/com.discord/smali/androidx/browser/R$string.smali
index 9a3899603a..4617249868 100644
--- a/com.discord/smali/androidx/browser/R$string.smali
+++ b/com.discord/smali/androidx/browser/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f48
# direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali b/com.discord/smali/androidx/coordinatorlayout/R$drawable.smali
index 66065065d6..e394ee480a 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 = 0x7f0803b9
+.field public static final notification_action_background:I = 0x7f0803c4
-.field public static final notification_bg:I = 0x7f0803ba
+.field public static final notification_bg:I = 0x7f0803c5
-.field public static final notification_bg_low:I = 0x7f0803bb
+.field public static final notification_bg_low:I = 0x7f0803c6
-.field public static final notification_bg_low_normal:I = 0x7f0803bc
+.field public static final notification_bg_low_normal:I = 0x7f0803c7
-.field public static final notification_bg_low_pressed:I = 0x7f0803bd
+.field public static final notification_bg_low_pressed:I = 0x7f0803c8
-.field public static final notification_bg_normal:I = 0x7f0803be
+.field public static final notification_bg_normal:I = 0x7f0803c9
-.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
+.field public static final notification_bg_normal_pressed:I = 0x7f0803ca
-.field public static final notification_icon_background:I = 0x7f0803c0
+.field public static final notification_icon_background:I = 0x7f0803cb
-.field public static final notification_template_icon_bg:I = 0x7f0803c1
+.field public static final notification_template_icon_bg:I = 0x7f0803cc
-.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
+.field public static final notification_template_icon_low_bg:I = 0x7f0803cd
-.field public static final notification_tile_bg:I = 0x7f0803c3
+.field public static final notification_tile_bg:I = 0x7f0803ce
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf
# direct methods
diff --git a/com.discord/smali/androidx/coordinatorlayout/R$string.smali b/com.discord/smali/androidx/coordinatorlayout/R$string.smali
index b81cdd7823..3ac51d69f4 100644
--- a/com.discord/smali/androidx/coordinatorlayout/R$string.smali
+++ b/com.discord/smali/androidx/coordinatorlayout/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f48
# direct methods
diff --git a/com.discord/smali/androidx/core/R$drawable.smali b/com.discord/smali/androidx/core/R$drawable.smali
index 3193c9e879..48fe1bf126 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 = 0x7f0803b9
+.field public static final notification_action_background:I = 0x7f0803c4
-.field public static final notification_bg:I = 0x7f0803ba
+.field public static final notification_bg:I = 0x7f0803c5
-.field public static final notification_bg_low:I = 0x7f0803bb
+.field public static final notification_bg_low:I = 0x7f0803c6
-.field public static final notification_bg_low_normal:I = 0x7f0803bc
+.field public static final notification_bg_low_normal:I = 0x7f0803c7
-.field public static final notification_bg_low_pressed:I = 0x7f0803bd
+.field public static final notification_bg_low_pressed:I = 0x7f0803c8
-.field public static final notification_bg_normal:I = 0x7f0803be
+.field public static final notification_bg_normal:I = 0x7f0803c9
-.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
+.field public static final notification_bg_normal_pressed:I = 0x7f0803ca
-.field public static final notification_icon_background:I = 0x7f0803c0
+.field public static final notification_icon_background:I = 0x7f0803cb
-.field public static final notification_template_icon_bg:I = 0x7f0803c1
+.field public static final notification_template_icon_bg:I = 0x7f0803cc
-.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
+.field public static final notification_template_icon_low_bg:I = 0x7f0803cd
-.field public static final notification_tile_bg:I = 0x7f0803c3
+.field public static final notification_tile_bg:I = 0x7f0803ce
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf
# direct methods
diff --git a/com.discord/smali/androidx/core/R$string.smali b/com.discord/smali/androidx/core/R$string.smali
index 10e7038082..80665929a9 100644
--- a/com.discord/smali/androidx/core/R$string.smali
+++ b/com.discord/smali/androidx/core/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f48
# direct methods
diff --git a/com.discord/smali/androidx/customview/R$drawable.smali b/com.discord/smali/androidx/customview/R$drawable.smali
index 1108c6cc4d..cb2ba07409 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 = 0x7f0803b9
+.field public static final notification_action_background:I = 0x7f0803c4
-.field public static final notification_bg:I = 0x7f0803ba
+.field public static final notification_bg:I = 0x7f0803c5
-.field public static final notification_bg_low:I = 0x7f0803bb
+.field public static final notification_bg_low:I = 0x7f0803c6
-.field public static final notification_bg_low_normal:I = 0x7f0803bc
+.field public static final notification_bg_low_normal:I = 0x7f0803c7
-.field public static final notification_bg_low_pressed:I = 0x7f0803bd
+.field public static final notification_bg_low_pressed:I = 0x7f0803c8
-.field public static final notification_bg_normal:I = 0x7f0803be
+.field public static final notification_bg_normal:I = 0x7f0803c9
-.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
+.field public static final notification_bg_normal_pressed:I = 0x7f0803ca
-.field public static final notification_icon_background:I = 0x7f0803c0
+.field public static final notification_icon_background:I = 0x7f0803cb
-.field public static final notification_template_icon_bg:I = 0x7f0803c1
+.field public static final notification_template_icon_bg:I = 0x7f0803cc
-.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
+.field public static final notification_template_icon_low_bg:I = 0x7f0803cd
-.field public static final notification_tile_bg:I = 0x7f0803c3
+.field public static final notification_tile_bg:I = 0x7f0803ce
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf
# direct methods
diff --git a/com.discord/smali/androidx/customview/R$string.smali b/com.discord/smali/androidx/customview/R$string.smali
index acd0a8f2fc..7bd60fffa6 100644
--- a/com.discord/smali/androidx/customview/R$string.smali
+++ b/com.discord/smali/androidx/customview/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f48
# direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$drawable.smali b/com.discord/smali/androidx/drawerlayout/R$drawable.smali
index 291482e744..1024c2da68 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 = 0x7f0803b9
+.field public static final notification_action_background:I = 0x7f0803c4
-.field public static final notification_bg:I = 0x7f0803ba
+.field public static final notification_bg:I = 0x7f0803c5
-.field public static final notification_bg_low:I = 0x7f0803bb
+.field public static final notification_bg_low:I = 0x7f0803c6
-.field public static final notification_bg_low_normal:I = 0x7f0803bc
+.field public static final notification_bg_low_normal:I = 0x7f0803c7
-.field public static final notification_bg_low_pressed:I = 0x7f0803bd
+.field public static final notification_bg_low_pressed:I = 0x7f0803c8
-.field public static final notification_bg_normal:I = 0x7f0803be
+.field public static final notification_bg_normal:I = 0x7f0803c9
-.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
+.field public static final notification_bg_normal_pressed:I = 0x7f0803ca
-.field public static final notification_icon_background:I = 0x7f0803c0
+.field public static final notification_icon_background:I = 0x7f0803cb
-.field public static final notification_template_icon_bg:I = 0x7f0803c1
+.field public static final notification_template_icon_bg:I = 0x7f0803cc
-.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
+.field public static final notification_template_icon_low_bg:I = 0x7f0803cd
-.field public static final notification_tile_bg:I = 0x7f0803c3
+.field public static final notification_tile_bg:I = 0x7f0803ce
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf
# direct methods
diff --git a/com.discord/smali/androidx/drawerlayout/R$string.smali b/com.discord/smali/androidx/drawerlayout/R$string.smali
index 8353c4bf78..d74dacd5ef 100644
--- a/com.discord/smali/androidx/drawerlayout/R$string.smali
+++ b/com.discord/smali/androidx/drawerlayout/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f48
# direct methods
diff --git a/com.discord/smali/androidx/fragment/R$drawable.smali b/com.discord/smali/androidx/fragment/R$drawable.smali
index 10485640f5..5cbcb4107c 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 = 0x7f0803b9
+.field public static final notification_action_background:I = 0x7f0803c4
-.field public static final notification_bg:I = 0x7f0803ba
+.field public static final notification_bg:I = 0x7f0803c5
-.field public static final notification_bg_low:I = 0x7f0803bb
+.field public static final notification_bg_low:I = 0x7f0803c6
-.field public static final notification_bg_low_normal:I = 0x7f0803bc
+.field public static final notification_bg_low_normal:I = 0x7f0803c7
-.field public static final notification_bg_low_pressed:I = 0x7f0803bd
+.field public static final notification_bg_low_pressed:I = 0x7f0803c8
-.field public static final notification_bg_normal:I = 0x7f0803be
+.field public static final notification_bg_normal:I = 0x7f0803c9
-.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
+.field public static final notification_bg_normal_pressed:I = 0x7f0803ca
-.field public static final notification_icon_background:I = 0x7f0803c0
+.field public static final notification_icon_background:I = 0x7f0803cb
-.field public static final notification_template_icon_bg:I = 0x7f0803c1
+.field public static final notification_template_icon_bg:I = 0x7f0803cc
-.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
+.field public static final notification_template_icon_low_bg:I = 0x7f0803cd
-.field public static final notification_tile_bg:I = 0x7f0803c3
+.field public static final notification_tile_bg:I = 0x7f0803ce
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf
# direct methods
diff --git a/com.discord/smali/androidx/fragment/R$string.smali b/com.discord/smali/androidx/fragment/R$string.smali
index 3c441245f1..cb2484477b 100644
--- a/com.discord/smali/androidx/fragment/R$string.smali
+++ b/com.discord/smali/androidx/fragment/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f48
# 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 8b1f9bcf3f..59044bd3c0 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 = 0x7f0803b9
+.field public static final notification_action_background:I = 0x7f0803c4
-.field public static final notification_bg:I = 0x7f0803ba
+.field public static final notification_bg:I = 0x7f0803c5
-.field public static final notification_bg_low:I = 0x7f0803bb
+.field public static final notification_bg_low:I = 0x7f0803c6
-.field public static final notification_bg_low_normal:I = 0x7f0803bc
+.field public static final notification_bg_low_normal:I = 0x7f0803c7
-.field public static final notification_bg_low_pressed:I = 0x7f0803bd
+.field public static final notification_bg_low_pressed:I = 0x7f0803c8
-.field public static final notification_bg_normal:I = 0x7f0803be
+.field public static final notification_bg_normal:I = 0x7f0803c9
-.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
+.field public static final notification_bg_normal_pressed:I = 0x7f0803ca
-.field public static final notification_icon_background:I = 0x7f0803c0
+.field public static final notification_icon_background:I = 0x7f0803cb
-.field public static final notification_template_icon_bg:I = 0x7f0803c1
+.field public static final notification_template_icon_bg:I = 0x7f0803cc
-.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
+.field public static final notification_template_icon_low_bg:I = 0x7f0803cd
-.field public static final notification_tile_bg:I = 0x7f0803c3
+.field public static final notification_tile_bg:I = 0x7f0803ce
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreui/R$string.smali b/com.discord/smali/androidx/legacy/coreui/R$string.smali
index de48ab8e97..b6d3b9af02 100644
--- a/com.discord/smali/androidx/legacy/coreui/R$string.smali
+++ b/com.discord/smali/androidx/legacy/coreui/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f48
# 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 aca32917c1..0bd8001c2d 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 = 0x7f0803b9
+.field public static final notification_action_background:I = 0x7f0803c4
-.field public static final notification_bg:I = 0x7f0803ba
+.field public static final notification_bg:I = 0x7f0803c5
-.field public static final notification_bg_low:I = 0x7f0803bb
+.field public static final notification_bg_low:I = 0x7f0803c6
-.field public static final notification_bg_low_normal:I = 0x7f0803bc
+.field public static final notification_bg_low_normal:I = 0x7f0803c7
-.field public static final notification_bg_low_pressed:I = 0x7f0803bd
+.field public static final notification_bg_low_pressed:I = 0x7f0803c8
-.field public static final notification_bg_normal:I = 0x7f0803be
+.field public static final notification_bg_normal:I = 0x7f0803c9
-.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
+.field public static final notification_bg_normal_pressed:I = 0x7f0803ca
-.field public static final notification_icon_background:I = 0x7f0803c0
+.field public static final notification_icon_background:I = 0x7f0803cb
-.field public static final notification_template_icon_bg:I = 0x7f0803c1
+.field public static final notification_template_icon_bg:I = 0x7f0803cc
-.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
+.field public static final notification_template_icon_low_bg:I = 0x7f0803cd
-.field public static final notification_tile_bg:I = 0x7f0803c3
+.field public static final notification_tile_bg:I = 0x7f0803ce
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf
# direct methods
diff --git a/com.discord/smali/androidx/legacy/coreutils/R$string.smali b/com.discord/smali/androidx/legacy/coreutils/R$string.smali
index 330a13f2fc..41fdf90dcc 100644
--- a/com.discord/smali/androidx/legacy/coreutils/R$string.smali
+++ b/com.discord/smali/androidx/legacy/coreutils/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f48
# direct methods
diff --git a/com.discord/smali/androidx/legacy/v13/R$drawable.smali b/com.discord/smali/androidx/legacy/v13/R$drawable.smali
index c941ffaad9..57d2562287 100644
--- a/com.discord/smali/androidx/legacy/v13/R$drawable.smali
+++ b/com.discord/smali/androidx/legacy/v13/R$drawable.smali
@@ -15,29 +15,29 @@
# static fields
-.field public static final notification_action_background:I = 0x7f0803b9
+.field public static final notification_action_background:I = 0x7f0803c4
-.field public static final notification_bg:I = 0x7f0803ba
+.field public static final notification_bg:I = 0x7f0803c5
-.field public static final notification_bg_low:I = 0x7f0803bb
+.field public static final notification_bg_low:I = 0x7f0803c6
-.field public static final notification_bg_low_normal:I = 0x7f0803bc
+.field public static final notification_bg_low_normal:I = 0x7f0803c7
-.field public static final notification_bg_low_pressed:I = 0x7f0803bd
+.field public static final notification_bg_low_pressed:I = 0x7f0803c8
-.field public static final notification_bg_normal:I = 0x7f0803be
+.field public static final notification_bg_normal:I = 0x7f0803c9
-.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
+.field public static final notification_bg_normal_pressed:I = 0x7f0803ca
-.field public static final notification_icon_background:I = 0x7f0803c0
+.field public static final notification_icon_background:I = 0x7f0803cb
-.field public static final notification_template_icon_bg:I = 0x7f0803c1
+.field public static final notification_template_icon_bg:I = 0x7f0803cc
-.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
+.field public static final notification_template_icon_low_bg:I = 0x7f0803cd
-.field public static final notification_tile_bg:I = 0x7f0803c3
+.field public static final notification_tile_bg:I = 0x7f0803ce
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf
# direct methods
diff --git a/com.discord/smali/androidx/legacy/v13/R$string.smali b/com.discord/smali/androidx/legacy/v13/R$string.smali
index 5a8704b4ad..448a3ae621 100644
--- a/com.discord/smali/androidx/legacy/v13/R$string.smali
+++ b/com.discord/smali/androidx/legacy/v13/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f48
# 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 a9c83d1b7c..e1b019714a 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 = 0x7f0803b9
+.field public static final notification_action_background:I = 0x7f0803c4
-.field public static final notification_bg:I = 0x7f0803ba
+.field public static final notification_bg:I = 0x7f0803c5
-.field public static final notification_bg_low:I = 0x7f0803bb
+.field public static final notification_bg_low:I = 0x7f0803c6
-.field public static final notification_bg_low_normal:I = 0x7f0803bc
+.field public static final notification_bg_low_normal:I = 0x7f0803c7
-.field public static final notification_bg_low_pressed:I = 0x7f0803bd
+.field public static final notification_bg_low_pressed:I = 0x7f0803c8
-.field public static final notification_bg_normal:I = 0x7f0803be
+.field public static final notification_bg_normal:I = 0x7f0803c9
-.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
+.field public static final notification_bg_normal_pressed:I = 0x7f0803ca
-.field public static final notification_icon_background:I = 0x7f0803c0
+.field public static final notification_icon_background:I = 0x7f0803cb
-.field public static final notification_template_icon_bg:I = 0x7f0803c1
+.field public static final notification_template_icon_bg:I = 0x7f0803cc
-.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
+.field public static final notification_template_icon_low_bg:I = 0x7f0803cd
-.field public static final notification_tile_bg:I = 0x7f0803c3
+.field public static final notification_tile_bg:I = 0x7f0803ce
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf
# direct methods
diff --git a/com.discord/smali/androidx/legacy/v4/R$string.smali b/com.discord/smali/androidx/legacy/v4/R$string.smali
index 4be1677c68..bc042f7e4e 100644
--- a/com.discord/smali/androidx/legacy/v4/R$string.smali
+++ b/com.discord/smali/androidx/legacy/v4/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f48
# 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 890ba6fedb..d3ff615e99 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 = 0x7f0803b9
+.field public static final notification_action_background:I = 0x7f0803c4
-.field public static final notification_bg:I = 0x7f0803ba
+.field public static final notification_bg:I = 0x7f0803c5
-.field public static final notification_bg_low:I = 0x7f0803bb
+.field public static final notification_bg_low:I = 0x7f0803c6
-.field public static final notification_bg_low_normal:I = 0x7f0803bc
+.field public static final notification_bg_low_normal:I = 0x7f0803c7
-.field public static final notification_bg_low_pressed:I = 0x7f0803bd
+.field public static final notification_bg_low_pressed:I = 0x7f0803c8
-.field public static final notification_bg_normal:I = 0x7f0803be
+.field public static final notification_bg_normal:I = 0x7f0803c9
-.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
+.field public static final notification_bg_normal_pressed:I = 0x7f0803ca
-.field public static final notification_icon_background:I = 0x7f0803c0
+.field public static final notification_icon_background:I = 0x7f0803cb
-.field public static final notification_template_icon_bg:I = 0x7f0803c1
+.field public static final notification_template_icon_bg:I = 0x7f0803cc
-.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
+.field public static final notification_template_icon_low_bg:I = 0x7f0803cd
-.field public static final notification_tile_bg:I = 0x7f0803c3
+.field public static final notification_tile_bg:I = 0x7f0803ce
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf
# direct methods
diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$string.smali b/com.discord/smali/androidx/lifecycle/extensions/R$string.smali
index 44892ce9c5..aa629522b9 100644
--- a/com.discord/smali/androidx/lifecycle/extensions/R$string.smali
+++ b/com.discord/smali/androidx/lifecycle/extensions/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f48
# direct methods
diff --git a/com.discord/smali/androidx/loader/R$drawable.smali b/com.discord/smali/androidx/loader/R$drawable.smali
index 9f92bc4da2..5e08743ddd 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 = 0x7f0803b9
+.field public static final notification_action_background:I = 0x7f0803c4
-.field public static final notification_bg:I = 0x7f0803ba
+.field public static final notification_bg:I = 0x7f0803c5
-.field public static final notification_bg_low:I = 0x7f0803bb
+.field public static final notification_bg_low:I = 0x7f0803c6
-.field public static final notification_bg_low_normal:I = 0x7f0803bc
+.field public static final notification_bg_low_normal:I = 0x7f0803c7
-.field public static final notification_bg_low_pressed:I = 0x7f0803bd
+.field public static final notification_bg_low_pressed:I = 0x7f0803c8
-.field public static final notification_bg_normal:I = 0x7f0803be
+.field public static final notification_bg_normal:I = 0x7f0803c9
-.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
+.field public static final notification_bg_normal_pressed:I = 0x7f0803ca
-.field public static final notification_icon_background:I = 0x7f0803c0
+.field public static final notification_icon_background:I = 0x7f0803cb
-.field public static final notification_template_icon_bg:I = 0x7f0803c1
+.field public static final notification_template_icon_bg:I = 0x7f0803cc
-.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
+.field public static final notification_template_icon_low_bg:I = 0x7f0803cd
-.field public static final notification_tile_bg:I = 0x7f0803c3
+.field public static final notification_tile_bg:I = 0x7f0803ce
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf
# direct methods
diff --git a/com.discord/smali/androidx/loader/R$string.smali b/com.discord/smali/androidx/loader/R$string.smali
index b2838cee48..922d234d97 100644
--- a/com.discord/smali/androidx/loader/R$string.smali
+++ b/com.discord/smali/androidx/loader/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f48
# direct methods
diff --git a/com.discord/smali/androidx/media/R$drawable.smali b/com.discord/smali/androidx/media/R$drawable.smali
index 79a96362b6..206938ecc0 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 = 0x7f0803b9
+.field public static final notification_action_background:I = 0x7f0803c4
-.field public static final notification_bg:I = 0x7f0803ba
+.field public static final notification_bg:I = 0x7f0803c5
-.field public static final notification_bg_low:I = 0x7f0803bb
+.field public static final notification_bg_low:I = 0x7f0803c6
-.field public static final notification_bg_low_normal:I = 0x7f0803bc
+.field public static final notification_bg_low_normal:I = 0x7f0803c7
-.field public static final notification_bg_low_pressed:I = 0x7f0803bd
+.field public static final notification_bg_low_pressed:I = 0x7f0803c8
-.field public static final notification_bg_normal:I = 0x7f0803be
+.field public static final notification_bg_normal:I = 0x7f0803c9
-.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
+.field public static final notification_bg_normal_pressed:I = 0x7f0803ca
-.field public static final notification_icon_background:I = 0x7f0803c0
+.field public static final notification_icon_background:I = 0x7f0803cb
-.field public static final notification_template_icon_bg:I = 0x7f0803c1
+.field public static final notification_template_icon_bg:I = 0x7f0803cc
-.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
+.field public static final notification_template_icon_low_bg:I = 0x7f0803cd
-.field public static final notification_tile_bg:I = 0x7f0803c3
+.field public static final notification_tile_bg:I = 0x7f0803ce
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf
# direct methods
diff --git a/com.discord/smali/androidx/media/R$string.smali b/com.discord/smali/androidx/media/R$string.smali
index 3d2a46da17..4cf8840ed0 100644
--- a/com.discord/smali/androidx/media/R$string.smali
+++ b/com.discord/smali/androidx/media/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f48
# direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$drawable.smali b/com.discord/smali/androidx/recyclerview/R$drawable.smali
index df12147062..f6190216bb 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 = 0x7f0803b9
+.field public static final notification_action_background:I = 0x7f0803c4
-.field public static final notification_bg:I = 0x7f0803ba
+.field public static final notification_bg:I = 0x7f0803c5
-.field public static final notification_bg_low:I = 0x7f0803bb
+.field public static final notification_bg_low:I = 0x7f0803c6
-.field public static final notification_bg_low_normal:I = 0x7f0803bc
+.field public static final notification_bg_low_normal:I = 0x7f0803c7
-.field public static final notification_bg_low_pressed:I = 0x7f0803bd
+.field public static final notification_bg_low_pressed:I = 0x7f0803c8
-.field public static final notification_bg_normal:I = 0x7f0803be
+.field public static final notification_bg_normal:I = 0x7f0803c9
-.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
+.field public static final notification_bg_normal_pressed:I = 0x7f0803ca
-.field public static final notification_icon_background:I = 0x7f0803c0
+.field public static final notification_icon_background:I = 0x7f0803cb
-.field public static final notification_template_icon_bg:I = 0x7f0803c1
+.field public static final notification_template_icon_bg:I = 0x7f0803cc
-.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
+.field public static final notification_template_icon_low_bg:I = 0x7f0803cd
-.field public static final notification_tile_bg:I = 0x7f0803c3
+.field public static final notification_tile_bg:I = 0x7f0803ce
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf
# direct methods
diff --git a/com.discord/smali/androidx/recyclerview/R$string.smali b/com.discord/smali/androidx/recyclerview/R$string.smali
index 189c1f9d32..f4063fbc49 100644
--- a/com.discord/smali/androidx/recyclerview/R$string.smali
+++ b/com.discord/smali/androidx/recyclerview/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f48
# direct methods
diff --git a/com.discord/smali/androidx/room/R$drawable.smali b/com.discord/smali/androidx/room/R$drawable.smali
index cadf4f981f..c5692d0fcd 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 = 0x7f0803b9
+.field public static final notification_action_background:I = 0x7f0803c4
-.field public static final notification_bg:I = 0x7f0803ba
+.field public static final notification_bg:I = 0x7f0803c5
-.field public static final notification_bg_low:I = 0x7f0803bb
+.field public static final notification_bg_low:I = 0x7f0803c6
-.field public static final notification_bg_low_normal:I = 0x7f0803bc
+.field public static final notification_bg_low_normal:I = 0x7f0803c7
-.field public static final notification_bg_low_pressed:I = 0x7f0803bd
+.field public static final notification_bg_low_pressed:I = 0x7f0803c8
-.field public static final notification_bg_normal:I = 0x7f0803be
+.field public static final notification_bg_normal:I = 0x7f0803c9
-.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
+.field public static final notification_bg_normal_pressed:I = 0x7f0803ca
-.field public static final notification_icon_background:I = 0x7f0803c0
+.field public static final notification_icon_background:I = 0x7f0803cb
-.field public static final notification_template_icon_bg:I = 0x7f0803c1
+.field public static final notification_template_icon_bg:I = 0x7f0803cc
-.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
+.field public static final notification_template_icon_low_bg:I = 0x7f0803cd
-.field public static final notification_tile_bg:I = 0x7f0803c3
+.field public static final notification_tile_bg:I = 0x7f0803ce
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf
# direct methods
diff --git a/com.discord/smali/androidx/room/R$string.smali b/com.discord/smali/androidx/room/R$string.smali
index 6fa5bc7d5a..a0bec71061 100644
--- a/com.discord/smali/androidx/room/R$string.smali
+++ b/com.discord/smali/androidx/room/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f48
# direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali b/com.discord/smali/androidx/slidingpanelayout/R$drawable.smali
index 7ec9dc0b52..6c8154ad9b 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 = 0x7f0803b9
+.field public static final notification_action_background:I = 0x7f0803c4
-.field public static final notification_bg:I = 0x7f0803ba
+.field public static final notification_bg:I = 0x7f0803c5
-.field public static final notification_bg_low:I = 0x7f0803bb
+.field public static final notification_bg_low:I = 0x7f0803c6
-.field public static final notification_bg_low_normal:I = 0x7f0803bc
+.field public static final notification_bg_low_normal:I = 0x7f0803c7
-.field public static final notification_bg_low_pressed:I = 0x7f0803bd
+.field public static final notification_bg_low_pressed:I = 0x7f0803c8
-.field public static final notification_bg_normal:I = 0x7f0803be
+.field public static final notification_bg_normal:I = 0x7f0803c9
-.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
+.field public static final notification_bg_normal_pressed:I = 0x7f0803ca
-.field public static final notification_icon_background:I = 0x7f0803c0
+.field public static final notification_icon_background:I = 0x7f0803cb
-.field public static final notification_template_icon_bg:I = 0x7f0803c1
+.field public static final notification_template_icon_bg:I = 0x7f0803cc
-.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
+.field public static final notification_template_icon_low_bg:I = 0x7f0803cd
-.field public static final notification_tile_bg:I = 0x7f0803c3
+.field public static final notification_tile_bg:I = 0x7f0803ce
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf
# direct methods
diff --git a/com.discord/smali/androidx/slidingpanelayout/R$string.smali b/com.discord/smali/androidx/slidingpanelayout/R$string.smali
index ac21abb69c..a7fa21c7dd 100644
--- a/com.discord/smali/androidx/slidingpanelayout/R$string.smali
+++ b/com.discord/smali/androidx/slidingpanelayout/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f48
# direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali b/com.discord/smali/androidx/swiperefreshlayout/R$drawable.smali
index 0938333f92..394a8a3c3a 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 = 0x7f0803b9
+.field public static final notification_action_background:I = 0x7f0803c4
-.field public static final notification_bg:I = 0x7f0803ba
+.field public static final notification_bg:I = 0x7f0803c5
-.field public static final notification_bg_low:I = 0x7f0803bb
+.field public static final notification_bg_low:I = 0x7f0803c6
-.field public static final notification_bg_low_normal:I = 0x7f0803bc
+.field public static final notification_bg_low_normal:I = 0x7f0803c7
-.field public static final notification_bg_low_pressed:I = 0x7f0803bd
+.field public static final notification_bg_low_pressed:I = 0x7f0803c8
-.field public static final notification_bg_normal:I = 0x7f0803be
+.field public static final notification_bg_normal:I = 0x7f0803c9
-.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
+.field public static final notification_bg_normal_pressed:I = 0x7f0803ca
-.field public static final notification_icon_background:I = 0x7f0803c0
+.field public static final notification_icon_background:I = 0x7f0803cb
-.field public static final notification_template_icon_bg:I = 0x7f0803c1
+.field public static final notification_template_icon_bg:I = 0x7f0803cc
-.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
+.field public static final notification_template_icon_low_bg:I = 0x7f0803cd
-.field public static final notification_tile_bg:I = 0x7f0803c3
+.field public static final notification_tile_bg:I = 0x7f0803ce
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf
# direct methods
diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$string.smali b/com.discord/smali/androidx/swiperefreshlayout/R$string.smali
index 36f03ce725..1a22707c24 100644
--- a/com.discord/smali/androidx/swiperefreshlayout/R$string.smali
+++ b/com.discord/smali/androidx/swiperefreshlayout/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f48
# direct methods
diff --git a/com.discord/smali/androidx/transition/R$drawable.smali b/com.discord/smali/androidx/transition/R$drawable.smali
index e05993ea88..f800367722 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 = 0x7f0803b9
+.field public static final notification_action_background:I = 0x7f0803c4
-.field public static final notification_bg:I = 0x7f0803ba
+.field public static final notification_bg:I = 0x7f0803c5
-.field public static final notification_bg_low:I = 0x7f0803bb
+.field public static final notification_bg_low:I = 0x7f0803c6
-.field public static final notification_bg_low_normal:I = 0x7f0803bc
+.field public static final notification_bg_low_normal:I = 0x7f0803c7
-.field public static final notification_bg_low_pressed:I = 0x7f0803bd
+.field public static final notification_bg_low_pressed:I = 0x7f0803c8
-.field public static final notification_bg_normal:I = 0x7f0803be
+.field public static final notification_bg_normal:I = 0x7f0803c9
-.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
+.field public static final notification_bg_normal_pressed:I = 0x7f0803ca
-.field public static final notification_icon_background:I = 0x7f0803c0
+.field public static final notification_icon_background:I = 0x7f0803cb
-.field public static final notification_template_icon_bg:I = 0x7f0803c1
+.field public static final notification_template_icon_bg:I = 0x7f0803cc
-.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
+.field public static final notification_template_icon_low_bg:I = 0x7f0803cd
-.field public static final notification_tile_bg:I = 0x7f0803c3
+.field public static final notification_tile_bg:I = 0x7f0803ce
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf
# direct methods
diff --git a/com.discord/smali/androidx/transition/R$string.smali b/com.discord/smali/androidx/transition/R$string.smali
index 027be59dea..61f1e36565 100644
--- a/com.discord/smali/androidx/transition/R$string.smali
+++ b/com.discord/smali/androidx/transition/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f48
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$drawable.smali b/com.discord/smali/androidx/vectordrawable/R$drawable.smali
index 2c13ac6a79..667a06eff7 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 = 0x7f0803b9
+.field public static final notification_action_background:I = 0x7f0803c4
-.field public static final notification_bg:I = 0x7f0803ba
+.field public static final notification_bg:I = 0x7f0803c5
-.field public static final notification_bg_low:I = 0x7f0803bb
+.field public static final notification_bg_low:I = 0x7f0803c6
-.field public static final notification_bg_low_normal:I = 0x7f0803bc
+.field public static final notification_bg_low_normal:I = 0x7f0803c7
-.field public static final notification_bg_low_pressed:I = 0x7f0803bd
+.field public static final notification_bg_low_pressed:I = 0x7f0803c8
-.field public static final notification_bg_normal:I = 0x7f0803be
+.field public static final notification_bg_normal:I = 0x7f0803c9
-.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
+.field public static final notification_bg_normal_pressed:I = 0x7f0803ca
-.field public static final notification_icon_background:I = 0x7f0803c0
+.field public static final notification_icon_background:I = 0x7f0803cb
-.field public static final notification_template_icon_bg:I = 0x7f0803c1
+.field public static final notification_template_icon_bg:I = 0x7f0803cc
-.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
+.field public static final notification_template_icon_low_bg:I = 0x7f0803cd
-.field public static final notification_tile_bg:I = 0x7f0803c3
+.field public static final notification_tile_bg:I = 0x7f0803ce
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf
# direct methods
diff --git a/com.discord/smali/androidx/vectordrawable/R$string.smali b/com.discord/smali/androidx/vectordrawable/R$string.smali
index c791028677..5eac34827b 100644
--- a/com.discord/smali/androidx/vectordrawable/R$string.smali
+++ b/com.discord/smali/androidx/vectordrawable/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f48
# direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$drawable.smali b/com.discord/smali/androidx/viewpager/R$drawable.smali
index 2ad270f293..61bd5ee653 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 = 0x7f0803b9
+.field public static final notification_action_background:I = 0x7f0803c4
-.field public static final notification_bg:I = 0x7f0803ba
+.field public static final notification_bg:I = 0x7f0803c5
-.field public static final notification_bg_low:I = 0x7f0803bb
+.field public static final notification_bg_low:I = 0x7f0803c6
-.field public static final notification_bg_low_normal:I = 0x7f0803bc
+.field public static final notification_bg_low_normal:I = 0x7f0803c7
-.field public static final notification_bg_low_pressed:I = 0x7f0803bd
+.field public static final notification_bg_low_pressed:I = 0x7f0803c8
-.field public static final notification_bg_normal:I = 0x7f0803be
+.field public static final notification_bg_normal:I = 0x7f0803c9
-.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
+.field public static final notification_bg_normal_pressed:I = 0x7f0803ca
-.field public static final notification_icon_background:I = 0x7f0803c0
+.field public static final notification_icon_background:I = 0x7f0803cb
-.field public static final notification_template_icon_bg:I = 0x7f0803c1
+.field public static final notification_template_icon_bg:I = 0x7f0803cc
-.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
+.field public static final notification_template_icon_low_bg:I = 0x7f0803cd
-.field public static final notification_tile_bg:I = 0x7f0803c3
+.field public static final notification_tile_bg:I = 0x7f0803ce
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf
# direct methods
diff --git a/com.discord/smali/androidx/viewpager/R$string.smali b/com.discord/smali/androidx/viewpager/R$string.smali
index 19fa182e90..a5a0f312c1 100644
--- a/com.discord/smali/androidx/viewpager/R$string.smali
+++ b/com.discord/smali/androidx/viewpager/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f48
# direct methods
diff --git a/com.discord/smali/androidx/work/R$drawable.smali b/com.discord/smali/androidx/work/R$drawable.smali
index 7751182876..bdcb35ac00 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 = 0x7f0803b9
+.field public static final notification_action_background:I = 0x7f0803c4
-.field public static final notification_bg:I = 0x7f0803ba
+.field public static final notification_bg:I = 0x7f0803c5
-.field public static final notification_bg_low:I = 0x7f0803bb
+.field public static final notification_bg_low:I = 0x7f0803c6
-.field public static final notification_bg_low_normal:I = 0x7f0803bc
+.field public static final notification_bg_low_normal:I = 0x7f0803c7
-.field public static final notification_bg_low_pressed:I = 0x7f0803bd
+.field public static final notification_bg_low_pressed:I = 0x7f0803c8
-.field public static final notification_bg_normal:I = 0x7f0803be
+.field public static final notification_bg_normal:I = 0x7f0803c9
-.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
+.field public static final notification_bg_normal_pressed:I = 0x7f0803ca
-.field public static final notification_icon_background:I = 0x7f0803c0
+.field public static final notification_icon_background:I = 0x7f0803cb
-.field public static final notification_template_icon_bg:I = 0x7f0803c1
+.field public static final notification_template_icon_bg:I = 0x7f0803cc
-.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
+.field public static final notification_template_icon_low_bg:I = 0x7f0803cd
-.field public static final notification_tile_bg:I = 0x7f0803c3
+.field public static final notification_tile_bg:I = 0x7f0803ce
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf
# direct methods
diff --git a/com.discord/smali/androidx/work/R$string.smali b/com.discord/smali/androidx/work/R$string.smali
index 383fbef059..a5dfdc4901 100644
--- a/com.discord/smali/androidx/work/R$string.smali
+++ b/com.discord/smali/androidx/work/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f48
# 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 6c85acf186..502d4f56cb 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 = 0x7f0803b9
+.field public static final notification_action_background:I = 0x7f0803c4
-.field public static final notification_bg:I = 0x7f0803ba
+.field public static final notification_bg:I = 0x7f0803c5
-.field public static final notification_bg_low:I = 0x7f0803bb
+.field public static final notification_bg_low:I = 0x7f0803c6
-.field public static final notification_bg_low_normal:I = 0x7f0803bc
+.field public static final notification_bg_low_normal:I = 0x7f0803c7
-.field public static final notification_bg_low_pressed:I = 0x7f0803bd
+.field public static final notification_bg_low_pressed:I = 0x7f0803c8
-.field public static final notification_bg_normal:I = 0x7f0803be
+.field public static final notification_bg_normal:I = 0x7f0803c9
-.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
+.field public static final notification_bg_normal_pressed:I = 0x7f0803ca
-.field public static final notification_icon_background:I = 0x7f0803c0
+.field public static final notification_icon_background:I = 0x7f0803cb
-.field public static final notification_template_icon_bg:I = 0x7f0803c1
+.field public static final notification_template_icon_bg:I = 0x7f0803cc
-.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
+.field public static final notification_template_icon_low_bg:I = 0x7f0803cd
-.field public static final notification_tile_bg:I = 0x7f0803c3
+.field public static final notification_tile_bg:I = 0x7f0803ce
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf
# direct methods
diff --git a/com.discord/smali/androidx/work/ktx/R$string.smali b/com.discord/smali/androidx/work/ktx/R$string.smali
index 66414130d7..c222804899 100644
--- a/com.discord/smali/androidx/work/ktx/R$string.smali
+++ b/com.discord/smali/androidx/work/ktx/R$string.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f48
# direct methods
diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali
index b4ebf88c55..e46caf86f8 100644
--- a/com.discord/smali/com/discord/BuildConfig.smali
+++ b/com.discord/smali/com/discord/BuildConfig.smali
@@ -30,11 +30,11 @@
.field public static final LOCAL_VOICE:Ljava/lang/String; = ""
-.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/899"
+.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/900"
-.field public static final VERSION_CODE:I = 0x383
+.field public static final VERSION_CODE:I = 0x384
-.field public static final VERSION_NAME:Ljava/lang/String; = "8.9.9"
+.field public static final VERSION_NAME:Ljava/lang/String; = "9.0.0"
# direct methods
diff --git a/com.discord/smali/com/discord/a/a.smali b/com.discord/smali/com/discord/a/a.smali
index b396eea716..79b935d660 100644
--- a/com.discord/smali/com/discord/a/a.smali
+++ b/com.discord/smali/com/discord/a/a.smali
@@ -266,7 +266,7 @@
new-instance v1, Lcom/discord/a/a$b;
- const v3, 0x7f120d56
+ const v3, 0x7f120d5a
invoke-virtual {p0, v3}, Lcom/discord/a/a;->getString(I)Ljava/lang/String;
@@ -276,7 +276,7 @@
invoke-static {v3, v4}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
- const v4, 0x7f120d55
+ const v4, 0x7f120d59
invoke-virtual {p0, v4}, Lcom/discord/a/a;->getString(I)Ljava/lang/String;
@@ -286,7 +286,7 @@
invoke-static {v4, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
- const v5, 0x7f0803a7
+ const v5, 0x7f0803b2
invoke-direct {v1, v5, v3, v4}, Lcom/discord/a/a$b;->(ILjava/lang/String;Ljava/lang/String;)V
@@ -294,7 +294,7 @@
new-instance v1, Lcom/discord/a/a$b;
- const v3, 0x7f120d53
+ const v3, 0x7f120d57
invoke-virtual {p0, v3}, Lcom/discord/a/a;->getString(I)Ljava/lang/String;
@@ -304,7 +304,7 @@
invoke-static {v3, v4}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
- const v4, 0x7f120d52
+ const v4, 0x7f120d56
invoke-virtual {p0, v4}, Lcom/discord/a/a;->getString(I)Ljava/lang/String;
@@ -314,7 +314,7 @@
invoke-static {v4, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
- const v5, 0x7f08038d
+ const v5, 0x7f080398
invoke-direct {v1, v5, v3, v4}, Lcom/discord/a/a$b;->(ILjava/lang/String;Ljava/lang/String;)V
@@ -324,7 +324,7 @@
new-instance v1, Lcom/discord/a/a$b;
- const v4, 0x7f120d4d
+ const v4, 0x7f120d51
invoke-virtual {p0, v4}, Lcom/discord/a/a;->getString(I)Ljava/lang/String;
@@ -334,7 +334,7 @@
invoke-static {v4, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
- const v5, 0x7f120d4c
+ const v5, 0x7f120d50
invoke-virtual {p0, v5}, Lcom/discord/a/a;->getString(I)Ljava/lang/String;
@@ -344,7 +344,7 @@
invoke-static {v5, v6}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
- const v6, 0x7f080369
+ const v6, 0x7f080374
invoke-direct {v1, v6, v4, v5}, Lcom/discord/a/a$b;->(ILjava/lang/String;Ljava/lang/String;)V
@@ -354,7 +354,7 @@
new-instance v1, Lcom/discord/a/a$b;
- const v5, 0x7f120d59
+ const v5, 0x7f120d5d
invoke-virtual {p0, v5}, Lcom/discord/a/a;->getString(I)Ljava/lang/String;
@@ -366,7 +366,7 @@
new-array v4, v4, [Ljava/lang/Object;
- const v6, 0x7f120573
+ const v6, 0x7f120572
invoke-virtual {p0, v6}, Lcom/discord/a/a;->getString(I)Ljava/lang/String;
@@ -374,7 +374,7 @@
aput-object v6, v4, v2
- const v6, 0x7f120571
+ const v6, 0x7f120570
invoke-virtual {p0, v6}, Lcom/discord/a/a;->getString(I)Ljava/lang/String;
@@ -382,7 +382,7 @@
aput-object v6, v4, v3
- const v6, 0x7f120d58
+ const v6, 0x7f120d5c
invoke-virtual {p0, v6, v4}, Lcom/discord/a/a;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -392,7 +392,7 @@
invoke-static {v4, v6}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
- const v6, 0x7f0803a8
+ const v6, 0x7f0803b3
invoke-direct {v1, v6, v5, v4}, Lcom/discord/a/a$b;->(ILjava/lang/String;Ljava/lang/String;)V
@@ -402,7 +402,7 @@
new-instance v1, Lcom/discord/a/a$b;
- const v4, 0x7f120d4a
+ const v4, 0x7f120d4e
invoke-virtual {p0, v4}, Lcom/discord/a/a;->getString(I)Ljava/lang/String;
@@ -412,7 +412,7 @@
invoke-static {v4, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
- const v5, 0x7f120d49
+ const v5, 0x7f120d4d
invoke-virtual {p0, v5}, Lcom/discord/a/a;->getString(I)Ljava/lang/String;
@@ -422,7 +422,7 @@
invoke-static {v5, v6}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
- const v6, 0x7f080371
+ const v6, 0x7f08037c
invoke-direct {v1, v6, v4, v5}, Lcom/discord/a/a$b;->(ILjava/lang/String;Ljava/lang/String;)V
@@ -430,7 +430,7 @@
new-instance v0, Lcom/discord/a/a$b;
- const v1, 0x7f120d50
+ const v1, 0x7f120d54
invoke-virtual {p0, v1}, Lcom/discord/a/a;->getString(I)Ljava/lang/String;
@@ -440,7 +440,7 @@
invoke-static {v1, v4}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
- const v4, 0x7f120d4f
+ const v4, 0x7f120d53
invoke-virtual {p0, v4}, Lcom/discord/a/a;->getString(I)Ljava/lang/String;
@@ -450,7 +450,7 @@
invoke-static {v4, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
- const v5, 0x7f080374
+ const v5, 0x7f08037f
invoke-direct {v0, v5, v1, v4}, Lcom/discord/a/a$b;->(ILjava/lang/String;Ljava/lang/String;)V
diff --git a/com.discord/smali/com/discord/a/c.smali b/com.discord/smali/com/discord/a/c.smali
index af3806d9bb..5f1b659ce2 100644
--- a/com.discord/smali/com/discord/a/c.smali
+++ b/com.discord/smali/com/discord/a/c.smali
@@ -225,7 +225,7 @@
move-result-object p1
- const v0, 0x7f120747
+ const v0, 0x7f120746
invoke-virtual {p0, v0}, Lcom/discord/a/c;->getString(I)Ljava/lang/String;
@@ -239,7 +239,7 @@
move-result-object p1
- const v0, 0x7f12072a
+ const v0, 0x7f120729
invoke-virtual {p0, v0}, Lcom/discord/a/c;->getString(I)Ljava/lang/String;
@@ -259,7 +259,7 @@
if-eqz v0, :cond_0
- const v1, 0x7f12073f
+ const v1, 0x7f12073e
invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
@@ -301,7 +301,7 @@
move-result-object v0
- const v1, 0x7f120747
+ const v1, 0x7f120746
invoke-virtual {p0, v1}, Lcom/discord/a/c;->getString(I)Ljava/lang/String;
@@ -315,7 +315,7 @@
move-result-object v0
- const v1, 0x7f12073b
+ const v1, 0x7f12073a
invoke-virtual {p0, v1}, Lcom/discord/a/c;->getString(I)Ljava/lang/String;
@@ -357,7 +357,7 @@
if-eqz v1, :cond_0
- const v2, 0x7f120ddb
+ const v2, 0x7f120ddf
invoke-virtual {v1, v2}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
@@ -402,7 +402,7 @@
move-result-object p1
- const v0, 0x7f12072e
+ const v0, 0x7f12072d
invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(I)V
@@ -427,7 +427,7 @@
move-result-object p1
- const v0, 0x7f12072a
+ const v0, 0x7f120729
invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(I)V
@@ -452,7 +452,7 @@
move-result-object p1
- const v0, 0x7f12072b
+ const v0, 0x7f12072a
invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(I)V
@@ -477,7 +477,7 @@
move-result-object p1
- const v0, 0x7f120729
+ const v0, 0x7f120728
invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setText(I)V
@@ -493,7 +493,7 @@
if-eqz v0, :cond_a
- const v1, 0x7f12073f
+ const v1, 0x7f12073e
invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
@@ -719,7 +719,7 @@
if-ne v3, v1, :cond_3
- const v3, 0x7f12074b
+ const v3, 0x7f12074a
new-array v1, v1, [Ljava/lang/Object;
@@ -751,7 +751,7 @@
throw p1
:cond_4
- const v3, 0x7f12074a
+ const v3, 0x7f120749
new-array v1, v1, [Ljava/lang/Object;
@@ -807,7 +807,7 @@
if-eqz v2, :cond_0
- const v2, 0x7f120749
+ const v2, 0x7f120748
new-array v5, v3, [Ljava/lang/Object;
@@ -820,7 +820,7 @@
goto :goto_0
:cond_0
- const v2, 0x7f120748
+ const v2, 0x7f120747
invoke-virtual {p0, v2}, Lcom/discord/a/c;->getString(I)Ljava/lang/String;
@@ -837,7 +837,7 @@
if-eqz v5, :cond_1
- const p1, 0x7f120736
+ const p1, 0x7f120735
new-array v0, v3, [Ljava/lang/Object;
@@ -856,7 +856,7 @@
if-eqz p1, :cond_2
- const p1, 0x7f120735
+ const p1, 0x7f120734
new-array v0, v3, [Ljava/lang/Object;
@@ -869,7 +869,7 @@
goto :goto_1
:cond_2
- const p1, 0x7f120734
+ const p1, 0x7f120733
new-array v1, v3, [Ljava/lang/Object;
@@ -910,7 +910,7 @@
if-eqz v0, :cond_3
- const v1, 0x7f120743
+ const v1, 0x7f120742
invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
@@ -948,7 +948,7 @@
move-result-object p1
- const v0, 0x7f120747
+ const v0, 0x7f120746
invoke-virtual {p0, v0}, Lcom/discord/a/c;->getString(I)Ljava/lang/String;
@@ -962,7 +962,7 @@
move-result-object p1
- const v0, 0x7f120726
+ const v0, 0x7f120725
invoke-virtual {p0, v0}, Lcom/discord/a/c;->getString(I)Ljava/lang/String;
@@ -984,7 +984,7 @@
if-eqz v0, :cond_0
- const v1, 0x7f12073f
+ const v1, 0x7f12073e
invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
@@ -1040,7 +1040,7 @@
if-eqz v1, :cond_0
- const v1, 0x7f120746
+ const v1, 0x7f120745
new-array v4, v2, [Ljava/lang/Object;
@@ -1053,7 +1053,7 @@
goto :goto_0
:cond_0
- const v1, 0x7f120745
+ const v1, 0x7f120744
invoke-virtual {p0, v1}, Lcom/discord/a/c;->getString(I)Ljava/lang/String;
@@ -1070,7 +1070,7 @@
if-eqz v4, :cond_1
- const v4, 0x7f120728
+ const v4, 0x7f120727
const/4 v5, 0x2
@@ -1091,7 +1091,7 @@
goto :goto_1
:cond_1
- const v4, 0x7f120727
+ const v4, 0x7f120726
new-array v2, v2, [Ljava/lang/Object;
@@ -1132,7 +1132,7 @@
if-eqz v1, :cond_2
- const v2, 0x7f12073d
+ const v2, 0x7f12073c
invoke-virtual {v1, v2}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence;
@@ -1302,7 +1302,7 @@
if-eqz v1, :cond_0
- const v1, 0x7f120746
+ const v1, 0x7f120745
new-array v4, v3, [Ljava/lang/Object;
@@ -1315,7 +1315,7 @@
goto :goto_0
:cond_0
- const v1, 0x7f120745
+ const v1, 0x7f120744
invoke-virtual {p0, v1}, Lcom/discord/a/c;->getString(I)Ljava/lang/String;
@@ -1332,7 +1332,7 @@
if-eqz v4, :cond_1
- const v4, 0x7f120728
+ const v4, 0x7f120727
const/4 v5, 0x2
@@ -1353,7 +1353,7 @@
goto :goto_1
:cond_1
- const p1, 0x7f120727
+ const p1, 0x7f120726
new-array v3, v3, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/app/AppFragment$b.smali b/com.discord/smali/com/discord/app/AppFragment$b.smali
index 5a5790342a..1e49d5f14b 100644
--- a/com.discord/smali/com/discord/app/AppFragment$b.smali
+++ b/com.discord/smali/com/discord/app/AppFragment$b.smali
@@ -84,7 +84,7 @@
iget-object v2, p0, Lcom/discord/app/AppFragment$b;->this$0:Lcom/discord/app/AppFragment;
- const v3, 0x7f1204e8
+ const v3, 0x7f1204e7
invoke-virtual {v2, v3}, Lcom/discord/app/AppFragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/app/AppFragment$c.smali b/com.discord/smali/com/discord/app/AppFragment$c.smali
index abedf8e293..a48f11a658 100644
--- a/com.discord/smali/com/discord/app/AppFragment$c.smali
+++ b/com.discord/smali/com/discord/app/AppFragment$c.smali
@@ -72,7 +72,7 @@
aput-object p1, v2, v3
- const p1, 0x7f121083
+ const p1, 0x7f121089
invoke-virtual {v1, p1, v2}, Lcom/discord/app/AppFragment;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/app/g.smali b/com.discord/smali/com/discord/app/g.smali
index c74ec0784c..f67b4be029 100644
--- a/com.discord/smali/com/discord/app/g.smali
+++ b/com.discord/smali/com/discord/app/g.smali
@@ -252,7 +252,7 @@
.method public static synthetic c(Landroid/content/Context;Ljava/lang/CharSequence;)V
.locals 1
- const v0, 0x7f120435
+ const v0, 0x7f120434
invoke-static {p0, p1, v0}, Lcom/discord/app/g;->b(Landroid/content/Context;Ljava/lang/CharSequence;I)V
@@ -276,7 +276,7 @@
.method public static final d(Landroid/content/Context;Ljava/lang/CharSequence;)V
.locals 1
- const v0, 0x7f120435
+ const v0, 0x7f120434
invoke-static {p0, p1, v0}, Lcom/discord/app/g;->b(Landroid/content/Context;Ljava/lang/CharSequence;I)V
diff --git a/com.discord/smali/com/discord/gateway/R$drawable.smali b/com.discord/smali/com/discord/gateway/R$drawable.smali
index 24495715f8..2243e3d8b8 100644
--- a/com.discord/smali/com/discord/gateway/R$drawable.smali
+++ b/com.discord/smali/com/discord/gateway/R$drawable.smali
@@ -247,45 +247,45 @@
.field public static final googleg_standard_color_18:I = 0x7f08017a
-.field public static final ic_mtrl_chip_checked_black:I = 0x7f08028f
+.field public static final ic_mtrl_chip_checked_black:I = 0x7f080297
-.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080290
+.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080298
-.field public static final ic_mtrl_chip_close_circle:I = 0x7f080291
+.field public static final ic_mtrl_chip_close_circle:I = 0x7f080299
-.field public static final mtrl_snackbar_background:I = 0x7f0803b6
+.field public static final mtrl_snackbar_background:I = 0x7f0803c1
-.field public static final mtrl_tabs_default_indicator:I = 0x7f0803b7
+.field public static final mtrl_tabs_default_indicator:I = 0x7f0803c2
-.field public static final navigation_empty_icon:I = 0x7f0803b8
+.field public static final navigation_empty_icon:I = 0x7f0803c3
-.field public static final notification_action_background:I = 0x7f0803b9
+.field public static final notification_action_background:I = 0x7f0803c4
-.field public static final notification_bg:I = 0x7f0803ba
+.field public static final notification_bg:I = 0x7f0803c5
-.field public static final notification_bg_low:I = 0x7f0803bb
+.field public static final notification_bg_low:I = 0x7f0803c6
-.field public static final notification_bg_low_normal:I = 0x7f0803bc
+.field public static final notification_bg_low_normal:I = 0x7f0803c7
-.field public static final notification_bg_low_pressed:I = 0x7f0803bd
+.field public static final notification_bg_low_pressed:I = 0x7f0803c8
-.field public static final notification_bg_normal:I = 0x7f0803be
+.field public static final notification_bg_normal:I = 0x7f0803c9
-.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
+.field public static final notification_bg_normal_pressed:I = 0x7f0803ca
-.field public static final notification_icon_background:I = 0x7f0803c0
+.field public static final notification_icon_background:I = 0x7f0803cb
-.field public static final notification_template_icon_bg:I = 0x7f0803c1
+.field public static final notification_template_icon_bg:I = 0x7f0803cc
-.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
+.field public static final notification_template_icon_low_bg:I = 0x7f0803cd
-.field public static final notification_tile_bg:I = 0x7f0803c3
+.field public static final notification_tile_bg:I = 0x7f0803ce
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf
-.field public static final tooltip_frame_dark:I = 0x7f0803c9
+.field public static final tooltip_frame_dark:I = 0x7f0803d4
-.field public static final tooltip_frame_light:I = 0x7f0803ca
+.field public static final tooltip_frame_light:I = 0x7f0803d5
# direct methods
diff --git a/com.discord/smali/com/discord/gateway/R$string.smali b/com.discord/smali/com/discord/gateway/R$string.smali
index 8d776d955e..18656064cc 100644
--- a/com.discord/smali/com/discord/gateway/R$string.smali
+++ b/com.discord/smali/com/discord/gateway/R$string.smali
@@ -99,49 +99,49 @@
.field public static final bottom_sheet_behavior:I = 0x7f12032b
-.field public static final character_counter_content_description:I = 0x7f1203a7
+.field public static final character_counter_content_description:I = 0x7f1203a6
-.field public static final character_counter_pattern:I = 0x7f1203a8
+.field public static final character_counter_pattern:I = 0x7f1203a7
-.field public static final common_google_play_services_enable_button:I = 0x7f1203e4
+.field public static final common_google_play_services_enable_button:I = 0x7f1203e3
-.field public static final common_google_play_services_enable_text:I = 0x7f1203e5
+.field public static final common_google_play_services_enable_text:I = 0x7f1203e4
-.field public static final common_google_play_services_enable_title:I = 0x7f1203e6
+.field public static final common_google_play_services_enable_title:I = 0x7f1203e5
-.field public static final common_google_play_services_install_button:I = 0x7f1203e7
+.field public static final common_google_play_services_install_button:I = 0x7f1203e6
-.field public static final common_google_play_services_install_text:I = 0x7f1203e8
+.field public static final common_google_play_services_install_text:I = 0x7f1203e7
-.field public static final common_google_play_services_install_title:I = 0x7f1203e9
+.field public static final common_google_play_services_install_title:I = 0x7f1203e8
-.field public static final common_google_play_services_notification_channel_name:I = 0x7f1203ea
+.field public static final common_google_play_services_notification_channel_name:I = 0x7f1203e9
-.field public static final common_google_play_services_notification_ticker:I = 0x7f1203eb
+.field public static final common_google_play_services_notification_ticker:I = 0x7f1203ea
-.field public static final common_google_play_services_unknown_issue:I = 0x7f1203ec
+.field public static final common_google_play_services_unknown_issue:I = 0x7f1203eb
-.field public static final common_google_play_services_unsupported_text:I = 0x7f1203ed
+.field public static final common_google_play_services_unsupported_text:I = 0x7f1203ec
-.field public static final common_google_play_services_update_button:I = 0x7f1203ee
+.field public static final common_google_play_services_update_button:I = 0x7f1203ed
-.field public static final common_google_play_services_update_text:I = 0x7f1203ef
+.field public static final common_google_play_services_update_text:I = 0x7f1203ee
-.field public static final common_google_play_services_update_title:I = 0x7f1203f0
+.field public static final common_google_play_services_update_title:I = 0x7f1203ef
-.field public static final common_google_play_services_updating_text:I = 0x7f1203f1
+.field public static final common_google_play_services_updating_text:I = 0x7f1203f0
-.field public static final common_google_play_services_wear_update_text:I = 0x7f1203f2
+.field public static final common_google_play_services_wear_update_text:I = 0x7f1203f1
-.field public static final common_open_on_phone:I = 0x7f1203f3
+.field public static final common_open_on_phone:I = 0x7f1203f2
-.field public static final common_signin_button_text:I = 0x7f1203f4
+.field public static final common_signin_button_text:I = 0x7f1203f3
-.field public static final common_signin_button_text_long:I = 0x7f1203f5
+.field public static final common_signin_button_text_long:I = 0x7f1203f4
-.field public static final fab_transformation_scrim_behavior:I = 0x7f120568
+.field public static final fab_transformation_scrim_behavior:I = 0x7f120567
-.field public static final fab_transformation_sheet_behavior:I = 0x7f120569
+.field public static final fab_transformation_sheet_behavior:I = 0x7f120568
.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f12089a
@@ -157,9 +157,9 @@
.field public static final path_password_strike_through:I = 0x7f120c1a
-.field public static final search_menu_title:I = 0x7f120e87
+.field public static final search_menu_title:I = 0x7f120e8b
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f48
# direct methods
diff --git a/com.discord/smali/com/discord/models/domain/ModelGuild.smali b/com.discord/smali/com/discord/models/domain/ModelGuild.smali
index a7284b4b21..b640a70e03 100644
--- a/com.discord/smali/com/discord/models/domain/ModelGuild.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelGuild.smali
@@ -51,6 +51,8 @@
.field private static final FEATURE_MORE_EMOJI:Ljava/lang/Integer;
+.field private static final FEATURE_PARTNERED:Ljava/lang/Integer;
+
.field private static final FEATURE_VANITY_URL:Ljava/lang/Integer;
.field private static final FEATURE_VERIFIED_SERVER:Ljava/lang/Integer;
@@ -150,7 +152,15 @@
.field private ownerId:J
+.field private premiumSubscriptionCount:Ljava/lang/Integer;
+ .annotation build Landroidx/annotation/Nullable;
+ .end annotation
+.end field
+
.field private premiumTier:Ljava/lang/Integer;
+ .annotation build Landroidx/annotation/Nullable;
+ .end annotation
+.end field
.field private presences:Ljava/util/List;
.annotation system Ldalvik/annotation/Signature;
@@ -261,6 +271,8 @@
sput-object v0, Lcom/discord/models/domain/ModelGuild;->FEATURE_BANNER:Ljava/lang/Integer;
+ sput-object v0, Lcom/discord/models/domain/ModelGuild;->FEATURE_PARTNERED:Ljava/lang/Integer;
+
new-instance v0, Ljava/util/HashMap;
invoke-direct {v0}, Ljava/util/HashMap;->()V
@@ -359,7 +371,7 @@
.end method
.method private static computeFeature(Ljava/lang/String;)Ljava/lang/Integer;
- .locals 8
+ .locals 3
const/4 v0, 0x0
@@ -374,16 +386,6 @@
move-result v2
- const/4 v3, 0x5
-
- const/4 v4, 0x4
-
- const/4 v5, 0x3
-
- const/4 v6, 0x2
-
- const/4 v7, 0x1
-
sparse-switch v2, :sswitch_data_0
goto :goto_0
@@ -415,6 +417,19 @@
goto :goto_0
:sswitch_2
+ const-string v2, "PARTNERED"
+
+ invoke-virtual {p0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+ move-result p0
+
+ if-eqz p0, :cond_1
+
+ const/4 v1, 0x6
+
+ goto :goto_0
+
+ :sswitch_3
const-string v2, "VANITY_URL"
invoke-virtual {p0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -427,7 +442,7 @@
goto :goto_0
- :sswitch_3
+ :sswitch_4
const-string v2, "VIP_REGIONS"
invoke-virtual {p0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -440,7 +455,7 @@
goto :goto_0
- :sswitch_4
+ :sswitch_5
const-string v2, "INVITE_SPLASH"
invoke-virtual {p0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -453,7 +468,7 @@
goto :goto_0
- :sswitch_5
+ :sswitch_6
const-string v2, "VERIFIED"
invoke-virtual {p0, v2}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -466,59 +481,68 @@
:cond_1
:goto_0
- if-eqz v1, :cond_7
-
- if-eq v1, v7, :cond_6
-
- if-eq v1, v6, :cond_5
-
- if-eq v1, v5, :cond_4
-
- if-eq v1, v4, :cond_3
-
- if-eq v1, v3, :cond_2
+ packed-switch v1, :pswitch_data_0
return-object v0
- :cond_2
+ :pswitch_0
+ sget-object p0, Lcom/discord/models/domain/ModelGuild;->FEATURE_PARTNERED:Ljava/lang/Integer;
+
+ return-object p0
+
+ :pswitch_1
sget-object p0, Lcom/discord/models/domain/ModelGuild;->FEATURE_BANNER:Ljava/lang/Integer;
return-object p0
- :cond_3
+ :pswitch_2
sget-object p0, Lcom/discord/models/domain/ModelGuild;->FEATURE_MORE_EMOJI:Ljava/lang/Integer;
return-object p0
- :cond_4
+ :pswitch_3
sget-object p0, Lcom/discord/models/domain/ModelGuild;->FEATURE_VERIFIED_SERVER:Ljava/lang/Integer;
return-object p0
- :cond_5
+ :pswitch_4
sget-object p0, Lcom/discord/models/domain/ModelGuild;->FEATURE_VANITY_URL:Ljava/lang/Integer;
return-object p0
- :cond_6
+ :pswitch_5
sget-object p0, Lcom/discord/models/domain/ModelGuild;->FEATURE_INVITE_SPLASH:Ljava/lang/Integer;
return-object p0
- :cond_7
+ :pswitch_6
sget-object p0, Lcom/discord/models/domain/ModelGuild;->FEATURE_VIP_REGIONS:Ljava/lang/Integer;
return-object p0
+ nop
+
:sswitch_data_0
.sparse-switch
- -0x4839f138 -> :sswitch_5
- -0x1cfad3a3 -> :sswitch_4
- -0x4c01663 -> :sswitch_3
- 0x6b879bb -> :sswitch_2
+ -0x4839f138 -> :sswitch_6
+ -0x1cfad3a3 -> :sswitch_5
+ -0x4c01663 -> :sswitch_4
+ 0x6b879bb -> :sswitch_3
+ 0x3b10e747 -> :sswitch_2
0x69708abc -> :sswitch_1
0x7458732c -> :sswitch_0
.end sparse-switch
+
+ :pswitch_data_0
+ .packed-switch 0x0
+ :pswitch_6
+ :pswitch_5
+ :pswitch_4
+ :pswitch_3
+ :pswitch_2
+ :pswitch_1
+ :pswitch_0
+ .end packed-switch
.end method
.method private static computeShortName(Ljava/lang/String;)Ljava/lang/String;
@@ -841,17 +865,37 @@
invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getPremiumTier()Ljava/lang/Integer;
- move-result-object p0
+ move-result-object v1
goto :goto_f
:cond_12
invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuild;->getPremiumTier()Ljava/lang/Integer;
- move-result-object p0
+ move-result-object v1
:goto_f
- iput-object p0, v0, Lcom/discord/models/domain/ModelGuild;->premiumTier:Ljava/lang/Integer;
+ iput-object v1, v0, Lcom/discord/models/domain/ModelGuild;->premiumTier:Ljava/lang/Integer;
+
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getPremiumSubscriptionCount()Ljava/lang/Integer;
+
+ move-result-object v1
+
+ if-eqz v1, :cond_13
+
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getPremiumSubscriptionCount()Ljava/lang/Integer;
+
+ move-result-object p0
+
+ goto :goto_10
+
+ :cond_13
+ invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuild;->getPremiumSubscriptionCount()Ljava/lang/Integer;
+
+ move-result-object p0
+
+ :goto_10
+ iput-object p0, v0, Lcom/discord/models/domain/ModelGuild;->premiumSubscriptionCount:Ljava/lang/Integer;
return-object v0
.end method
@@ -1335,6 +1379,19 @@
goto/16 :goto_1
:sswitch_3
+ const-string v1, "premium_subscription_count"
+
+ invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
+
+ move-result v0
+
+ if-eqz v0, :cond_0
+
+ const/16 v0, 0x18
+
+ goto/16 :goto_1
+
+ :sswitch_4
const-string v1, "members"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1347,7 +1404,7 @@
goto/16 :goto_1
- :sswitch_4
+ :sswitch_5
const-string v1, "mfa_level"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1360,7 +1417,7 @@
goto/16 :goto_1
- :sswitch_5
+ :sswitch_6
const-string v1, "voice_states"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1373,7 +1430,7 @@
goto/16 :goto_1
- :sswitch_6
+ :sswitch_7
const-string v1, "roles"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1386,7 +1443,7 @@
goto/16 :goto_1
- :sswitch_7
+ :sswitch_8
const-string v1, "name"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1399,7 +1456,7 @@
goto/16 :goto_1
- :sswitch_8
+ :sswitch_9
const-string v1, "icon"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1412,7 +1469,7 @@
goto/16 :goto_1
- :sswitch_9
+ :sswitch_a
const-string v1, "id"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1425,7 +1482,7 @@
goto/16 :goto_1
- :sswitch_a
+ :sswitch_b
const-string v1, "member_count"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1438,7 +1495,7 @@
goto/16 :goto_1
- :sswitch_b
+ :sswitch_c
const-string v1, "afk_timeout"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1451,7 +1508,7 @@
goto/16 :goto_1
- :sswitch_c
+ :sswitch_d
const-string v1, "features"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1464,7 +1521,7 @@
goto/16 :goto_1
- :sswitch_d
+ :sswitch_e
const-string v1, "verification_level"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1477,7 +1534,7 @@
goto/16 :goto_1
- :sswitch_e
+ :sswitch_f
const-string v1, "unavailable"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1490,7 +1547,7 @@
goto/16 :goto_1
- :sswitch_f
+ :sswitch_10
const-string v1, "splash"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1503,7 +1560,7 @@
goto :goto_1
- :sswitch_10
+ :sswitch_11
const-string v1, "presences"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1516,7 +1573,7 @@
goto :goto_1
- :sswitch_11
+ :sswitch_12
const-string v1, "region"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1529,7 +1586,7 @@
goto :goto_1
- :sswitch_12
+ :sswitch_13
const-string v1, "system_channel_id"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1542,7 +1599,7 @@
goto :goto_1
- :sswitch_13
+ :sswitch_14
const-string v1, "premium_tier"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1555,7 +1612,7 @@
goto :goto_1
- :sswitch_14
+ :sswitch_15
const-string v1, "emojis"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1568,7 +1625,7 @@
goto :goto_1
- :sswitch_15
+ :sswitch_16
const-string v1, "banner"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1581,7 +1638,7 @@
goto :goto_1
- :sswitch_16
+ :sswitch_17
const-string v1, "afk_channel_id"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1594,7 +1651,7 @@
goto :goto_1
- :sswitch_17
+ :sswitch_18
const-string v1, "explicit_content_filter"
invoke-virtual {v0, v1}, Ljava/lang/String;->equals(Ljava/lang/Object;)Z
@@ -1629,16 +1686,20 @@
move-result-object p1
- iput-object p1, p0, Lcom/discord/models/domain/ModelGuild;->premiumTier:Ljava/lang/Integer;
+ iput-object p1, p0, Lcom/discord/models/domain/ModelGuild;->premiumSubscriptionCount:Ljava/lang/Integer;
return-void
:pswitch_1
- invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->nextStringOrNull()Ljava/lang/String;
+ invoke-virtual {p1, v2}, Lcom/discord/models/domain/Model$JsonReader;->nextInt(I)I
+
+ move-result p1
+
+ invoke-static {p1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
move-result-object p1
- iput-object p1, p0, Lcom/discord/models/domain/ModelGuild;->splash:Ljava/lang/String;
+ iput-object p1, p0, Lcom/discord/models/domain/ModelGuild;->premiumTier:Ljava/lang/Integer;
return-void
@@ -1647,11 +1708,20 @@
move-result-object p1
- iput-object p1, p0, Lcom/discord/models/domain/ModelGuild;->banner:Ljava/lang/String;
+ iput-object p1, p0, Lcom/discord/models/domain/ModelGuild;->splash:Ljava/lang/String;
return-void
:pswitch_3
+ invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->nextStringOrNull()Ljava/lang/String;
+
+ move-result-object p1
+
+ iput-object p1, p0, Lcom/discord/models/domain/ModelGuild;->banner:Ljava/lang/String;
+
+ return-void
+
+ :pswitch_4
iget v0, p0, Lcom/discord/models/domain/ModelGuild;->memberCount:I
invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextInt(I)I
@@ -1662,7 +1732,7 @@
return-void
- :pswitch_4
+ :pswitch_5
new-instance v0, Ljava/util/ArrayList;
new-instance v1, Lcom/discord/models/domain/-$$Lambda$ModelGuild$OuAC3hpIEfyOwZmnEstH-svPffw;
@@ -1679,7 +1749,7 @@
return-void
- :pswitch_5
+ :pswitch_6
invoke-virtual {p1, v3, v4}, Lcom/discord/models/domain/Model$JsonReader;->nextLong(J)J
move-result-wide v0
@@ -1692,7 +1762,7 @@
return-void
- :pswitch_6
+ :pswitch_7
invoke-virtual {p1, v3, v4}, Lcom/discord/models/domain/Model$JsonReader;->nextLong(J)J
move-result-wide v0
@@ -1705,7 +1775,7 @@
return-void
- :pswitch_7
+ :pswitch_8
iget v0, p0, Lcom/discord/models/domain/ModelGuild;->afkTimeout:I
invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextInt(I)I
@@ -1716,7 +1786,7 @@
return-void
- :pswitch_8
+ :pswitch_9
iget v0, p0, Lcom/discord/models/domain/ModelGuild;->mfaLevel:I
invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextInt(I)I
@@ -1727,7 +1797,7 @@
return-void
- :pswitch_9
+ :pswitch_a
iget-boolean v0, p0, Lcom/discord/models/domain/ModelGuild;->unavailable:Z
invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextBoolean(Z)Z
@@ -1738,7 +1808,7 @@
return-void
- :pswitch_a
+ :pswitch_b
new-instance v0, Lcom/discord/models/domain/-$$Lambda$ModelGuild$KW5HtJk2bBU0tHNWw0ImtIGfmgQ;
invoke-direct {v0, p1}, Lcom/discord/models/domain/-$$Lambda$ModelGuild$KW5HtJk2bBU0tHNWw0ImtIGfmgQ;->(Lcom/discord/models/domain/Model$JsonReader;)V
@@ -1751,7 +1821,7 @@
return-void
- :pswitch_b
+ :pswitch_c
new-instance v0, Lcom/discord/models/domain/-$$Lambda$ModelGuild$Qsbza12RuygC8RvJQRPXHFCfrHg;
invoke-direct {v0, p1}, Lcom/discord/models/domain/-$$Lambda$ModelGuild$Qsbza12RuygC8RvJQRPXHFCfrHg;->(Lcom/discord/models/domain/Model$JsonReader;)V
@@ -1766,7 +1836,7 @@
return-void
- :pswitch_c
+ :pswitch_d
new-instance v0, Lcom/discord/models/domain/-$$Lambda$ModelGuild$pAnonXadxTjVgELafELkwlqcK3Q;
invoke-direct {v0, p1}, Lcom/discord/models/domain/-$$Lambda$ModelGuild$pAnonXadxTjVgELafELkwlqcK3Q;->(Lcom/discord/models/domain/Model$JsonReader;)V
@@ -1779,7 +1849,7 @@
return-void
- :pswitch_d
+ :pswitch_e
new-instance v0, Lcom/discord/models/domain/-$$Lambda$ModelGuild$jpvW6M4tOHNKpM4sRqDhgm9a-pg;
invoke-direct {v0, p1}, Lcom/discord/models/domain/-$$Lambda$ModelGuild$jpvW6M4tOHNKpM4sRqDhgm9a-pg;->(Lcom/discord/models/domain/Model$JsonReader;)V
@@ -1792,7 +1862,7 @@
return-void
- :pswitch_e
+ :pswitch_f
invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->nextIntOrNull()Ljava/lang/Integer;
move-result-object p1
@@ -1801,7 +1871,7 @@
return-void
- :pswitch_f
+ :pswitch_10
invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->nextIntOrNull()Ljava/lang/Integer;
move-result-object p1
@@ -1810,7 +1880,7 @@
return-void
- :pswitch_10
+ :pswitch_11
iget-object v0, p0, Lcom/discord/models/domain/ModelGuild;->icon:Ljava/lang/String;
invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextString(Ljava/lang/String;)Ljava/lang/String;
@@ -1821,7 +1891,7 @@
return-void
- :pswitch_11
+ :pswitch_12
iget-wide v0, p0, Lcom/discord/models/domain/ModelGuild;->ownerId:J
invoke-virtual {p1, v0, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextLong(J)J
@@ -1832,7 +1902,7 @@
return-void
- :pswitch_12
+ :pswitch_13
iget-object v0, p0, Lcom/discord/models/domain/ModelGuild;->region:Ljava/lang/String;
invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextString(Ljava/lang/String;)Ljava/lang/String;
@@ -1843,7 +1913,7 @@
return-void
- :pswitch_13
+ :pswitch_14
iget-wide v0, p0, Lcom/discord/models/domain/ModelGuild;->id:J
invoke-virtual {p1, v0, v1}, Lcom/discord/models/domain/Model$JsonReader;->nextLong(J)J
@@ -1854,7 +1924,7 @@
return-void
- :pswitch_14
+ :pswitch_15
invoke-virtual {p1}, Lcom/discord/models/domain/Model$JsonReader;->nextIntOrNull()Ljava/lang/Integer;
move-result-object p1
@@ -1863,7 +1933,7 @@
return-void
- :pswitch_15
+ :pswitch_16
const-string v0, ""
invoke-virtual {p1, v0}, Lcom/discord/models/domain/Model$JsonReader;->nextString(Ljava/lang/String;)Ljava/lang/String;
@@ -1874,7 +1944,7 @@
return-void
- :pswitch_16
+ :pswitch_17
new-instance v0, Lcom/discord/models/domain/-$$Lambda$ModelGuild$i_6cUeymrhpBQ_vl7i5gRwJUrXY;
invoke-direct {v0, p1}, Lcom/discord/models/domain/-$$Lambda$ModelGuild$i_6cUeymrhpBQ_vl7i5gRwJUrXY;->(Lcom/discord/models/domain/Model$JsonReader;)V
@@ -1887,7 +1957,7 @@
return-void
- :pswitch_17
+ :pswitch_18
new-instance v0, Lcom/discord/models/domain/-$$Lambda$ModelGuild$TuwGhFjOyv513QkkXXPpGAXuf3A;
invoke-direct {v0, p1}, Lcom/discord/models/domain/-$$Lambda$ModelGuild$TuwGhFjOyv513QkkXXPpGAXuf3A;->(Lcom/discord/models/domain/Model$JsonReader;)V
@@ -1900,31 +1970,30 @@
return-void
- nop
-
:sswitch_data_0
.sparse-switch
- -0x65a25c97 -> :sswitch_17
- -0x5db95d30 -> :sswitch_16
- -0x533a80d4 -> :sswitch_15
- -0x4d727713 -> :sswitch_14
- -0x4a4d6536 -> :sswitch_13
- -0x4191ce19 -> :sswitch_12
- -0x37b7d90c -> :sswitch_11
- -0x36f3fd28 -> :sswitch_10
- -0x3565d599 -> :sswitch_f
- -0x27aa27b0 -> :sswitch_e
- -0x1e2c6ba0 -> :sswitch_d
- -0x11531bc3 -> :sswitch_c
- -0x93bd8f8 -> :sswitch_b
- -0x3899cd6 -> :sswitch_a
- 0xd1b -> :sswitch_9
- 0x313c79 -> :sswitch_8
- 0x337a8b -> :sswitch_7
- 0x67a8ebd -> :sswitch_6
- 0xbb68daf -> :sswitch_5
- 0x3855966d -> :sswitch_4
- 0x388ec919 -> :sswitch_3
+ -0x65a25c97 -> :sswitch_18
+ -0x5db95d30 -> :sswitch_17
+ -0x533a80d4 -> :sswitch_16
+ -0x4d727713 -> :sswitch_15
+ -0x4a4d6536 -> :sswitch_14
+ -0x4191ce19 -> :sswitch_13
+ -0x37b7d90c -> :sswitch_12
+ -0x36f3fd28 -> :sswitch_11
+ -0x3565d599 -> :sswitch_10
+ -0x27aa27b0 -> :sswitch_f
+ -0x1e2c6ba0 -> :sswitch_e
+ -0x11531bc3 -> :sswitch_d
+ -0x93bd8f8 -> :sswitch_c
+ -0x3899cd6 -> :sswitch_b
+ 0xd1b -> :sswitch_a
+ 0x313c79 -> :sswitch_9
+ 0x337a8b -> :sswitch_8
+ 0x67a8ebd -> :sswitch_7
+ 0xbb68daf -> :sswitch_6
+ 0x3855966d -> :sswitch_5
+ 0x388ec919 -> :sswitch_4
+ 0x3d7e9655 -> :sswitch_3
0x47f6cf32 -> :sswitch_2
0x556423d0 -> :sswitch_1
0x63219e27 -> :sswitch_0
@@ -1932,6 +2001,7 @@
:pswitch_data_0
.packed-switch 0x0
+ :pswitch_18
:pswitch_17
:pswitch_16
:pswitch_15
@@ -2646,6 +2716,31 @@
return v2
:cond_29
+ invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuild;->getPremiumSubscriptionCount()Ljava/lang/Integer;
+
+ move-result-object v1
+
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getPremiumSubscriptionCount()Ljava/lang/Integer;
+
+ move-result-object v3
+
+ if-nez v1, :cond_2a
+
+ if-eqz v3, :cond_2b
+
+ goto :goto_e
+
+ :cond_2a
+ invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+ move-result v1
+
+ if-nez v1, :cond_2b
+
+ :goto_e
+ return v2
+
+ :cond_2b
invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuild;->getShortName()Ljava/lang/String;
move-result-object v1
@@ -2654,23 +2749,23 @@
move-result-object p1
- if-nez v1, :cond_2a
+ if-nez v1, :cond_2c
- if-eqz p1, :cond_2b
+ if-eqz p1, :cond_2d
- goto :goto_e
+ goto :goto_f
- :cond_2a
+ :cond_2c
invoke-virtual {v1, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
move-result p1
- if-nez p1, :cond_2b
+ if-nez p1, :cond_2d
- :goto_e
+ :goto_f
return v2
- :cond_2b
+ :cond_2d
return v0
.end method
@@ -3024,6 +3119,14 @@
return-wide v0
.end method
+.method public getPremiumSubscriptionCount()Ljava/lang/Integer;
+ .locals 1
+
+ iget-object v0, p0, Lcom/discord/models/domain/ModelGuild;->premiumSubscriptionCount:Ljava/lang/Integer;
+
+ return-object v0
+.end method
+
.method public getPremiumTier()Ljava/lang/Integer;
.locals 1
@@ -3635,7 +3738,7 @@
:goto_e
add-int/2addr v0, v2
- invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuild;->getShortName()Ljava/lang/String;
+ invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuild;->getPremiumSubscriptionCount()Ljava/lang/Integer;
move-result-object v2
@@ -3643,14 +3746,34 @@
if-nez v2, :cond_f
+ const/16 v2, 0x2b
+
goto :goto_f
:cond_f
invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
- move-result v1
+ move-result v2
:goto_f
+ add-int/2addr v0, v2
+
+ invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuild;->getShortName()Ljava/lang/String;
+
+ move-result-object v2
+
+ mul-int/lit8 v0, v0, 0x3b
+
+ if-nez v2, :cond_10
+
+ goto :goto_10
+
+ :cond_10
+ invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+ move-result v1
+
+ :goto_10
add-int/2addr v0, v1
return v0
@@ -3694,6 +3817,31 @@
return p1
.end method
+.method public isPartneredServer()Z
+ .locals 2
+
+ iget-object v0, p0, Lcom/discord/models/domain/ModelGuild;->features:Ljava/util/List;
+
+ if-eqz v0, :cond_0
+
+ sget-object v1, Lcom/discord/models/domain/ModelGuild;->FEATURE_PARTNERED:Ljava/lang/Integer;
+
+ invoke-interface {v0, v1}, Ljava/util/List;->contains(Ljava/lang/Object;)Z
+
+ move-result v0
+
+ if-eqz v0, :cond_0
+
+ const/4 v0, 0x1
+
+ return v0
+
+ :cond_0
+ const/4 v0, 0x0
+
+ return v0
+.end method
+
.method public isUnavailable()Z
.locals 1
@@ -4007,6 +4155,16 @@
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+ const-string v1, ", premiumSubscriptionCount="
+
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+ invoke-virtual {p0}, Lcom/discord/models/domain/ModelGuild;->getPremiumSubscriptionCount()Ljava/lang/Integer;
+
+ move-result-object v1
+
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
const-string v1, ", shortName="
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/com/discord/models/domain/ModelMessage.smali b/com.discord/smali/com/discord/models/domain/ModelMessage.smali
index af051ad3b1..f57d28d571 100644
--- a/com.discord/smali/com/discord/models/domain/ModelMessage.smali
+++ b/com.discord/smali/com/discord/models/domain/ModelMessage.smali
@@ -85,6 +85,14 @@
.field public static final TYPE_USER_JOIN:I = 0x7
+.field public static final TYPE_USER_PREMIUM_GUILD_SUBSCRIPTION:I = 0x8
+
+.field public static final TYPE_USER_PREMIUM_GUILD_SUBSCRIPTION_TIER_1:I = 0x9
+
+.field public static final TYPE_USER_PREMIUM_GUILD_SUBSCRIPTION_TIER_2:I = 0xa
+
+.field public static final TYPE_USER_PREMIUM_GUILD_SUBSCRIPTION_TIER_3:I = 0xb
+
.field private static final sortByIds:Ljava/util/Comparator;
.annotation system Ldalvik/annotation/Signature;
value = {
diff --git a/com.discord/smali/com/discord/restapi/R$drawable.smali b/com.discord/smali/com/discord/restapi/R$drawable.smali
index 5f1c146fdf..720d67ad07 100644
--- a/com.discord/smali/com/discord/restapi/R$drawable.smali
+++ b/com.discord/smali/com/discord/restapi/R$drawable.smali
@@ -247,45 +247,45 @@
.field public static final googleg_standard_color_18:I = 0x7f08017a
-.field public static final ic_mtrl_chip_checked_black:I = 0x7f08028f
+.field public static final ic_mtrl_chip_checked_black:I = 0x7f080297
-.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080290
+.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080298
-.field public static final ic_mtrl_chip_close_circle:I = 0x7f080291
+.field public static final ic_mtrl_chip_close_circle:I = 0x7f080299
-.field public static final mtrl_snackbar_background:I = 0x7f0803b6
+.field public static final mtrl_snackbar_background:I = 0x7f0803c1
-.field public static final mtrl_tabs_default_indicator:I = 0x7f0803b7
+.field public static final mtrl_tabs_default_indicator:I = 0x7f0803c2
-.field public static final navigation_empty_icon:I = 0x7f0803b8
+.field public static final navigation_empty_icon:I = 0x7f0803c3
-.field public static final notification_action_background:I = 0x7f0803b9
+.field public static final notification_action_background:I = 0x7f0803c4
-.field public static final notification_bg:I = 0x7f0803ba
+.field public static final notification_bg:I = 0x7f0803c5
-.field public static final notification_bg_low:I = 0x7f0803bb
+.field public static final notification_bg_low:I = 0x7f0803c6
-.field public static final notification_bg_low_normal:I = 0x7f0803bc
+.field public static final notification_bg_low_normal:I = 0x7f0803c7
-.field public static final notification_bg_low_pressed:I = 0x7f0803bd
+.field public static final notification_bg_low_pressed:I = 0x7f0803c8
-.field public static final notification_bg_normal:I = 0x7f0803be
+.field public static final notification_bg_normal:I = 0x7f0803c9
-.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
+.field public static final notification_bg_normal_pressed:I = 0x7f0803ca
-.field public static final notification_icon_background:I = 0x7f0803c0
+.field public static final notification_icon_background:I = 0x7f0803cb
-.field public static final notification_template_icon_bg:I = 0x7f0803c1
+.field public static final notification_template_icon_bg:I = 0x7f0803cc
-.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
+.field public static final notification_template_icon_low_bg:I = 0x7f0803cd
-.field public static final notification_tile_bg:I = 0x7f0803c3
+.field public static final notification_tile_bg:I = 0x7f0803ce
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf
-.field public static final tooltip_frame_dark:I = 0x7f0803c9
+.field public static final tooltip_frame_dark:I = 0x7f0803d4
-.field public static final tooltip_frame_light:I = 0x7f0803ca
+.field public static final tooltip_frame_light:I = 0x7f0803d5
# direct methods
diff --git a/com.discord/smali/com/discord/restapi/R$string.smali b/com.discord/smali/com/discord/restapi/R$string.smali
index bd74eb7567..eef70d7f46 100644
--- a/com.discord/smali/com/discord/restapi/R$string.smali
+++ b/com.discord/smali/com/discord/restapi/R$string.smali
@@ -97,49 +97,49 @@
.field public static final bottom_sheet_behavior:I = 0x7f12032b
-.field public static final character_counter_content_description:I = 0x7f1203a7
+.field public static final character_counter_content_description:I = 0x7f1203a6
-.field public static final character_counter_pattern:I = 0x7f1203a8
+.field public static final character_counter_pattern:I = 0x7f1203a7
-.field public static final common_google_play_services_enable_button:I = 0x7f1203e4
+.field public static final common_google_play_services_enable_button:I = 0x7f1203e3
-.field public static final common_google_play_services_enable_text:I = 0x7f1203e5
+.field public static final common_google_play_services_enable_text:I = 0x7f1203e4
-.field public static final common_google_play_services_enable_title:I = 0x7f1203e6
+.field public static final common_google_play_services_enable_title:I = 0x7f1203e5
-.field public static final common_google_play_services_install_button:I = 0x7f1203e7
+.field public static final common_google_play_services_install_button:I = 0x7f1203e6
-.field public static final common_google_play_services_install_text:I = 0x7f1203e8
+.field public static final common_google_play_services_install_text:I = 0x7f1203e7
-.field public static final common_google_play_services_install_title:I = 0x7f1203e9
+.field public static final common_google_play_services_install_title:I = 0x7f1203e8
-.field public static final common_google_play_services_notification_channel_name:I = 0x7f1203ea
+.field public static final common_google_play_services_notification_channel_name:I = 0x7f1203e9
-.field public static final common_google_play_services_notification_ticker:I = 0x7f1203eb
+.field public static final common_google_play_services_notification_ticker:I = 0x7f1203ea
-.field public static final common_google_play_services_unknown_issue:I = 0x7f1203ec
+.field public static final common_google_play_services_unknown_issue:I = 0x7f1203eb
-.field public static final common_google_play_services_unsupported_text:I = 0x7f1203ed
+.field public static final common_google_play_services_unsupported_text:I = 0x7f1203ec
-.field public static final common_google_play_services_update_button:I = 0x7f1203ee
+.field public static final common_google_play_services_update_button:I = 0x7f1203ed
-.field public static final common_google_play_services_update_text:I = 0x7f1203ef
+.field public static final common_google_play_services_update_text:I = 0x7f1203ee
-.field public static final common_google_play_services_update_title:I = 0x7f1203f0
+.field public static final common_google_play_services_update_title:I = 0x7f1203ef
-.field public static final common_google_play_services_updating_text:I = 0x7f1203f1
+.field public static final common_google_play_services_updating_text:I = 0x7f1203f0
-.field public static final common_google_play_services_wear_update_text:I = 0x7f1203f2
+.field public static final common_google_play_services_wear_update_text:I = 0x7f1203f1
-.field public static final common_open_on_phone:I = 0x7f1203f3
+.field public static final common_open_on_phone:I = 0x7f1203f2
-.field public static final common_signin_button_text:I = 0x7f1203f4
+.field public static final common_signin_button_text:I = 0x7f1203f3
-.field public static final common_signin_button_text_long:I = 0x7f1203f5
+.field public static final common_signin_button_text_long:I = 0x7f1203f4
-.field public static final fab_transformation_scrim_behavior:I = 0x7f120568
+.field public static final fab_transformation_scrim_behavior:I = 0x7f120567
-.field public static final fab_transformation_sheet_behavior:I = 0x7f120569
+.field public static final fab_transformation_sheet_behavior:I = 0x7f120568
.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f12089a
@@ -155,9 +155,9 @@
.field public static final path_password_strike_through:I = 0x7f120c1a
-.field public static final search_menu_title:I = 0x7f120e87
+.field public static final search_menu_title:I = 0x7f120e8b
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f48
# direct methods
diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$makeGroup$textResolver$1.smali b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$makeGroup$textResolver$1.smali
index c39764c81f..c5f12ad1fe 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$makeGroup$textResolver$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$makeGroup$textResolver$1.smali
@@ -111,7 +111,7 @@
throw p1
:cond_1
- const v0, 0x7f120f49
+ const v0, 0x7f120f4e
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -120,7 +120,7 @@
goto :goto_0
:cond_2
- const v0, 0x7f120f4a
+ const v0, 0x7f120f4f
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected.smali
index 8b5916dc4b..d010f42b95 100644
--- a/com.discord/smali/com/discord/stores/StoreChannelsSelected.smali
+++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected.smali
@@ -1126,7 +1126,7 @@
.end method
.method public final set(JJI)V
- .locals 9
+ .locals 11
const/4 v0, 0x0
@@ -1138,47 +1138,45 @@
invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
+ invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
- move-result-object v0
-
- sget-object v1, Lcom/discord/app/h;->ts:Lcom/discord/app/h;
-
- new-instance v1, Lcom/discord/stores/StoreChannelsSelected$set$1;
-
- move-object v2, v1
-
- move-object v3, p0
-
- move v4, p5
-
- move-wide v5, p1
-
- move-wide v7, p3
-
- invoke-direct/range {v2 .. v8}, Lcom/discord/stores/StoreChannelsSelected$set$1;->(Lcom/discord/stores/StoreChannelsSelected;IJJ)V
-
- move-object v2, v1
-
- check-cast v2, Lkotlin/jvm/functions/Function1;
+ move-result-object v2
invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
move-result-object v3
+ new-instance v0, Lcom/discord/stores/StoreChannelsSelected$set$1;
+
+ move-object v4, v0
+
+ move-object v5, p0
+
+ move/from16 v6, p5
+
+ move-wide v7, p1
+
+ move-wide v9, p3
+
+ invoke-direct/range {v4 .. v10}, Lcom/discord/stores/StoreChannelsSelected$set$1;->(Lcom/discord/stores/StoreChannelsSelected;IJJ)V
+
+ move-object v8, v0
+
+ check-cast v8, Lkotlin/jvm/functions/Function1;
+
const/4 v4, 0x0
const/4 v5, 0x0
const/4 v6, 0x0
- const/16 v7, 0x3c
+ const/4 v7, 0x0
- invoke-static/range {v2 .. v7}, Lcom/discord/app/h;->a(Lkotlin/jvm/functions/Function1;Ljava/lang/Class;Lrx/functions/Action1;Lkotlin/jvm/functions/Function1;Landroid/content/Context;I)Lrx/Observable$Transformer;
+ const/16 v9, 0x1e
- move-result-object p1
+ const/4 v10, 0x0
- invoke-virtual {v0, p1}, Lrx/Observable;->a(Lrx/Observable$Transformer;)Lrx/Observable;
+ invoke-static/range {v2 .. v10}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V
return-void
.end method
diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali
index b6bad61251..f7ff49f4aa 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, 0x383
+ const/16 v0, 0x384
iput v0, p0, Lcom/discord/stores/StoreClientVersion;->clientVersion:I
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali
index 6be50f4d98..2dc8096838 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali
@@ -57,7 +57,7 @@
if-eqz p2, :cond_0
- const p1, 0x7f120424
+ const p1, 0x7f120423
goto :goto_0
@@ -70,7 +70,7 @@
if-eqz p2, :cond_1
- const p1, 0x7f120421
+ const p1, 0x7f120420
goto :goto_0
@@ -83,7 +83,7 @@
if-eqz p2, :cond_2
- const p1, 0x7f120420
+ const p1, 0x7f12041f
goto :goto_0
@@ -96,7 +96,7 @@
if-eqz p2, :cond_3
- const p1, 0x7f120423
+ const p1, 0x7f120422
goto :goto_0
@@ -109,7 +109,7 @@
if-eqz p2, :cond_4
- const p1, 0x7f120428
+ const p1, 0x7f120427
goto :goto_0
@@ -122,7 +122,7 @@
if-eqz p2, :cond_5
- const p1, 0x7f120427
+ const p1, 0x7f120426
goto :goto_0
@@ -135,7 +135,7 @@
if-eqz p2, :cond_6
- const p1, 0x7f120422
+ const p1, 0x7f120421
goto :goto_0
@@ -148,7 +148,7 @@
if-eqz p1, :cond_7
- const p1, 0x7f120426
+ const p1, 0x7f120425
:goto_0
iput p1, p0, Lcom/discord/stores/StoreMediaNotification$NotificationData;->stateString:I
diff --git a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali b/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali
index 89a0210c68..3883de2cdb 100644
--- a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali
+++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali
@@ -71,7 +71,7 @@
iget-object p1, p0, Lcom/discord/stores/StoreMediaNotification$init$3;->$context:Landroid/content/Context;
- const v0, 0x7f121136
+ const v0, 0x7f12113c
invoke-static {p1, v0}, Lcom/discord/app/g;->c(Landroid/content/Context;I)V
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$init$1$1.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$init$1$1.smali
new file mode 100644
index 0000000000..975355e3a7
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$init$1$1.smali
@@ -0,0 +1,99 @@
+.class final Lcom/discord/stores/StoreMessageAck$init$1$1;
+.super Ljava/lang/Object;
+.source "StoreMessageAck.kt"
+
+# interfaces
+.implements Lrx/functions/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/stores/StoreMessageAck$init$1;->call(Ljava/lang/Long;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x18
+ name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+ value = {
+ "",
+ "Ljava/lang/Object;",
+ "Lrx/functions/b<",
+ "Lcom/discord/stores/StoreChat$InteractionState;",
+ "Ljava/lang/Boolean;",
+ ">;"
+ }
+.end annotation
+
+
+# instance fields
+.field final synthetic $selectedChannelId:Ljava/lang/Long;
+
+
+# direct methods
+.method constructor (Ljava/lang/Long;)V
+ .locals 0
+
+ iput-object p1, p0, Lcom/discord/stores/StoreMessageAck$init$1$1;->$selectedChannelId:Ljava/lang/Long;
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public final synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+ .locals 0
+
+ check-cast p1, Lcom/discord/stores/StoreChat$InteractionState;
+
+ invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessageAck$init$1$1;->call(Lcom/discord/stores/StoreChat$InteractionState;)Z
+
+ move-result p1
+
+ invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+ move-result-object p1
+
+ return-object p1
+.end method
+
+.method public final call(Lcom/discord/stores/StoreChat$InteractionState;)Z
+ .locals 4
+
+ invoke-virtual {p1}, Lcom/discord/stores/StoreChat$InteractionState;->getChannelId()J
+
+ move-result-wide v0
+
+ iget-object p1, p0, Lcom/discord/stores/StoreMessageAck$init$1$1;->$selectedChannelId:Ljava/lang/Long;
+
+ if-nez p1, :cond_0
+
+ goto :goto_0
+
+ :cond_0
+ invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
+
+ move-result-wide v2
+
+ cmp-long p1, v0, v2
+
+ if-nez p1, :cond_1
+
+ const/4 p1, 0x1
+
+ return p1
+
+ :cond_1
+ :goto_0
+ const/4 p1, 0x0
+
+ return p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$init$1$2.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$init$1$2.smali
new file mode 100644
index 0000000000..1a81afba5e
--- /dev/null
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$init$1$2.smali
@@ -0,0 +1,123 @@
+.class final Lcom/discord/stores/StoreMessageAck$init$1$2;
+.super Ljava/lang/Object;
+.source "StoreMessageAck.kt"
+
+# interfaces
+.implements Lrx/functions/Func2;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/stores/StoreMessageAck$init$1;->call(Ljava/lang/Long;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x18
+ name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+ value = {
+ "",
+ "Ljava/lang/Object;",
+ "Lrx/functions/Func2<",
+ "TT1;TT2;TR;>;"
+ }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/stores/StoreMessageAck$init$1$2;
+
+
+# direct methods
+.method static constructor ()V
+ .locals 1
+
+ new-instance v0, Lcom/discord/stores/StoreMessageAck$init$1$2;
+
+ invoke-direct {v0}, Lcom/discord/stores/StoreMessageAck$init$1$2;->()V
+
+ sput-object v0, Lcom/discord/stores/StoreMessageAck$init$1$2;->INSTANCE:Lcom/discord/stores/StoreMessageAck$init$1$2;
+
+ return-void
+.end method
+
+.method constructor ()V
+ .locals 0
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public final call(Ljava/util/Set;Lcom/discord/stores/StoreChat$InteractionState;)J
+ .locals 2
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Ljava/util/Set<",
+ "Ljava/lang/Long;",
+ ">;",
+ "Lcom/discord/stores/StoreChat$InteractionState;",
+ ")J"
+ }
+ .end annotation
+
+ invoke-virtual {p2}, Lcom/discord/stores/StoreChat$InteractionState;->isAtBottomIgnoringTouch()Z
+
+ move-result v0
+
+ if-eqz v0, :cond_0
+
+ invoke-virtual {p2}, Lcom/discord/stores/StoreChat$InteractionState;->getChannelId()J
+
+ move-result-wide v0
+
+ invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object v0
+
+ invoke-interface {p1, v0}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
+
+ move-result p1
+
+ if-nez p1, :cond_0
+
+ invoke-virtual {p2}, Lcom/discord/stores/StoreChat$InteractionState;->getChannelId()J
+
+ move-result-wide p1
+
+ return-wide p1
+
+ :cond_0
+ const-wide/16 p1, 0x0
+
+ return-wide p1
+.end method
+
+.method public final synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ .locals 0
+
+ check-cast p1, Ljava/util/Set;
+
+ check-cast p2, Lcom/discord/stores/StoreChat$InteractionState;
+
+ invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreMessageAck$init$1$2;->call(Ljava/util/Set;Lcom/discord/stores/StoreChat$InteractionState;)J
+
+ move-result-wide p1
+
+ invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object p1
+
+ return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck$init$1.smali b/com.discord/smali/com/discord/stores/StoreMessageAck$init$1.smali
index 087da4cda2..371a8182ab 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck$init$1.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck$init$1.smali
@@ -3,7 +3,7 @@
.source "StoreMessageAck.kt"
# interfaces
-.implements Lrx/functions/Func2;
+.implements Lrx/functions/b;
# annotations
@@ -18,40 +18,30 @@
.annotation system Ldalvik/annotation/Signature;
value = {
- "",
"Ljava/lang/Object;",
- "Lrx/functions/Func2<",
- "TT1;TT2;TR;>;"
+ "Lrx/functions/b<",
+ "TT;",
+ "Lrx/Observable<",
+ "+TR;>;>;"
}
.end annotation
-# static fields
-.field public static final INSTANCE:Lcom/discord/stores/StoreMessageAck$init$1;
+# instance fields
+.field final synthetic this$0:Lcom/discord/stores/StoreMessageAck;
# direct methods
-.method static constructor ()V
- .locals 1
-
- new-instance v0, Lcom/discord/stores/StoreMessageAck$init$1;
-
- invoke-direct {v0}, Lcom/discord/stores/StoreMessageAck$init$1;->()V
-
- sput-object v0, Lcom/discord/stores/StoreMessageAck$init$1;->INSTANCE:Lcom/discord/stores/StoreMessageAck$init$1;
-
- return-void
-.end method
-
-.method constructor ()V
+.method constructor (Lcom/discord/stores/StoreMessageAck;)V
.locals 0
+ iput-object p1, p0, Lcom/discord/stores/StoreMessageAck$init$1;->this$0:Lcom/discord/stores/StoreMessageAck;
+
invoke-direct {p0}, Ljava/lang/Object;->()V
return-void
@@ -59,82 +49,78 @@
# virtual methods
-.method public final call(Ljava/util/Map;Lcom/discord/stores/StoreChat$InteractionState;)J
- .locals 4
- .annotation system Ldalvik/annotation/Signature;
- value = {
- "(",
- "Ljava/util/Map<",
- "Ljava/lang/Long;",
- "Ljava/lang/Long;",
- ">;",
- "Lcom/discord/stores/StoreChat$InteractionState;",
- ")J"
- }
- .end annotation
-
- invoke-virtual {p2}, Lcom/discord/stores/StoreChat$InteractionState;->isAtBottomIgnoringTouch()Z
-
- move-result v0
-
- if-eqz v0, :cond_1
-
- invoke-virtual {p2}, Lcom/discord/stores/StoreChat$InteractionState;->getChannelId()J
-
- move-result-wide v0
-
- invoke-static {v0, v1}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
-
- move-result-object v0
-
- invoke-interface {p1, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
-
- move-result-object p1
+.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+ .locals 0
check-cast p1, Ljava/lang/Long;
- invoke-virtual {p2}, Lcom/discord/stores/StoreChat$InteractionState;->getLastMessageId()J
-
- move-result-wide v0
-
- if-nez p1, :cond_0
-
- goto :goto_0
-
- :cond_0
- invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
-
- move-result-wide v2
-
- cmp-long p1, v2, v0
-
- if-nez p1, :cond_1
-
- invoke-virtual {p2}, Lcom/discord/stores/StoreChat$InteractionState;->getChannelId()J
-
- move-result-wide p1
-
- return-wide p1
-
- :cond_1
- :goto_0
- const-wide/16 p1, 0x0
-
- return-wide p1
-.end method
-
-.method public final synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- .locals 0
-
- check-cast p1, Ljava/util/Map;
-
- check-cast p2, Lcom/discord/stores/StoreChat$InteractionState;
-
- invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreMessageAck$init$1;->call(Ljava/util/Map;Lcom/discord/stores/StoreChat$InteractionState;)J
-
- move-result-wide p1
-
- invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+ invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessageAck$init$1;->call(Ljava/lang/Long;)Lrx/Observable;
+
+ move-result-object p1
+
+ return-object p1
+.end method
+
+.method public final call(Ljava/lang/Long;)Lrx/Observable;
+ .locals 4
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Ljava/lang/Long;",
+ ")",
+ "Lrx/Observable<",
+ "Ljava/lang/Long;",
+ ">;"
+ }
+ .end annotation
+
+ iget-object v0, p0, Lcom/discord/stores/StoreMessageAck$init$1;->this$0:Lcom/discord/stores/StoreMessageAck;
+
+ invoke-static {v0}, Lcom/discord/stores/StoreMessageAck;->access$getStream$p(Lcom/discord/stores/StoreMessageAck;)Lcom/discord/stores/StoreStream;
+
+ move-result-object v0
+
+ iget-object v0, v0, Lcom/discord/stores/StoreStream;->messages:Lcom/discord/stores/StoreMessages;
+
+ invoke-virtual {v0}, Lcom/discord/stores/StoreMessages;->getAllDetached()Lrx/Observable;
+
+ move-result-object v0
+
+ iget-object v1, p0, Lcom/discord/stores/StoreMessageAck$init$1;->this$0:Lcom/discord/stores/StoreMessageAck;
+
+ invoke-static {v1}, Lcom/discord/stores/StoreMessageAck;->access$getStream$p(Lcom/discord/stores/StoreMessageAck;)Lcom/discord/stores/StoreStream;
+
+ move-result-object v1
+
+ iget-object v1, v1, Lcom/discord/stores/StoreStream;->chat:Lcom/discord/stores/StoreChat;
+
+ invoke-virtual {v1}, Lcom/discord/stores/StoreChat;->getInteractionState()Lrx/Observable;
+
+ move-result-object v1
+
+ new-instance v2, Lcom/discord/stores/StoreMessageAck$init$1$1;
+
+ invoke-direct {v2, p1}, Lcom/discord/stores/StoreMessageAck$init$1$1;->(Ljava/lang/Long;)V
+
+ check-cast v2, Lrx/functions/b;
+
+ invoke-virtual {v1, v2}, Lrx/Observable;->b(Lrx/functions/b;)Lrx/Observable;
+
+ move-result-object p1
+
+ sget-object v1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+ const-wide/16 v2, 0x1f4
+
+ invoke-virtual {p1, v2, v3, v1}, Lrx/Observable;->i(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+
+ move-result-object p1
+
+ sget-object v1, Lcom/discord/stores/StoreMessageAck$init$1$2;->INSTANCE:Lcom/discord/stores/StoreMessageAck$init$1$2;
+
+ check-cast v1, Lrx/functions/Func2;
+
+ invoke-static {v0, p1, v1}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;)Lrx/Observable;
move-result-object p1
diff --git a/com.discord/smali/com/discord/stores/StoreMessageAck.smali b/com.discord/smali/com/discord/stores/StoreMessageAck.smali
index eef2c939d6..1c335a2a1d 100644
--- a/com.discord/smali/com/discord/stores/StoreMessageAck.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessageAck.smali
@@ -903,7 +903,7 @@
.end method
.method protected final init(Landroid/content/Context;)V
- .locals 6
+ .locals 3
const-string v0, "context"
@@ -911,45 +911,29 @@
invoke-super {p0, p1}, Lcom/discord/stores/Store;->init(Landroid/content/Context;)V
- iget-object p1, p0, Lcom/discord/stores/StoreMessageAck;->stream:Lcom/discord/stores/StoreStream;
-
- iget-object p1, p1, Lcom/discord/stores/StoreStream;->messagesMostRecent:Lcom/discord/stores/StoreMessagesMostRecent;
-
- invoke-virtual {p1}, Lcom/discord/stores/StoreMessagesMostRecent;->get()Lrx/Observable;
-
- move-result-object v0
-
- iget-object p1, p0, Lcom/discord/stores/StoreMessageAck;->stream:Lcom/discord/stores/StoreStream;
-
- iget-object p1, p1, Lcom/discord/stores/StoreStream;->chat:Lcom/discord/stores/StoreChat;
-
- invoke-virtual {p1}, Lcom/discord/stores/StoreChat;->getInteractionState()Lrx/Observable;
+ invoke-static {}, Lcom/discord/stores/StoreStream;->getChannelsSelected()Lcom/discord/stores/StoreChannelsSelected;
move-result-object p1
- sget-object v1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
- const-wide/16 v2, 0xc8
-
- invoke-virtual {p1, v2, v3, v1}, Lrx/Observable;->i(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
-
- move-result-object v1
-
- sget-object p1, Lcom/discord/stores/StoreMessageAck$init$1;->INSTANCE:Lcom/discord/stores/StoreMessageAck$init$1;
-
- move-object v2, p1
-
- check-cast v2, Lrx/functions/Func2;
-
- sget-object v5, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
- const-wide/16 v3, 0xfa
-
- invoke-static/range {v0 .. v5}, Lcom/discord/utilities/rx/ObservableWithLeadingEdgeThrottle;->combineLatest(Lrx/Observable;Lrx/Observable;Lrx/functions/Func2;JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+ invoke-virtual {p1}, Lcom/discord/stores/StoreChannelsSelected;->getId()Lrx/Observable;
move-result-object p1
- const-string v0, "ObservableWithLeadingEdg\u20260, TimeUnit.MILLISECONDS)"
+ invoke-virtual {p1}, Lrx/Observable;->Fp()Lrx/Observable;
+
+ move-result-object p1
+
+ new-instance v0, Lcom/discord/stores/StoreMessageAck$init$1;
+
+ invoke-direct {v0, p0}, Lcom/discord/stores/StoreMessageAck$init$1;->(Lcom/discord/stores/StoreMessageAck;)V
+
+ check-cast v0, Lrx/functions/b;
+
+ invoke-virtual {p1, v0}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
+
+ move-result-object p1
+
+ const-string v0, "StoreStream\n .get\u2026 0L\n }\n }"
invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$6$1.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$6$1.smali
deleted file mode 100644
index cc8ac35a74..0000000000
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$6$1.smali
+++ /dev/null
@@ -1,91 +0,0 @@
-.class final Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$6$1;
-.super Ljava/lang/Object;
-.source "StoreMessagesLoader.kt"
-
-# interfaces
-.implements Lrx/functions/b;
-
-
-# annotations
-.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$6;->call(Ljava/lang/Boolean;)Lrx/Observable;
-.end annotation
-
-.annotation system Ldalvik/annotation/InnerClass;
- accessFlags = 0x18
- name = null
-.end annotation
-
-.annotation system Ldalvik/annotation/Signature;
- value = {
- "",
- "Ljava/lang/Object;",
- "Lrx/functions/b<",
- "Lcom/discord/models/domain/ModelChannel;",
- "Ljava/lang/Boolean;",
- ">;"
- }
-.end annotation
-
-
-# static fields
-.field public static final INSTANCE:Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$6$1;
-
-
-# direct methods
-.method static constructor ()V
- .locals 1
-
- new-instance v0, Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$6$1;
-
- invoke-direct {v0}, Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$6$1;->()V
-
- sput-object v0, Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$6$1;->INSTANCE:Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$6$1;
-
- return-void
-.end method
-
-.method constructor ()V
- .locals 0
-
- invoke-direct {p0}, Ljava/lang/Object;->()V
-
- return-void
-.end method
-
-
-# virtual methods
-.method public final synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
- .locals 0
-
- check-cast p1, Lcom/discord/models/domain/ModelChannel;
-
- invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$6$1;->call(Lcom/discord/models/domain/ModelChannel;)Z
-
- move-result p1
-
- invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
-
- move-result-object p1
-
- return-object p1
-.end method
-
-.method public final call(Lcom/discord/models/domain/ModelChannel;)Z
- .locals 0
-
- if-eqz p1, :cond_0
-
- const/4 p1, 0x1
-
- return p1
-
- :cond_0
- const/4 p1, 0x0
-
- return p1
-.end method
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$6.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$6.smali
index af0000cfad..00a753745a 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$6.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$6.smali
@@ -110,15 +110,23 @@
move-result-object v0
- sget-object v1, Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$6$1;->INSTANCE:Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$6$1;
+ sget-object v1, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$1;
check-cast v1, Lrx/functions/b;
invoke-virtual {v0, v1}, Lrx/Observable;->b(Lrx/functions/b;)Lrx/Observable;
+ move-result-object v0
+
+ sget-object v1, Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;->INSTANCE:Lcom/discord/utilities/rx/ObservableExtensionsKt$filterNull$2;
+
+ check-cast v1, Lrx/functions/b;
+
+ invoke-virtual {v0, v1}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable;
+
move-result-object v2
- const-string v0, "stream\n .ch\u2026 .filter { it != null }"
+ const-string v0, "filter { it != null }.map { it!! }"
invoke-static {v2, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$8.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$8.smali
index 6c37dc88e1..a4b1fb3765 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$8.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader$jumpToMessage$8.smali
@@ -1,5 +1,5 @@
-.class final Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$8;
-.super Lkotlin/jvm/internal/k;
+.class final synthetic Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$8;
+.super Lkotlin/jvm/internal/i;
.source "StoreMessagesLoader.kt"
# interfaces
@@ -12,13 +12,13 @@
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
- accessFlags = 0x18
+ accessFlags = 0x1018
name = null
.end annotation
.annotation system Ldalvik/annotation/Signature;
value = {
- "Lkotlin/jvm/internal/k;",
+ "Lkotlin/jvm/internal/i;",
"Lkotlin/jvm/functions/Function1<",
"Lcom/discord/models/domain/ModelChannel;",
"Lkotlin/Unit;",
@@ -39,13 +39,37 @@
const/4 p1, 0x1
- invoke-direct {p0, p1}, Lkotlin/jvm/internal/k;->(I)V
+ invoke-direct {p0, p1}, Lkotlin/jvm/internal/i;->(I)V
return-void
.end method
# virtual methods
+.method public final getName()Ljava/lang/String;
+ .locals 1
+
+ const-string v0, "handleTargetChannelResolved"
+
+ return-object v0
+.end method
+
+.method public final getOwner()Lkotlin/reflect/KDeclarationContainer;
+ .locals 1
+
+ const/4 v0, 0x0
+
+ return-object v0
+.end method
+
+.method public final getSignature()Ljava/lang/String;
+ .locals 1
+
+ const-string v0, "invoke(Lcom/discord/models/domain/ModelChannel;)V"
+
+ return-object v0
+.end method
+
.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object;
.locals 0
@@ -61,13 +85,12 @@
.method public final invoke(Lcom/discord/models/domain/ModelChannel;)V
.locals 1
+ const-string v0, "p1"
+
+ invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
iget-object v0, p0, Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$8;->$handleTargetChannelResolved$2:Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$2;
- if-nez p1, :cond_0
-
- invoke-static {}, Lkotlin/jvm/internal/j;->zI()V
-
- :cond_0
invoke-virtual {v0, p1}, Lcom/discord/stores/StoreMessagesLoader$jumpToMessage$2;->invoke(Lcom/discord/models/domain/ModelChannel;)V
return-void
diff --git a/com.discord/smali/com/discord/stores/StoreMessagesLoader.smali b/com.discord/smali/com/discord/stores/StoreMessagesLoader.smali
index f80222d019..69b7d9cc5a 100644
--- a/com.discord/smali/com/discord/stores/StoreMessagesLoader.smali
+++ b/com.discord/smali/com/discord/stores/StoreMessagesLoader.smali
@@ -1099,9 +1099,9 @@
.end method
.method private final declared-synchronized tryLoadMessages(JZZZLjava/lang/Long;Ljava/lang/Long;)V
- .locals 15
+ .locals 19
- move-object v9, p0
+ move-object/from16 v9, p0
move-wide/from16 v0, p1
@@ -1168,49 +1168,39 @@
invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
- move-result-object v0
+ move-result-object v10
- sget-object v1, Lcom/discord/app/h;->ts:Lcom/discord/app/h;
+ invoke-virtual/range {p0 .. p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
- new-instance v1, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$1;
+ move-result-object v11
- invoke-direct {v1, p0}, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$1;->(Lcom/discord/stores/StoreMessagesLoader;)V
+ const/4 v12, 0x0
- check-cast v1, Lkotlin/jvm/functions/Function1;
+ new-instance v0, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$1;
- invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class;
+ invoke-direct {v0, v9}, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$1;->(Lcom/discord/stores/StoreMessagesLoader;)V
- move-result-object v2
+ move-object/from16 v16, v0
- const/4 v3, 0x0
+ check-cast v16, Lkotlin/jvm/functions/Function1;
- new-instance v4, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$2;
+ new-instance v0, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$2;
- invoke-direct {v4, p0}, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$2;->(Lcom/discord/stores/StoreMessagesLoader;)V
+ invoke-direct {v0, v9}, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$2;->(Lcom/discord/stores/StoreMessagesLoader;)V
- check-cast v4, Lkotlin/jvm/functions/Function1;
+ move-object v13, v0
- const/4 v5, 0x0
+ check-cast v13, Lkotlin/jvm/functions/Function1;
- const/16 v6, 0x30
+ const/4 v14, 0x0
- move-object/from16 p1, v1
+ const/4 v15, 0x0
- move-object/from16 p2, v2
+ const/16 v17, 0x1a
- move-object/from16 p3, v3
+ const/16 v18, 0x0
- move-object/from16 p4, v4
-
- move-object/from16 p5, v5
-
- move/from16 p6, v6
-
- invoke-static/range {p1 .. p6}, Lcom/discord/app/h;->a(Lkotlin/jvm/functions/Function1;Ljava/lang/Class;Lrx/functions/Action1;Lkotlin/jvm/functions/Function1;Landroid/content/Context;I)Lrx/Observable$Transformer;
-
- move-result-object v1
-
- invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$Transformer;)Lrx/Observable;
+ invoke-static/range {v10 .. v18}, 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
:try_end_1
.catchall {:try_start_1 .. :try_end_1} :catchall_0
@@ -1283,11 +1273,11 @@
:cond_8
new-instance v2, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$3;
- invoke-direct {v2, p0}, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$3;->(Lcom/discord/stores/StoreMessagesLoader;)V
+ invoke-direct {v2, v9}, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$3;->(Lcom/discord/stores/StoreMessagesLoader;)V
new-instance v12, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$4;
- invoke-direct {v12, p0, v2}, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$4;->(Lcom/discord/stores/StoreMessagesLoader;Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$3;)V
+ invoke-direct {v12, v9, v2}, Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$4;->(Lcom/discord/stores/StoreMessagesLoader;Lcom/discord/stores/StoreMessagesLoader$tryLoadMessages$3;)V
if-eqz p7, :cond_9
@@ -1390,7 +1380,7 @@
check-cast v1, Lkotlin/jvm/functions/Function1;
- invoke-direct {p0, v10, v11, v1}, Lcom/discord/stores/StoreMessagesLoader;->channelLoadedStateUpdate(JLkotlin/jvm/functions/Function1;)V
+ invoke-direct {v9, v10, v11, v1}, Lcom/discord/stores/StoreMessagesLoader;->channelLoadedStateUpdate(JLkotlin/jvm/functions/Function1;)V
iget-object v1, v9, Lcom/discord/stores/StoreMessagesLoader;->stream:Lcom/discord/stores/StoreStream;
@@ -1434,7 +1424,7 @@
move v3, v4
- move-object v4, p0
+ move-object/from16 v4, p0
move-object v5, v0
@@ -1678,15 +1668,15 @@
move-result-object p1
- invoke-static {}, Lcom/discord/app/h;->dx()Lrx/Observable$Transformer;
-
- move-result-object p2
-
- invoke-virtual {p1, p2}, Lrx/Observable;->a(Lrx/Observable$Transformer;)Lrx/Observable;
+ invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
move-result-object p1
- const-string p2, "channelLoadedStateSubjec\u2026onDistinctUntilChanged())"
+ invoke-virtual {p1}, Lrx/Observable;->Fp()Lrx/Observable;
+
+ move-result-object p1
+
+ const-string p2, "channelLoadedStateSubjec\u2026 .distinctUntilChanged()"
invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
@@ -1718,7 +1708,7 @@
invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
+ invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
move-result-object v0
@@ -1821,6 +1811,8 @@
.method public final declared-synchronized handleChannelSelected(J)V
.locals 13
+ .annotation runtime Lcom/discord/stores/StoreThread;
+ .end annotation
monitor-enter p0
@@ -2097,7 +2089,7 @@
move-result-object p3
- invoke-static {p3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
+ invoke-static {p3}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
move-result-object v2
@@ -2157,7 +2149,7 @@
invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
+ invoke-static {p1}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
move-result-object v2
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation$init$6.smali b/com.discord/smali/com/discord/stores/StoreNavigation$init$6.smali
index e686c9df4f..15d51556b5 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation$init$6.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation$init$6.smali
@@ -83,11 +83,11 @@
sget-object v0, Lcom/discord/widgets/notice/WidgetNoticePopup;->Companion:Lcom/discord/widgets/notice/WidgetNoticePopup$Companion;
- const v2, 0x7f1203b3
+ const v2, 0x7f1203b2
const v3, 0x7f120b6e
- const v4, 0x7f08029e
+ const v4, 0x7f0802a6
const/16 v5, 0x1e
diff --git a/com.discord/smali/com/discord/stores/StoreNavigation.smali b/com.discord/smali/com/discord/stores/StoreNavigation.smali
index 874d47d4e5..9f3235eada 100644
--- a/com.discord/smali/com/discord/stores/StoreNavigation.smali
+++ b/com.discord/smali/com/discord/stores/StoreNavigation.smali
@@ -167,11 +167,11 @@
const-string v1, "CONNECTION_ISSUES"
- const v2, 0x7f12041b
+ const v2, 0x7f12041a
- const v3, 0x7f12041f
+ const v3, 0x7f12041e
- const v4, 0x7f080316
+ const v4, 0x7f080320
const/16 v5, 0x1e
diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali
index a8f400874e..94bc1604f6 100644
--- a/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali
@@ -735,7 +735,7 @@
invoke-direct {v4, p3}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(I)V
- const v5, 0x7f120ec1
+ const v5, 0x7f120ec5
move-object v0, p0
@@ -765,7 +765,7 @@
invoke-direct {v4, p3, p4, p5}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)V
- const v5, 0x7f120ec1
+ const v5, 0x7f120ec5
move-object v0, p0
diff --git a/com.discord/smali/com/discord/stores/StoreUserSettings.smali b/com.discord/smali/com/discord/stores/StoreUserSettings.smali
index 6729a02081..5caf98f5fa 100644
--- a/com.discord/smali/com/discord/stores/StoreUserSettings.smali
+++ b/com.discord/smali/com/discord/stores/StoreUserSettings.smali
@@ -1372,7 +1372,7 @@
move-result-object v0
- const v1, 0x7f120fe3
+ const v1, 0x7f120fe9
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -1804,7 +1804,7 @@
move-result-object p2
- const v0, 0x7f120fe3
+ const v0, 0x7f120fe9
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -1835,7 +1835,7 @@
move-result-object p2
- const v0, 0x7f120fe2
+ const v0, 0x7f120fe8
invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
index bcdd87dec5..d3d86649e1 100644
--- a/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
+++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticSuperProperties.smali
@@ -179,7 +179,7 @@
const-string v1, "browser_user_agent"
- const-string v2, "Discord-Android/899"
+ const-string v2, "Discord-Android/900"
invoke-static {v1, v2}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
@@ -189,7 +189,7 @@
aput-object v1, v0, v2
- const/16 v1, 0x383
+ const/16 v1, 0x384
invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
@@ -207,7 +207,7 @@
const-string v1, "client_version"
- const-string v2, "8.9.9"
+ const-string v2, "9.0.0"
invoke-static {v1, v2}, Lkotlin/q;->m(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair;
diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali
index 47d782f6af..6be1364885 100644
--- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali
+++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali
@@ -3457,7 +3457,7 @@
return p1
:sswitch_5
- const p1, 0x7f121090
+ const p1, 0x7f121096
return p1
@@ -3467,7 +3467,7 @@
return p1
:sswitch_7
- const p1, 0x7f12049a
+ const p1, 0x7f120499
return p1
@@ -3477,17 +3477,17 @@
return p1
:sswitch_9
- const p1, 0x7f120f22
+ const p1, 0x7f120f26
return p1
:sswitch_a
- const p1, 0x7f120400
+ const p1, 0x7f1203ff
return p1
:sswitch_b
- const p1, 0x7f12108d
+ const p1, 0x7f121093
return p1
@@ -3497,7 +3497,7 @@
return p1
:sswitch_d
- const p1, 0x7f120d9e
+ const p1, 0x7f120da2
return p1
@@ -3507,7 +3507,7 @@
return p1
:sswitch_f
- const p1, 0x7f12052f
+ const p1, 0x7f12052e
return p1
@@ -3517,27 +3517,27 @@
return p1
:sswitch_11
- const p1, 0x7f120eb0
+ const p1, 0x7f120eb4
return p1
:sswitch_12
- const p1, 0x7f120eae
+ const p1, 0x7f120eb2
return p1
:sswitch_13
- const p1, 0x7f120d9f
+ const p1, 0x7f120da3
return p1
:sswitch_14
- const p1, 0x7f120d60
+ const p1, 0x7f120d64
return p1
:sswitch_15
- const p1, 0x7f121170
+ const p1, 0x7f121176
return p1
@@ -3585,7 +3585,7 @@
return p1
:cond_2
- const p1, 0x7f120452
+ const p1, 0x7f120451
return p1
diff --git a/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali b/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali
index a7ec75dd0f..5b881ce164 100644
--- a/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali
+++ b/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali
@@ -308,7 +308,7 @@
:cond_1
if-eqz v0, :cond_2
- const p2, 0x7f12078f
+ const p2, 0x7f12078e
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -342,7 +342,7 @@
if-eqz v0, :cond_6
- const p2, 0x7f1204d0
+ const p2, 0x7f1204cf
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/error/Error.smali b/com.discord/smali/com/discord/utilities/error/Error.smali
index dc6ab4e019..daac12da89 100644
--- a/com.discord/smali/com/discord/utilities/error/Error.smali
+++ b/com.discord/smali/com/discord/utilities/error/Error.smali
@@ -728,7 +728,7 @@
return-object p1
:pswitch_4
- const v0, 0x7f120fe8
+ const v0, 0x7f120fee
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -797,7 +797,7 @@
return-object p1
:pswitch_9
- const v0, 0x7f120d91
+ const v0, 0x7f120d95
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali
index 756b925b41..a573434ff5 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali
@@ -1538,7 +1538,7 @@
if-eqz v0, :cond_c
- const v0, 0x7f120656
+ const v0, 0x7f120655
new-array v1, v4, [Ljava/lang/Object;
@@ -1567,7 +1567,7 @@
if-eqz v0, :cond_c
- const v0, 0x7f1206d1
+ const v0, 0x7f1206d0
new-array v1, v6, [Ljava/lang/Object;
@@ -1915,7 +1915,7 @@
invoke-direct {p2, v0}, Landroidx/core/app/RemoteInput$Builder;->(Ljava/lang/String;)V
- const v0, 0x7f120eac
+ const v0, 0x7f120eb0
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1963,7 +1963,7 @@
new-instance v2, Landroidx/core/app/NotificationCompat$Action$Builder;
- const v3, 0x7f0802e6
+ const v3, 0x7f0802f0
const v4, 0x7f120b81
@@ -2777,7 +2777,7 @@
goto :goto_0
:cond_0
- const v0, 0x7f1204e8
+ const v0, 0x7f1204e7
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -3041,7 +3041,7 @@
if-eqz v0, :cond_0
- const v0, 0x7f08029d
+ const v0, 0x7f0802a5
return v0
@@ -3054,7 +3054,7 @@
if-eqz v0, :cond_0
- const v0, 0x7f0802a0
+ const v0, 0x7f0802a8
return v0
@@ -3079,13 +3079,13 @@
if-eqz v0, :cond_0
:goto_0
- const v0, 0x7f08029f
+ const v0, 0x7f0802a7
return v0
:cond_0
:goto_1
- const v0, 0x7f08029c
+ const v0, 0x7f0802a4
return v0
@@ -3284,7 +3284,7 @@
if-eqz v0, :cond_5
- const v0, 0x7f1206d2
+ const v0, 0x7f1206d1
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali
index 3272bd3853..e10c366400 100644
--- a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali
+++ b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali
@@ -879,7 +879,7 @@
move-result-object p3
- const v3, 0x7f0802a0
+ const v3, 0x7f0802a8
invoke-virtual {p3, v3}, Landroidx/core/app/NotificationCompat$Builder;->setSmallIcon(I)Landroidx/core/app/NotificationCompat$Builder;
@@ -966,7 +966,7 @@
new-instance v2, Landroid/app/NotificationChannel;
- const v4, 0x7f121176
+ const v4, 0x7f12117c
invoke-virtual {p1, v4}, Landroid/app/Application;->getString(I)Ljava/lang/String;
@@ -998,7 +998,7 @@
new-instance v6, Landroid/app/NotificationChannel;
- const v8, 0x7f1204d1
+ const v8, 0x7f1204d0
invoke-virtual {p1, v8}, Landroid/app/Application;->getString(I)Ljava/lang/String;
@@ -1012,7 +1012,7 @@
new-instance v8, Landroid/app/NotificationChannel;
- const v9, 0x7f120658
+ const v9, 0x7f120657
invoke-virtual {p1, v9}, Landroid/app/Application;->getString(I)Ljava/lang/String;
@@ -1026,7 +1026,7 @@
new-instance v9, Landroid/app/NotificationChannel;
- const v10, 0x7f120691
+ const v10, 0x7f120690
invoke-virtual {p1, v10}, Landroid/app/Application;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/games/GameDetectionService$Companion.smali b/com.discord/smali/com/discord/utilities/games/GameDetectionService$Companion.smali
index 97793f4241..57460bd823 100644
--- a/com.discord/smali/com/discord/utilities/games/GameDetectionService$Companion.smali
+++ b/com.discord/smali/com/discord/utilities/games/GameDetectionService$Companion.smali
@@ -106,13 +106,13 @@
move-result-object v2
- const v3, 0x7f08029c
+ const v3, 0x7f0802a4
invoke-virtual {v2, v3}, Landroidx/core/app/NotificationCompat$Builder;->setSmallIcon(I)Landroidx/core/app/NotificationCompat$Builder;
move-result-object v2
- const v3, 0x7f1204e8
+ const v3, 0x7f1204e7
invoke-virtual {p1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -126,7 +126,7 @@
if-nez p2, :cond_0
- const p2, 0x7f120691
+ const p2, 0x7f120690
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -135,7 +135,7 @@
goto :goto_0
:cond_0
- const v3, 0x7f12068c
+ const v3, 0x7f12068b
const/4 v4, 0x1
diff --git a/com.discord/smali/com/discord/utilities/icon/IconUtils.smali b/com.discord/smali/com/discord/utilities/icon/IconUtils.smali
index 6770d7ff21..33fb313221 100644
--- a/com.discord/smali/com/discord/utilities/icon/IconUtils.smali
+++ b/com.discord/smali/com/discord/utilities/icon/IconUtils.smali
@@ -2607,7 +2607,7 @@
if-eqz p1, :cond_1
- const p1, 0x7f080341
+ const p1, 0x7f08034c
return p1
@@ -2620,7 +2620,7 @@
if-eqz p1, :cond_1
- const p1, 0x7f08034e
+ const p1, 0x7f080359
return p1
@@ -2633,7 +2633,7 @@
if-eqz p1, :cond_1
- const p1, 0x7f080351
+ const p1, 0x7f08035c
return p1
@@ -2668,7 +2668,7 @@
if-eqz p1, :cond_1
- const p1, 0x7f08034a
+ const p1, 0x7f080355
return p1
@@ -2681,7 +2681,7 @@
if-eqz p1, :cond_1
- const p1, 0x7f08033d
+ const p1, 0x7f080348
return p1
@@ -2694,7 +2694,7 @@
if-eqz p1, :cond_1
- const p1, 0x7f080356
+ const p1, 0x7f080361
return p1
@@ -2707,7 +2707,7 @@
if-eqz p1, :cond_1
- const p1, 0x7f080349
+ const p1, 0x7f080354
return p1
@@ -2720,7 +2720,7 @@
if-eqz p1, :cond_1
- const p1, 0x7f080354
+ const p1, 0x7f08035f
return p1
@@ -2755,7 +2755,7 @@
if-eqz p1, :cond_1
- const p1, 0x7f080357
+ const p1, 0x7f080362
return p1
@@ -2769,7 +2769,7 @@
if-eqz p1, :cond_1
:goto_0
- const p1, 0x7f080344
+ const p1, 0x7f08034f
return p1
@@ -2783,13 +2783,13 @@
if-eqz p1, :cond_1
:goto_1
- const p1, 0x7f080346
+ const p1, 0x7f080351
return p1
:cond_1
:goto_2
- const p1, 0x7f08035c
+ const p1, 0x7f080367
return p1
diff --git a/com.discord/smali/com/discord/utilities/images/MGImages$requestAvatarCrop$1.smali b/com.discord/smali/com/discord/utilities/images/MGImages$requestAvatarCrop$1.smali
index 61a65c7785..59156ae375 100644
--- a/com.discord/smali/com/discord/utilities/images/MGImages$requestAvatarCrop$1.smali
+++ b/com.discord/smali/com/discord/utilities/images/MGImages$requestAvatarCrop$1.smali
@@ -41,7 +41,7 @@
if-eqz v0, :cond_0
- const v1, 0x7f121049
+ const v1, 0x7f12104f
const/4 v2, 0x1
diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali
index eda54b5ebd..0f03e302ed 100644
--- a/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali
+++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali
@@ -346,7 +346,7 @@
if-eqz p3, :cond_0
- const p2, 0x7f120efa
+ const p2, 0x7f120efe
invoke-virtual {p0, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali
index a7db64b2e4..8ff3f6abd7 100644
--- a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali
+++ b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali
@@ -137,7 +137,7 @@
aput-object v1, v0, v2
- const v1, 0x7f1204e6
+ const v1, 0x7f1204e5
invoke-virtual {p1, v1, v0}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -157,7 +157,7 @@
invoke-static {v3, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
- const v0, 0x7f1204e5
+ const v0, 0x7f1204e4
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -185,7 +185,7 @@
move-result-object v7
- const p2, 0x7f1204e3
+ const p2, 0x7f1204e2
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -222,7 +222,7 @@
new-instance p2, Lcom/discord/utilities/notices/NoticeBuilders$DialogData;
- const v0, 0x7f120d94
+ const v0, 0x7f120d98
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -232,7 +232,7 @@
invoke-static {v1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
- const v0, 0x7f120d93
+ const v0, 0x7f120d97
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/platform/Platform.smali b/com.discord/smali/com/discord/utilities/platform/Platform.smali
index 38826ce835..8c3e94dfe9 100644
--- a/com.discord/smali/com/discord/utilities/platform/Platform.smali
+++ b/com.discord/smali/com/discord/utilities/platform/Platform.smali
@@ -95,7 +95,7 @@
const v6, 0x7f08018c
- const v7, 0x7f080339
+ const v7, 0x7f080344
const/4 v8, 0x0
@@ -225,7 +225,7 @@
const v8, 0x7f080182
- const v9, 0x7f080279
+ const v9, 0x7f080281
move-object v3, v1
@@ -295,7 +295,7 @@
const v8, 0x7f080186
- const v9, 0x7f0802d5
+ const v9, 0x7f0802df
const/4 v12, 0x1
@@ -323,7 +323,7 @@
const v8, 0x7f080187
- const v9, 0x7f0802f0
+ const v9, 0x7f0802fa
const/4 v10, 0x1
@@ -353,7 +353,7 @@
const v8, 0x7f080188
- const v9, 0x7f0802f4
+ const v9, 0x7f0802fe
const/4 v10, 0x0
@@ -385,7 +385,7 @@
const v8, 0x7f080189
- const v9, 0x7f0802fb
+ const v9, 0x7f080305
const/4 v11, 0x0
@@ -413,7 +413,7 @@
const v8, 0x7f08018a
- const v9, 0x7f080313
+ const v9, 0x7f08031d
move-object v3, v1
@@ -437,7 +437,7 @@
const v8, 0x7f08018b
- const v9, 0x7f080315
+ const v9, 0x7f08031f
move-object v3, v1
@@ -489,7 +489,7 @@
const v8, 0x7f08018e
- const v9, 0x7f08033a
+ const v9, 0x7f080345
const/4 v12, 0x1
diff --git a/com.discord/smali/com/discord/utilities/presence/PresenceUtils$getActivity$1.smali b/com.discord/smali/com/discord/utilities/presence/PresenceUtils$getActivity$1.smali
index 3e44e28680..01daf9f8a2 100644
--- a/com.discord/smali/com/discord/utilities/presence/PresenceUtils$getActivity$1.smali
+++ b/com.discord/smali/com/discord/utilities/presence/PresenceUtils$getActivity$1.smali
@@ -101,7 +101,7 @@
return-object p1
:cond_0
- const p2, 0x7f12118e
+ const p2, 0x7f121194
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -119,7 +119,7 @@
return-object p1
:cond_2
- const p2, 0x7f120f73
+ const p2, 0x7f120f79
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali b/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali
index af4f9217ee..48dc312424 100644
--- a/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali
+++ b/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali
@@ -43,7 +43,7 @@
move-result v0
- const v1, 0x7f1210aa
+ const v1, 0x7f1210b0
if-eqz v0, :cond_3
@@ -68,7 +68,7 @@
goto :goto_0
:cond_0
- const v0, 0x7f1210ad
+ const v0, 0x7f1210b3
new-array v1, v3, [Ljava/lang/Object;
@@ -85,7 +85,7 @@
goto :goto_0
:cond_1
- const v0, 0x7f1210a8
+ const v0, 0x7f1210ae
new-array v1, v3, [Ljava/lang/Object;
@@ -102,7 +102,7 @@
goto :goto_0
:cond_2
- const v0, 0x7f1210a9
+ const v0, 0x7f1210af
new-array v1, v3, [Ljava/lang/Object;
@@ -158,7 +158,7 @@
if-ne v0, v1, :cond_0
- const p1, 0x7f0802f9
+ const p1, 0x7f080303
return p1
@@ -192,7 +192,7 @@
if-ne v0, v1, :cond_3
- const p1, 0x7f0802f8
+ const p1, 0x7f080302
return p1
@@ -211,7 +211,7 @@
if-ne v0, v1, :cond_5
- const p1, 0x7f0802f6
+ const p1, 0x7f080300
return p1
@@ -230,7 +230,7 @@
if-ne v0, v1, :cond_7
- const p1, 0x7f0802f5
+ const p1, 0x7f0802ff
return p1
@@ -244,7 +244,7 @@
invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
:goto_4
- const p1, 0x7f0802f7
+ const p1, 0x7f080301
return p1
.end method
@@ -281,7 +281,7 @@
if-ne v0, v1, :cond_2
- const p1, 0x7f120f4a
+ const p1, 0x7f120f4f
return p1
@@ -300,7 +300,7 @@
if-ne v0, v1, :cond_4
- const p1, 0x7f120f46
+ const p1, 0x7f120f4b
return p1
@@ -319,13 +319,13 @@
if-ne p1, v0, :cond_6
- const p1, 0x7f120f44
+ const p1, 0x7f120f49
return p1
:cond_6
:goto_3
- const p1, 0x7f120f49
+ const p1, 0x7f120f4e
return p1
.end method
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 c70eb5d97a..1e5dd5f001 100644
--- a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali
+++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali
@@ -167,7 +167,7 @@
.method public final getUserAgent()Ljava/lang/String;
.locals 1
- const-string v0, "Discord-Android/899"
+ const-string v0, "Discord-Android/900"
return-object v0
.end method
diff --git a/com.discord/smali/com/discord/utilities/rest/SendUtils.smali b/com.discord/smali/com/discord/utilities/rest/SendUtils.smali
index 6cf57cd319..872dc88c7b 100644
--- a/com.discord/smali/com/discord/utilities/rest/SendUtils.smali
+++ b/com.discord/smali/com/discord/utilities/rest/SendUtils.smali
@@ -627,17 +627,17 @@
goto :goto_0
:cond_0
- const p2, 0x7f120572
-
- goto :goto_0
-
- :cond_1
const p2, 0x7f120571
goto :goto_0
+ :cond_1
+ const p2, 0x7f120570
+
+ goto :goto_0
+
:cond_2
- const p2, 0x7f120573
+ const p2, 0x7f120572
:goto_0
const v0, 0x7f0d00d0
diff --git a/com.discord/smali/com/discord/utilities/search/strings/ContextSearchStringProvider.smali b/com.discord/smali/com/discord/utilities/search/strings/ContextSearchStringProvider.smali
index b63b3e9ec7..5386d6a554 100644
--- a/com.discord/smali/com/discord/utilities/search/strings/ContextSearchStringProvider.smali
+++ b/com.discord/smali/com/discord/utilities/search/strings/ContextSearchStringProvider.smali
@@ -38,7 +38,7 @@
invoke-direct {p0}, Ljava/lang/Object;->()V
- const v0, 0x7f120e6e
+ const v0, 0x7f120e72
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -50,7 +50,7 @@
iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->fromFilterString:Ljava/lang/String;
- const v0, 0x7f120e70
+ const v0, 0x7f120e74
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -62,7 +62,7 @@
iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->inFilterString:Ljava/lang/String;
- const v0, 0x7f120e72
+ const v0, 0x7f120e76
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -74,7 +74,7 @@
iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->mentionsFilterString:Ljava/lang/String;
- const v0, 0x7f120e6f
+ const v0, 0x7f120e73
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -86,7 +86,7 @@
iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->hasFilterString:Ljava/lang/String;
- const v0, 0x7f120e5b
+ const v0, 0x7f120e5f
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -98,7 +98,7 @@
iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->linkAnswerString:Ljava/lang/String;
- const v0, 0x7f120e59
+ const v0, 0x7f120e5d
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -110,7 +110,7 @@
iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->embedAnswerString:Ljava/lang/String;
- const v0, 0x7f120e58
+ const v0, 0x7f120e5c
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -122,7 +122,7 @@
iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->fileAnswerString:Ljava/lang/String;
- const v0, 0x7f120e5d
+ const v0, 0x7f120e61
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -134,7 +134,7 @@
iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->videoAnswerString:Ljava/lang/String;
- const v0, 0x7f120e5a
+ const v0, 0x7f120e5e
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -146,7 +146,7 @@
iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->imageAnswerString:Ljava/lang/String;
- const v0, 0x7f120e5c
+ const v0, 0x7f120e60
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler.smali b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler.smali
index 8f883672f1..b3e7da5136 100644
--- a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler.smali
+++ b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler.smali
@@ -190,11 +190,11 @@
check-cast v0, Landroid/widget/TextView;
- const v5, 0x7f1204e1
+ const v5, 0x7f1204e0
invoke-virtual {v2, v5}, Landroid/widget/TextView;->setText(I)V
- const v2, 0x7f1204e2
+ const v2, 0x7f1204e1
invoke-virtual {v3, v2}, Landroid/widget/TextView;->setText(I)V
diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali
index 539e66c0e6..a73a77db8d 100644
--- a/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali
+++ b/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali
@@ -33,12 +33,6 @@
:array_0
.array-data 4
- 0x7f120f98
- 0x7f120f99
- 0x7f120f9a
- 0x7f120f9b
- 0x7f120f9c
- 0x7f120f9d
0x7f120f9e
0x7f120f9f
0x7f120fa0
@@ -72,6 +66,12 @@
0x7f120fbc
0x7f120fbd
0x7f120fbe
+ 0x7f120fbf
+ 0x7f120fc0
+ 0x7f120fc1
+ 0x7f120fc2
+ 0x7f120fc3
+ 0x7f120fc4
.end array-data
.end method
diff --git a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali
index dd79c16962..3024d1a167 100644
--- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali
+++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali
@@ -149,7 +149,7 @@
move-result-object v1
- const v2, 0x7f08029c
+ const v2, 0x7f0802a4
invoke-virtual {v1, v2}, Landroidx/core/app/NotificationCompat$Builder;->setSmallIcon(I)Landroidx/core/app/NotificationCompat$Builder;
@@ -317,7 +317,7 @@
move-result-object v10
- const v11, 0x7f1204e3
+ const v11, 0x7f1204e2
invoke-virtual {v10, v11}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -333,12 +333,12 @@
if-eqz v3, :cond_0
- const v8, 0x7f08028c
+ const v8, 0x7f080294
goto :goto_0
:cond_0
- const v8, 0x7f08028b
+ const v8, 0x7f080293
:goto_0
if-eqz v3, :cond_1
@@ -347,7 +347,7 @@
move-result-object v3
- const v9, 0x7f12105b
+ const v9, 0x7f121061
invoke-virtual {v3, v9}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -377,12 +377,12 @@
if-eqz p0, :cond_2
- const v4, 0x7f080253
+ const v4, 0x7f08025b
goto :goto_2
:cond_2
- const v4, 0x7f080252
+ const v4, 0x7f08025a
:goto_2
if-eqz p0, :cond_3
@@ -391,7 +391,7 @@
move-result-object p0
- const v6, 0x7f121053
+ const v6, 0x7f121059
invoke-virtual {p0, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -404,7 +404,7 @@
move-result-object p0
- const v6, 0x7f120499
+ const v6, 0x7f120498
invoke-virtual {p0, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/utils/R$c.smali b/com.discord/smali/com/discord/utils/R$c.smali
index cecab9c046..47c24c90c2 100644
--- a/com.discord/smali/com/discord/utils/R$c.smali
+++ b/com.discord/smali/com/discord/utils/R$c.smali
@@ -247,45 +247,45 @@
.field public static final googleg_standard_color_18:I = 0x7f08017a
-.field public static final ic_mtrl_chip_checked_black:I = 0x7f08028f
+.field public static final ic_mtrl_chip_checked_black:I = 0x7f080297
-.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080290
+.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080298
-.field public static final ic_mtrl_chip_close_circle:I = 0x7f080291
+.field public static final ic_mtrl_chip_close_circle:I = 0x7f080299
-.field public static final mtrl_snackbar_background:I = 0x7f0803b6
+.field public static final mtrl_snackbar_background:I = 0x7f0803c1
-.field public static final mtrl_tabs_default_indicator:I = 0x7f0803b7
+.field public static final mtrl_tabs_default_indicator:I = 0x7f0803c2
-.field public static final navigation_empty_icon:I = 0x7f0803b8
+.field public static final navigation_empty_icon:I = 0x7f0803c3
-.field public static final notification_action_background:I = 0x7f0803b9
+.field public static final notification_action_background:I = 0x7f0803c4
-.field public static final notification_bg:I = 0x7f0803ba
+.field public static final notification_bg:I = 0x7f0803c5
-.field public static final notification_bg_low:I = 0x7f0803bb
+.field public static final notification_bg_low:I = 0x7f0803c6
-.field public static final notification_bg_low_normal:I = 0x7f0803bc
+.field public static final notification_bg_low_normal:I = 0x7f0803c7
-.field public static final notification_bg_low_pressed:I = 0x7f0803bd
+.field public static final notification_bg_low_pressed:I = 0x7f0803c8
-.field public static final notification_bg_normal:I = 0x7f0803be
+.field public static final notification_bg_normal:I = 0x7f0803c9
-.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
+.field public static final notification_bg_normal_pressed:I = 0x7f0803ca
-.field public static final notification_icon_background:I = 0x7f0803c0
+.field public static final notification_icon_background:I = 0x7f0803cb
-.field public static final notification_template_icon_bg:I = 0x7f0803c1
+.field public static final notification_template_icon_bg:I = 0x7f0803cc
-.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
+.field public static final notification_template_icon_low_bg:I = 0x7f0803cd
-.field public static final notification_tile_bg:I = 0x7f0803c3
+.field public static final notification_tile_bg:I = 0x7f0803ce
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf
-.field public static final tooltip_frame_dark:I = 0x7f0803c9
+.field public static final tooltip_frame_dark:I = 0x7f0803d4
-.field public static final tooltip_frame_light:I = 0x7f0803ca
+.field public static final tooltip_frame_light:I = 0x7f0803d5
# 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 2f1ff51173..55936c7632 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, 0x7f0803b2
+ const v4, 0x7f0803bd
const/high16 v5, -0x40800000 # -1.0f
@@ -68,7 +68,7 @@
const-string v3, "WHEEL_WUMPUS"
- const v4, 0x7f0803b3
+ const v4, 0x7f0803be
invoke-direct {v1, v3, v2, v4}, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->(Ljava/lang/String;II)V
@@ -82,7 +82,7 @@
const-string v3, "BROKEN_WHEEL"
- const v4, 0x7f080396
+ const v4, 0x7f0803a1
invoke-direct {v1, v3, v2, v4}, Lcom/discord/views/ActiveSubscriptionView$HeaderImage;->(Ljava/lang/String;II)V
diff --git a/com.discord/smali/com/discord/views/steps/StepsView$b$a.smali b/com.discord/smali/com/discord/views/steps/StepsView$b$a.smali
index bfd0ce2b1c..16906b38df 100644
--- a/com.discord/smali/com/discord/views/steps/StepsView$b$a.smali
+++ b/com.discord/smali/com/discord/views/steps/StepsView$b$a.smali
@@ -210,9 +210,9 @@
if-eqz v1, :cond_2
- const v1, 0x7f120500
+ const v1, 0x7f1204ff
- const v6, 0x7f120500
+ const v6, 0x7f1204ff
goto :goto_2
diff --git a/com.discord/smali/com/discord/views/video/VideoCallParticipantView.smali b/com.discord/smali/com/discord/views/video/VideoCallParticipantView.smali
index 30a2a577e3..56ad398142 100644
--- a/com.discord/smali/com/discord/views/video/VideoCallParticipantView.smali
+++ b/com.discord/smali/com/discord/views/video/VideoCallParticipantView.smali
@@ -1141,14 +1141,14 @@
if-eqz v3, :cond_10
- const p1, 0x7f08024f
+ const p1, 0x7f080257
goto :goto_8
:cond_10
if-eqz p1, :cond_11
- const p1, 0x7f080289
+ const p1, 0x7f080291
goto :goto_8
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$validationManager$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$validationManager$2.smali
index 8c7f6032ab..79d474033a 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$validationManager$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$validationManager$2.smali
@@ -66,7 +66,7 @@
sget-object v6, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
- const v7, 0x7f12052c
+ const v7, 0x7f12052b
invoke-virtual {v6, v7}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
@@ -80,7 +80,7 @@
sget-object v6, Lcom/discord/utilities/auth/AuthUtils;->INSTANCE:Lcom/discord/utilities/auth/AuthUtils;
- const v8, 0x7f12052b
+ const v8, 0x7f12052a
invoke-virtual {v6, v8}, Lcom/discord/utilities/auth/AuthUtils;->createEmailInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali
index 71d0362215..93e4b11088 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali
@@ -423,7 +423,7 @@
move-result-object v0
- const v1, 0x7f12052c
+ const v1, 0x7f12052b
invoke-static {v0, v1}, Lcom/discord/app/g;->c(Landroid/content/Context;I)V
@@ -998,7 +998,7 @@
aput-object p1, v0, v1
- const p1, 0x7f12052d
+ const p1, 0x7f12052c
invoke-virtual {p0, p1, v0}, Lcom/discord/widgets/auth/WidgetAuthLogin;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali
index 8e08ce7257..53701a93b6 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali
@@ -185,7 +185,7 @@
check-cast p1, Landroidx/fragment/app/Fragment;
- const p2, 0x7f121014
+ const p2, 0x7f12101a
invoke-static {p1, p2}, Lcom/discord/app/g;->a(Landroidx/fragment/app/Fragment;I)V
@@ -216,7 +216,7 @@
check-cast p1, Landroidx/fragment/app/Fragment;
- const v0, 0x7f12103b
+ const v0, 0x7f121041
invoke-static {p1, v0}, Lcom/discord/app/g;->a(Landroidx/fragment/app/Fragment;I)V
@@ -462,7 +462,7 @@
move-result-object v1
- const v4, 0x7f12101e
+ const v4, 0x7f121024
const/4 v5, 0x2
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2$1.smali
index 0cd11a6935..4f1d287706 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2$1.smali
@@ -102,7 +102,7 @@
move-result-object p1
- const v0, 0x7f120fd4
+ const v0, 0x7f120fda
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2.smali
index 2c535b83ae..119eac70d8 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$validationManager$2.smali
@@ -68,7 +68,7 @@
sget-object v6, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
- const v7, 0x7f121133
+ const v7, 0x7f121139
invoke-virtual {v6, v7}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
@@ -102,7 +102,7 @@
sget-object v8, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
- const v9, 0x7f12052c
+ const v9, 0x7f12052b
invoke-virtual {v8, v9}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
@@ -114,7 +114,7 @@
sget-object v8, Lcom/discord/utilities/auth/AuthUtils;->INSTANCE:Lcom/discord/utilities/auth/AuthUtils;
- const v9, 0x7f12052b
+ const v9, 0x7f12052a
invoke-virtual {v8, v9}, Lcom/discord/utilities/auth/AuthUtils;->createEmailInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali
index 444e8933f2..61203d03c1 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali
@@ -722,7 +722,7 @@
new-array v0, v0, [Ljava/lang/Object;
- const v1, 0x7f120fd1
+ const v1, 0x7f120fd7
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -732,7 +732,7 @@
aput-object v1, v0, v2
- const v1, 0x7f120d65
+ const v1, 0x7f120d69
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1324,12 +1324,12 @@
if-eqz v3, :cond_1
- const v3, 0x7f120fd3
+ const v3, 0x7f120fd9
goto :goto_1
:cond_1
- const v3, 0x7f120fd2
+ const v3, 0x7f120fd8
:goto_1
invoke-direct {p0, v5, v3}, Lcom/discord/widgets/auth/WidgetAuthRegister;->getFormattedTermsText(Landroid/content/Context;I)Ljava/lang/CharSequence;
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$2.smali
index efc4a46493..d9dafbe79e 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureOnPostRegistration$1$2.smali
@@ -85,7 +85,7 @@
const v3, 0x7f12093e
- const v4, 0x7f080316
+ const v4, 0x7f080320
const/16 v5, 0x1e
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureRegisterButton$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureRegisterButton$2.smali
index c5eeeea97f..d0e675cc2a 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureRegisterButton$2.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$configureRegisterButton$2.smali
@@ -65,7 +65,7 @@
iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegisterInvite$configureRegisterButton$2;->this$0:Lcom/discord/widgets/auth/WidgetAuthRegisterInvite;
- const v1, 0x7f121133
+ const v1, 0x7f121139
invoke-virtual {v0, v1}, Lcom/discord/widgets/auth/WidgetAuthRegisterInvite;->getString(I)Ljava/lang/String;
@@ -104,7 +104,7 @@
move-result-object p1
- const v0, 0x7f120fd4
+ const v0, 0x7f120fda
invoke-static {p1, v0}, Lcom/discord/app/g;->c(Landroid/content/Context;I)V
diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite.smali
index a2a15edea6..e7a5ff164a 100644
--- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite.smali
+++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite.smali
@@ -718,7 +718,7 @@
new-array v0, v0, [Ljava/lang/Object;
- const v1, 0x7f120fd1
+ const v1, 0x7f120fd7
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -728,7 +728,7 @@
aput-object v1, v0, v2
- const v1, 0x7f120d65
+ const v1, 0x7f120d69
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -981,7 +981,7 @@
move-result-object p1
- const v0, 0x7f121133
+ const v0, 0x7f121139
invoke-static {p1, v0}, Lcom/discord/app/g;->c(Landroid/content/Context;I)V
@@ -1275,12 +1275,12 @@
if-eqz v8, :cond_1
- const v8, 0x7f120fd3
+ const v8, 0x7f120fd9
goto :goto_1
:cond_1
- const v8, 0x7f120fd2
+ const v8, 0x7f120fd8
:goto_1
invoke-direct {v0, v6, v8}, Lcom/discord/widgets/auth/WidgetAuthRegisterInvite;->getFormattedTermsText(Landroid/content/Context;I)Ljava/lang/CharSequence;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali
index d7257532d5..beb1718fac 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali
@@ -423,7 +423,7 @@
.method private handleUpdate()V
.locals 2
- const v0, 0x7f1207a5
+ const v0, 0x7f1207a4
invoke-static {p0, v0}, Lcom/discord/app/g;->b(Landroidx/fragment/app/Fragment;I)V
@@ -717,9 +717,9 @@
.method public synthetic lambda$null$7$WidgetChannelGroupDMSettings()V
.locals 2
- const v0, 0x7f1203b2
+ const v0, 0x7f1203b1
- const v1, 0x7f121049
+ const v1, 0x7f12104f
invoke-static {p0, v0, v1}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali
index ac35b506d4..6e91ea49ab 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali
@@ -90,12 +90,12 @@
if-ne v0, v1, :cond_1
- const v0, 0x7f12044f
+ const v0, 0x7f12044e
goto :goto_0
:cond_1
- const v0, 0x7f120450
+ const v0, 0x7f12044f
:goto_0
invoke-virtual {p0, v0}, Lcom/discord/widgets/channels/WidgetCreateChannel;->setActionBarTitle(I)Lkotlin/Unit;
@@ -946,12 +946,12 @@
if-ne v1, v2, :cond_4
- const v1, 0x7f120d67
+ const v1, 0x7f120d6b
goto :goto_1
:cond_4
- const v1, 0x7f120d69
+ const v1, 0x7f120d6d
:goto_1
invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -962,12 +962,12 @@
if-ne v1, v2, :cond_5
- const v1, 0x7f120d68
+ const v1, 0x7f120d6c
goto :goto_2
:cond_5
- const v1, 0x7f120d6a
+ const v1, 0x7f120d6e
:goto_2
invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -978,12 +978,12 @@
if-ne v1, v2, :cond_6
- const v1, 0x7f1205c0
+ const v1, 0x7f1205bf
goto :goto_3
:cond_6
- const v1, 0x7f1205c3
+ const v1, 0x7f1205c2
:goto_3
invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -999,7 +999,7 @@
goto :goto_4
:cond_7
- const v1, 0x7f1205c1
+ const v1, 0x7f1205c0
:goto_4
invoke-virtual {p0, v1}, Lcom/discord/widgets/channels/WidgetCreateChannel;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1.smali
index c320895b93..1fdd6f1d88 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$configureUI$1.smali
@@ -82,7 +82,7 @@
check-cast p1, Landroidx/fragment/app/Fragment;
- const p2, 0x7f120795
+ const p2, 0x7f120794
invoke-static {p1, p2}, Lcom/discord/app/g;->a(Landroidx/fragment/app/Fragment;I)V
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$1.smali
index 8c382b7e10..84ae1df823 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends$setupFAB$1.smali
@@ -43,7 +43,7 @@
move-result-object p1
- const v0, 0x7f120795
+ const v0, 0x7f120794
invoke-static {p1, v0}, Lcom/discord/app/g;->c(Landroid/content/Context;I)V
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali
index f89fa53203..55a172a576 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali
@@ -615,7 +615,7 @@
if-nez p1, :cond_0
- const p1, 0x7f12078f
+ const p1, 0x7f12078e
invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->getString(I)Ljava/lang/String;
@@ -835,7 +835,7 @@
aput-object v2, v1, v3
- const v2, 0x7f1207a0
+ const v2, 0x7f12079f
invoke-virtual {p0, v2, v1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -869,7 +869,7 @@
if-lt v1, v2, :cond_0
- const p1, 0x7f120794
+ const p1, 0x7f120793
invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->getString(I)Ljava/lang/String;
@@ -928,7 +928,7 @@
:cond_1
if-nez v2, :cond_2
- const p1, 0x7f12079f
+ const p1, 0x7f12079e
invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali
index 9fbc306d6f..58c0de8cbe 100644
--- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali
+++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali
@@ -951,13 +951,13 @@
move-result v3
- const v4, 0x7f1205c1
+ const v4, 0x7f1205c0
const v5, 0x7f12036a
if-eqz v3, :cond_4
- const v3, 0x7f1205c1
+ const v3, 0x7f1205c0
goto :goto_2
@@ -1480,12 +1480,12 @@
if-eqz v5, :cond_0
- const v5, 0x7f1204ac
+ const v5, 0x7f1204ab
goto :goto_0
:cond_0
- const v5, 0x7f1204ab
+ const v5, 0x7f1204aa
:goto_0
invoke-virtual {v2, v5}, Landroid/widget/TextView;->setText(I)V
@@ -1510,7 +1510,7 @@
invoke-static {v3, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
- const v0, 0x7f1204ad
+ const v0, 0x7f1204ac
const/4 v2, 0x1
@@ -2012,7 +2012,7 @@
move-result-object p1
- const v0, 0x7f120625
+ const v0, 0x7f120624
invoke-virtual {p0, v0}, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getPrivateChannelList$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getPrivateChannelList$1.smali
index 7214970061..69c6b9dfe7 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getPrivateChannelList$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getPrivateChannelList$1.smali
@@ -285,7 +285,7 @@
const-wide/16 v7, 0x0
- const v9, 0x7f1204d1
+ const v9, 0x7f1204d0
const/4 v10, 0x0
@@ -333,25 +333,31 @@
move-result-object v0
:goto_6
- move-object v3, v0
-
- new-instance v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;
+ new-instance v1, Lcom/discord/widgets/channels/list/WidgetChannelListModel;
const/4 v2, 0x0
- const/4 v4, 0x0
+ const/4 v3, 0x0
+
+ const/4 v4, 0x4
const/4 v5, 0x0
- const/16 v6, 0xc
+ move-object p1, v1
- const/4 v7, 0x0
+ move-object p2, v2
- move-object v1, v0
+ move-object/from16 p3, v0
- invoke-direct/range {v1 .. v7}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ move/from16 p4, v3
- return-object v0
+ move/from16 p5, v4
+
+ move-object/from16 p6, v5
+
+ invoke-direct/range {p1 .. p6}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+
+ return-object v1
.end method
.method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getSelectedGuildChannelList$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getSelectedGuildChannelList$1.smali
index 4d5a4d077d..c49a4177af 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getSelectedGuildChannelList$1.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion$getSelectedGuildChannelList$1.smali
@@ -168,13 +168,9 @@
move-result-object v2
- invoke-virtual/range {p1 .. p1}, Lcom/discord/utilities/channel/GuildChannelsInfo;->isVerifiedServer()Z
+ const/4 v3, 0x1
- move-result v3
-
- const/4 v4, 0x1
-
- invoke-direct {v1, v2, v0, v4, v3}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZZ)V
+ invoke-direct {v1, v2, v0, v3}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;Z)V
return-object v1
.end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion.smali
index 039f464584..5897b41fb8 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel$Companion.smali
@@ -146,7 +146,7 @@
move-result-object p1
- const-string p2, "Observable\n .co\u2026rifiedServer)\n }"
+ const-string p2, "Observable\n .co\u2026ected = true)\n }"
invoke-static {p1, p2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel.smali
index c9396b0cde..f3fa3bb7f6 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListModel.smali
@@ -19,8 +19,6 @@
# instance fields
.field private final isGuildSelected:Z
-.field private final isVerifiedServer:Z
-
.field private final items:Ljava/util/List;
.annotation system Ldalvik/annotation/Signature;
value = {
@@ -49,7 +47,7 @@
return-void
.end method
-.method public constructor (Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZZ)V
+.method public constructor (Lcom/discord/models/domain/ModelGuild;Ljava/util/List;Z)V
.locals 1
.annotation system Ldalvik/annotation/Signature;
value = {
@@ -58,7 +56,7 @@
"Ljava/util/List<",
"+",
"Lcom/discord/widgets/channels/list/items/ChannelListItem;",
- ">;ZZ)V"
+ ">;Z)V"
}
.end annotation
@@ -74,67 +72,49 @@
iput-boolean p3, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isGuildSelected:Z
- iput-boolean p4, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isVerifiedServer:Z
-
return-void
.end method
-.method public synthetic constructor (Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZZILkotlin/jvm/internal/DefaultConstructorMarker;)V
- .locals 1
+.method public synthetic constructor (Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ .locals 0
- and-int/lit8 p6, p5, 0x4
+ and-int/lit8 p4, p4, 0x4
- const/4 v0, 0x0
-
- if-eqz p6, :cond_0
+ if-eqz p4, :cond_0
const/4 p3, 0x0
:cond_0
- and-int/lit8 p5, p5, 0x8
-
- if-eqz p5, :cond_1
-
- const/4 p4, 0x0
-
- :cond_1
- invoke-direct {p0, p1, p2, p3, p4}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZZ)V
+ invoke-direct {p0, p1, p2, p3}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;Z)V
return-void
.end method
-.method public static synthetic copy$default(Lcom/discord/widgets/channels/list/WidgetChannelListModel;Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZZILjava/lang/Object;)Lcom/discord/widgets/channels/list/WidgetChannelListModel;
+.method public static synthetic copy$default(Lcom/discord/widgets/channels/list/WidgetChannelListModel;Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZILjava/lang/Object;)Lcom/discord/widgets/channels/list/WidgetChannelListModel;
.locals 0
- and-int/lit8 p6, p5, 0x1
+ and-int/lit8 p5, p4, 0x1
- if-eqz p6, :cond_0
+ if-eqz p5, :cond_0
iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->selectedGuild:Lcom/discord/models/domain/ModelGuild;
:cond_0
- and-int/lit8 p6, p5, 0x2
+ and-int/lit8 p5, p4, 0x2
- if-eqz p6, :cond_1
+ if-eqz p5, :cond_1
iget-object p2, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->items:Ljava/util/List;
:cond_1
- and-int/lit8 p6, p5, 0x4
+ and-int/lit8 p4, p4, 0x4
- if-eqz p6, :cond_2
+ if-eqz p4, :cond_2
iget-boolean p3, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isGuildSelected:Z
:cond_2
- and-int/lit8 p5, p5, 0x8
-
- if-eqz p5, :cond_3
-
- iget-boolean p4, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isVerifiedServer:Z
-
- :cond_3
- invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->copy(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZZ)Lcom/discord/widgets/channels/list/WidgetChannelListModel;
+ invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->copy(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;Z)Lcom/discord/widgets/channels/list/WidgetChannelListModel;
move-result-object p0
@@ -175,15 +155,7 @@
return v0
.end method
-.method public final component4()Z
- .locals 1
-
- iget-boolean v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isVerifiedServer:Z
-
- return v0
-.end method
-
-.method public final copy(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZZ)Lcom/discord/widgets/channels/list/WidgetChannelListModel;
+.method public final copy(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;Z)Lcom/discord/widgets/channels/list/WidgetChannelListModel;
.locals 1
.annotation system Ldalvik/annotation/Signature;
value = {
@@ -192,7 +164,7 @@
"Ljava/util/List<",
"+",
"Lcom/discord/widgets/channels/list/items/ChannelListItem;",
- ">;ZZ)",
+ ">;Z)",
"Lcom/discord/widgets/channels/list/WidgetChannelListModel;"
}
.end annotation
@@ -203,7 +175,7 @@
new-instance v0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;
- invoke-direct {v0, p1, p2, p3, p4}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;ZZ)V
+ invoke-direct {v0, p1, p2, p3}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->(Lcom/discord/models/domain/ModelGuild;Ljava/util/List;Z)V
return-object v0
.end method
@@ -213,13 +185,13 @@
const/4 v0, 0x1
- if-eq p0, p1, :cond_3
+ if-eq p0, p1, :cond_2
instance-of v1, p1, Lcom/discord/widgets/channels/list/WidgetChannelListModel;
const/4 v2, 0x0
- if-eqz v1, :cond_2
+ if-eqz v1, :cond_1
check-cast p1, Lcom/discord/widgets/channels/list/WidgetChannelListModel;
@@ -231,7 +203,7 @@
move-result v1
- if-eqz v1, :cond_2
+ if-eqz v1, :cond_1
iget-object v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->items:Ljava/util/List;
@@ -241,47 +213,31 @@
move-result v1
- if-eqz v1, :cond_2
+ if-eqz v1, :cond_1
iget-boolean v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isGuildSelected:Z
- iget-boolean v3, p1, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isGuildSelected:Z
+ iget-boolean p1, p1, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isGuildSelected:Z
- if-ne v1, v3, :cond_0
+ if-ne v1, p1, :cond_0
- const/4 v1, 0x1
+ const/4 p1, 0x1
goto :goto_0
:cond_0
- const/4 v1, 0x0
+ const/4 p1, 0x0
:goto_0
- if-eqz v1, :cond_2
-
- iget-boolean v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isVerifiedServer:Z
-
- iget-boolean p1, p1, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isVerifiedServer:Z
-
- if-ne v1, p1, :cond_1
-
- const/4 p1, 0x1
+ if-eqz p1, :cond_1
goto :goto_1
:cond_1
- const/4 p1, 0x0
-
- :goto_1
- if-eqz p1, :cond_2
-
- goto :goto_2
-
- :cond_2
return v2
- :cond_3
- :goto_2
+ :cond_2
+ :goto_1
return v0
.end method
@@ -345,8 +301,6 @@
iget-boolean v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isGuildSelected:Z
- const/4 v2, 0x1
-
if-eqz v1, :cond_2
const/4 v1, 0x1
@@ -354,17 +308,6 @@
:cond_2
add-int/2addr v0, v1
- mul-int/lit8 v0, v0, 0x1f
-
- iget-boolean v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isVerifiedServer:Z
-
- if-eqz v1, :cond_3
-
- const/4 v1, 0x1
-
- :cond_3
- add-int/2addr v0, v1
-
return v0
.end method
@@ -376,14 +319,6 @@
return v0
.end method
-.method public final isVerifiedServer()Z
- .locals 1
-
- iget-boolean v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isVerifiedServer:Z
-
- return v0
-.end method
-
.method public final toString()Ljava/lang/String;
.locals 2
@@ -413,14 +348,6 @@
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
- const-string v1, ", isVerifiedServer="
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
-
- iget-boolean v1, p0, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isVerifiedServer:Z
-
- invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
-
const-string v1, ")"
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$2.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$2.smali
index ec95018d8b..899cd90c87 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$2.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$configureUI$2.smali
@@ -28,18 +28,18 @@
# instance fields
-.field final synthetic $list:Lcom/discord/widgets/channels/list/WidgetChannelListModel;
+.field final synthetic $guild:Lcom/discord/models/domain/ModelGuild;
.field final synthetic this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
# direct methods
-.method constructor (Lcom/discord/widgets/channels/list/WidgetChannelsList;Lcom/discord/widgets/channels/list/WidgetChannelListModel;)V
+.method constructor (Lcom/discord/widgets/channels/list/WidgetChannelsList;Lcom/discord/models/domain/ModelGuild;)V
.locals 0
iput-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
- iput-object p2, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;->$list:Lcom/discord/widgets/channels/list/WidgetChannelListModel;
+ iput-object p2, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;->$guild:Lcom/discord/models/domain/ModelGuild;
const/4 p1, 0x1
@@ -105,13 +105,9 @@
iget-object p1, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;->this$0:Lcom/discord/widgets/channels/list/WidgetChannelsList;
- iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;->$list:Lcom/discord/widgets/channels/list/WidgetChannelListModel;
+ iget-object v0, p0, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;->$guild:Lcom/discord/models/domain/ModelGuild;
- invoke-virtual {v0}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isVerifiedServer()Z
-
- move-result v0
-
- invoke-static {p1, v0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->access$configureHeaderIcons(Lcom/discord/widgets/channels/list/WidgetChannelsList;Z)V
+ invoke-static {p1, v0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->access$configureHeaderIcons(Lcom/discord/widgets/channels/list/WidgetChannelsList;Lcom/discord/models/domain/ModelGuild;)V
:cond_0
return-void
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 3ea6bdc2aa..64d451518a 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList.smali
@@ -310,10 +310,10 @@
return-void
.end method
-.method public static final synthetic access$configureHeaderIcons(Lcom/discord/widgets/channels/list/WidgetChannelsList;Z)V
+.method public static final synthetic access$configureHeaderIcons(Lcom/discord/widgets/channels/list/WidgetChannelsList;Lcom/discord/models/domain/ModelGuild;)V
.locals 0
- invoke-direct {p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->configureHeaderIcons(Z)V
+ invoke-direct {p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->configureHeaderIcons(Lcom/discord/models/domain/ModelGuild;)V
return-void
.end method
@@ -362,14 +362,16 @@
return-void
.end method
-.method private final configureHeaderIcons(Z)V
- .locals 14
+.method private final configureHeaderIcons(Lcom/discord/models/domain/ModelGuild;)V
+ .locals 7
- if-eqz p1, :cond_1
+ if-eqz p1, :cond_10
- invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getChannelsHeader()Landroid/widget/TextView;
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->isVerifiedServer()Z
- move-result-object v0
+ move-result v0
+
+ if-eqz v0, :cond_1
invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getAppBarLayout()Lcom/discord/views/CustomAppBarLayout;
@@ -381,21 +383,249 @@
if-eqz p1, :cond_0
- const p1, 0x7f080324
+ const p1, 0x7f08032f
- const v1, 0x7f080324
+ const v1, 0x7f08032f
+
+ goto/16 :goto_4
+
+ :cond_0
+ const p1, 0x7f080330
+
+ const v1, 0x7f080330
+
+ goto/16 :goto_4
+
+ :cond_1
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->isPartneredServer()Z
+
+ move-result v0
+
+ if-eqz v0, :cond_3
+
+ invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getAppBarLayout()Lcom/discord/views/CustomAppBarLayout;
+
+ move-result-object p1
+
+ invoke-virtual {p1}, Lcom/discord/views/CustomAppBarLayout;->isCollapsed()Z
+
+ move-result p1
+
+ if-eqz p1, :cond_2
+
+ const p1, 0x7f0802b8
+
+ const v1, 0x7f0802b8
+
+ goto/16 :goto_4
+
+ :cond_2
+ const p1, 0x7f0802b9
+
+ const v1, 0x7f0802b9
+
+ goto/16 :goto_4
+
+ :cond_3
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getPremiumTier()Ljava/lang/Integer;
+
+ move-result-object v0
+
+ if-nez v0, :cond_4
goto :goto_0
- :cond_0
- const p1, 0x7f080325
+ :cond_4
+ invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
- const v1, 0x7f080325
+ move-result v0
+ if-nez v0, :cond_7
+
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getPremiumSubscriptionCount()Ljava/lang/Integer;
+
+ move-result-object v0
+
+ if-eqz v0, :cond_7
+
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getPremiumSubscriptionCount()Ljava/lang/Integer;
+
+ move-result-object v0
+
+ if-nez v0, :cond_5
+
+ invoke-static {}, Lkotlin/jvm/internal/j;->zI()V
+
+ :cond_5
+ invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
+
+ move-result v0
+
+ if-lez v0, :cond_7
+
+ invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getAppBarLayout()Lcom/discord/views/CustomAppBarLayout;
+
+ move-result-object p1
+
+ invoke-virtual {p1}, Lcom/discord/views/CustomAppBarLayout;->isCollapsed()Z
+
+ move-result p1
+
+ if-eqz p1, :cond_6
+
+ const p1, 0x7f080251
+
+ const v1, 0x7f080251
+
+ goto/16 :goto_4
+
+ :cond_6
+ const p1, 0x7f080252
+
+ const v1, 0x7f080252
+
+ goto/16 :goto_4
+
+ :cond_7
:goto_0
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getPremiumTier()Ljava/lang/Integer;
+
+ move-result-object v0
+
+ if-nez v0, :cond_8
+
+ goto :goto_1
+
+ :cond_8
+ invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
+
+ move-result v0
+
+ const/4 v1, 0x1
+
+ if-ne v0, v1, :cond_a
+
+ invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getAppBarLayout()Lcom/discord/views/CustomAppBarLayout;
+
+ move-result-object p1
+
+ invoke-virtual {p1}, Lcom/discord/views/CustomAppBarLayout;->isCollapsed()Z
+
+ move-result p1
+
+ if-eqz p1, :cond_9
+
+ const p1, 0x7f08024b
+
+ const v1, 0x7f08024b
+
+ goto :goto_4
+
+ :cond_9
+ const p1, 0x7f08024c
+
+ const v1, 0x7f08024c
+
+ goto :goto_4
+
+ :cond_a
+ :goto_1
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getPremiumTier()Ljava/lang/Integer;
+
+ move-result-object v0
+
+ if-nez v0, :cond_b
+
+ goto :goto_2
+
+ :cond_b
+ invoke-virtual {v0}, Ljava/lang/Integer;->intValue()I
+
+ move-result v0
+
+ const/4 v1, 0x2
+
+ if-ne v0, v1, :cond_d
+
+ invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getAppBarLayout()Lcom/discord/views/CustomAppBarLayout;
+
+ move-result-object p1
+
+ invoke-virtual {p1}, Lcom/discord/views/CustomAppBarLayout;->isCollapsed()Z
+
+ move-result p1
+
+ if-eqz p1, :cond_c
+
+ const p1, 0x7f08024d
+
+ const v1, 0x7f08024d
+
+ goto :goto_4
+
+ :cond_c
+ const p1, 0x7f08024e
+
+ const v1, 0x7f08024e
+
+ goto :goto_4
+
+ :cond_d
+ :goto_2
+ invoke-virtual {p1}, Lcom/discord/models/domain/ModelGuild;->getPremiumTier()Ljava/lang/Integer;
+
+ move-result-object p1
+
+ if-nez p1, :cond_e
+
+ goto :goto_3
+
+ :cond_e
+ invoke-virtual {p1}, Ljava/lang/Integer;->intValue()I
+
+ move-result p1
+
+ const/4 v0, 0x3
+
+ if-ne p1, v0, :cond_10
+
+ invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getAppBarLayout()Lcom/discord/views/CustomAppBarLayout;
+
+ move-result-object p1
+
+ invoke-virtual {p1}, Lcom/discord/views/CustomAppBarLayout;->isCollapsed()Z
+
+ move-result p1
+
+ if-eqz p1, :cond_f
+
+ const p1, 0x7f08024f
+
+ const v1, 0x7f08024f
+
+ goto :goto_4
+
+ :cond_f
+ const p1, 0x7f080250
+
+ const v1, 0x7f080250
+
+ goto :goto_4
+
+ :cond_10
+ :goto_3
+ const/4 p1, 0x0
+
+ const/4 v1, 0x0
+
+ :goto_4
+ invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getChannelsHeader()Landroid/widget/TextView;
+
+ move-result-object v0
+
const/4 v2, 0x0
- const v3, 0x7f080362
+ const v3, 0x7f08036d
const/4 v4, 0x0
@@ -406,27 +636,6 @@
invoke-static/range {v0 .. v6}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setCompoundDrawableWithIntrinsicBounds$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
return-void
-
- :cond_1
- invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getChannelsHeader()Landroid/widget/TextView;
-
- move-result-object v7
-
- const/4 v8, 0x0
-
- const/4 v9, 0x0
-
- const v10, 0x7f080362
-
- const/4 v11, 0x0
-
- const/16 v12, 0xb
-
- const/4 v13, 0x0
-
- invoke-static/range {v7 .. v13}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setCompoundDrawableWithIntrinsicBounds$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
-
- return-void
.end method
.method private final configureUI(Lcom/discord/widgets/channels/list/WidgetChannelListModel;)V
@@ -546,27 +755,27 @@
invoke-virtual {p1}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isGuildSelected()Z
- move-result v5
+ move-result p1
- xor-int/2addr v3, v5
+ xor-int/2addr p1, v3
- invoke-static {v1, v3, v4, v6, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+ invoke-static {v1, p1, v4, v6, v2}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getChannelsHeader()Landroid/widget/TextView;
- move-result-object v1
+ move-result-object p1
- new-instance v3, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$1;
+ new-instance v1, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$1;
- invoke-direct {v3, p0, v0}, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$1;->(Lcom/discord/widgets/channels/list/WidgetChannelsList;Lcom/discord/models/domain/ModelGuild;)V
+ invoke-direct {v1, p0, v0}, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$1;->(Lcom/discord/widgets/channels/list/WidgetChannelsList;Lcom/discord/models/domain/ModelGuild;)V
- check-cast v3, Landroid/view/View$OnClickListener;
+ check-cast v1, Landroid/view/View$OnClickListener;
- invoke-virtual {v1, v3}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
+ invoke-virtual {p1, v1}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getChannelsHeader()Landroid/widget/TextView;
- move-result-object v1
+ move-result-object p1
if-eqz v0, :cond_4
@@ -577,77 +786,73 @@
:cond_4
check-cast v2, Ljava/lang/CharSequence;
- invoke-virtual {v1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
+ invoke-virtual {p1, v2}, Landroid/widget/TextView;->setText(Ljava/lang/CharSequence;)V
- invoke-virtual {p1}, Lcom/discord/widgets/channels/list/WidgetChannelListModel;->isVerifiedServer()Z
-
- move-result v1
-
- invoke-direct {p0, v1}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->configureHeaderIcons(Z)V
+ invoke-direct {p0, v0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->configureHeaderIcons(Lcom/discord/models/domain/ModelGuild;)V
if-eqz v0, :cond_5
invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getBanner()Ljava/lang/String;
- move-result-object v1
+ move-result-object p1
- if-eqz v1, :cond_5
+ if-eqz p1, :cond_5
invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getChannelsBanner()Lcom/facebook/drawee/view/SimpleDraweeView;
- move-result-object v1
+ move-result-object p1
- invoke-virtual {v1, v4}, Lcom/facebook/drawee/view/SimpleDraweeView;->setVisibility(I)V
+ invoke-virtual {p1, v4}, Lcom/facebook/drawee/view/SimpleDraweeView;->setVisibility(I)V
invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getChannelsBanner()Lcom/facebook/drawee/view/SimpleDraweeView;
- move-result-object v1
+ move-result-object p1
- sget-object v2, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
+ sget-object v1, Lcom/discord/utilities/icon/IconUtils;->INSTANCE:Lcom/discord/utilities/icon/IconUtils;
invoke-virtual {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getResources()Landroid/content/res/Resources;
- move-result-object v3
+ move-result-object v2
- const v4, 0x7f070104
+ const v3, 0x7f070104
- invoke-virtual {v3, v4}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
+ invoke-virtual {v2, v3}, Landroid/content/res/Resources;->getDimensionPixelSize(I)I
- move-result v3
+ move-result v2
- invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
+ invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
- move-result-object v3
+ move-result-object v2
- invoke-virtual {v2, v0, v3}, Lcom/discord/utilities/icon/IconUtils;->getBannerForGuild(Lcom/discord/models/domain/ModelGuild;Ljava/lang/Integer;)Ljava/lang/String;
+ invoke-virtual {v1, v0, v2}, Lcom/discord/utilities/icon/IconUtils;->getBannerForGuild(Lcom/discord/models/domain/ModelGuild;Ljava/lang/Integer;)Ljava/lang/String;
- move-result-object v0
+ move-result-object v1
- invoke-virtual {v1, v0}, Lcom/facebook/drawee/view/SimpleDraweeView;->setImageURI(Ljava/lang/String;)V
+ invoke-virtual {p1, v1}, Lcom/facebook/drawee/view/SimpleDraweeView;->setImageURI(Ljava/lang/String;)V
goto :goto_2
:cond_5
invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getChannelsBanner()Lcom/facebook/drawee/view/SimpleDraweeView;
- move-result-object v0
+ move-result-object p1
const/16 v1, 0x8
- invoke-virtual {v0, v1}, Lcom/facebook/drawee/view/SimpleDraweeView;->setVisibility(I)V
+ invoke-virtual {p1, v1}, Lcom/facebook/drawee/view/SimpleDraweeView;->setVisibility(I)V
:goto_2
invoke-direct {p0}, Lcom/discord/widgets/channels/list/WidgetChannelsList;->getAppBarLayout()Lcom/discord/views/CustomAppBarLayout;
- move-result-object v0
+ move-result-object p1
new-instance v1, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;
- invoke-direct {v1, p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;->(Lcom/discord/widgets/channels/list/WidgetChannelsList;Lcom/discord/widgets/channels/list/WidgetChannelListModel;)V
+ invoke-direct {v1, p0, v0}, Lcom/discord/widgets/channels/list/WidgetChannelsList$configureUI$2;->(Lcom/discord/widgets/channels/list/WidgetChannelsList;Lcom/discord/models/domain/ModelGuild;)V
check-cast v1, Lkotlin/jvm/functions/Function1;
- invoke-virtual {v0, v1}, Lcom/discord/views/CustomAppBarLayout;->setOnPercentCollapsedCallback(Lkotlin/jvm/functions/Function1;)V
+ invoke-virtual {p1, v1}, Lcom/discord/views/CustomAppBarLayout;->setOnPercentCollapsedCallback(Lkotlin/jvm/functions/Function1;)V
return-void
.end method
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader.smali
index eb1267abe8..237fbab893 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader.smali
@@ -188,13 +188,13 @@
if-eq p1, v0, :cond_2
- const p2, 0x7f120fd9
+ const p2, 0x7f120fdf
const/4 v0, 0x0
if-eq p1, p2, :cond_1
- const p2, 0x7f12117e
+ const p2, 0x7f121184
if-eq p1, p2, :cond_0
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA.smali
index 9657b34563..3ae9d0dd27 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemMFA.smali
@@ -117,7 +117,7 @@
.method private final getLearnMoreFormattedString(Landroid/content/Context;Ljava/lang/String;)Ljava/lang/CharSequence;
.locals 3
- const v0, 0x7f12102b
+ const v0, 0x7f121031
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model.smali
index 132c647f0a..0ee9fec08b 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions$Model.smali
@@ -331,7 +331,7 @@
if-eqz v0, :cond_0
- const v0, 0x7f12105b
+ const v0, 0x7f121061
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali
index 7c2f1baae9..f795122fde 100644
--- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali
+++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali
@@ -916,7 +916,7 @@
if-eqz p2, :cond_0
- const p1, 0x7f12051e
+ const p1, 0x7f12051d
goto :goto_0
@@ -940,12 +940,12 @@
if-eqz p1, :cond_2
- const p1, 0x7f12051d
+ const p1, 0x7f12051c
goto :goto_0
:cond_2
- const p1, 0x7f120dff
+ const p1, 0x7f120e03
:goto_0
invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/list/WidgetChannelsListItemChannelActions;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember$bind$3.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember$bind$3.smali
index 6cd049fe37..0d9532b581 100644
--- a/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember$bind$3.smali
+++ b/com.discord/smali/com/discord/widgets/channels/memberlist/adapter/ChannelMembersListViewHolderMember$bind$3.smali
@@ -67,7 +67,7 @@
move-result-object p1
- const v2, 0x7f120d00
+ const v2, 0x7f120cfe
const/4 v3, 0x1
diff --git a/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$3.smali b/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$3.smali
index da606ee29c..35a63a7f2f 100644
--- a/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$3.smali
+++ b/com.discord/smali/com/discord/widgets/chat/WidgetUrlActions$onViewCreated$3.smali
@@ -55,7 +55,7 @@
iget-object v1, p0, Lcom/discord/widgets/chat/WidgetUrlActions$onViewCreated$3;->this$0:Lcom/discord/widgets/chat/WidgetUrlActions;
- const v2, 0x7f120619
+ const v2, 0x7f120618
invoke-virtual {v1, v2}, Lcom/discord/widgets/chat/WidgetUrlActions;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$Model$Companion.smali b/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$Model$Companion.smali
index a526868f8d..daa8fca648 100644
--- a/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/chat/detached/WidgetChatDetached$Model$Companion.smali
@@ -72,7 +72,7 @@
invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable;
+ invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationLatest(Lrx/Observable;)Lrx/Observable;
move-result-object v0
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordCameraFragment.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordCameraFragment.smali
index ed2d553cd5..dc4235e39b 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordCameraFragment.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordCameraFragment.smali
@@ -66,7 +66,7 @@
new-array v1, v1, [Ljava/lang/Object;
- const v2, 0x7f120fca
+ const v2, 0x7f120fd0
invoke-virtual {v0, v2, v1}, Lcom/discord/app/AppTextView;->a(I[Ljava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$PermissionsEmptyListAdapter.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$PermissionsEmptyListAdapter.smali
index 1243dce606..69d6e902d9 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$PermissionsEmptyListAdapter.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$PermissionsEmptyListAdapter.smali
@@ -74,7 +74,7 @@
new-array v0, v0, [Ljava/lang/Object;
- const v1, 0x7f120fcb
+ const v1, 0x7f120fd1
invoke-virtual {p2, v1, v0}, Lcom/discord/app/AppTextView;->a(I[Ljava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments.smali
index 381ba798e7..fb2ac71854 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments.smali
@@ -235,7 +235,7 @@
new-instance v5, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$1;
- const v6, 0x7f080261
+ const v6, 0x7f080269
const v7, 0x7f12026f
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali
index eb23785ea8..5731519477 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali
@@ -99,7 +99,7 @@
if-eqz p2, :cond_0
- const p1, 0x7f1204ff
+ const p1, 0x7f1204fe
invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -123,7 +123,7 @@
move-result-object p1
- const p2, 0x7f120fdc
+ const p2, 0x7f120fe2
invoke-virtual {p0, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -784,7 +784,7 @@
return-object p1
:cond_0
- const v0, 0x7f121162
+ const v0, 0x7f121168
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -793,7 +793,7 @@
return-object p1
:cond_1
- const v0, 0x7f121158
+ const v0, 0x7f12115e
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$2$1.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$2$1.smali
index 506587a37e..905b088aee 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$2$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$2$1.smali
@@ -142,7 +142,7 @@
iget-object v0, p0, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$1$2$1;->$appActivity:Lcom/discord/app/AppActivity;
- const v3, 0x7f120d57
+ const v3, 0x7f120d5b
invoke-virtual {v0, v3}, Lcom/discord/app/AppActivity;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5.smali
index 4dd18144b7..a6fae16b35 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5.smali
@@ -106,7 +106,7 @@
iget-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5;->$sendMessageError$2:Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2;
- const p2, 0x7f120528
+ const p2, 0x7f120527
invoke-virtual {p1, p2}, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2;->invoke(I)Z
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderItem.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderItem.smali
index 114e4a285e..d59b2540c8 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderItem.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiAdapter$HeaderItem.smali
@@ -95,57 +95,57 @@
packed-switch p1, :pswitch_data_0
- const p1, 0x7f120f4c
+ const p1, 0x7f120f51
return p1
:pswitch_0
- const p1, 0x7f120538
+ const p1, 0x7f120537
return p1
:pswitch_1
- const p1, 0x7f120532
-
- return p1
-
- :pswitch_2
- const p1, 0x7f120533
-
- return p1
-
- :pswitch_3
- const p1, 0x7f120539
-
- return p1
-
- :pswitch_4
- const p1, 0x7f120536
-
- return p1
-
- :pswitch_5
- const p1, 0x7f12053a
-
- return p1
-
- :pswitch_6
const p1, 0x7f120531
return p1
- :pswitch_7
- const p1, 0x7f120534
+ :pswitch_2
+ const p1, 0x7f120532
return p1
- :pswitch_8
+ :pswitch_3
+ const p1, 0x7f120538
+
+ return p1
+
+ :pswitch_4
const p1, 0x7f120535
return p1
+ :pswitch_5
+ const p1, 0x7f120539
+
+ return p1
+
+ :pswitch_6
+ const p1, 0x7f120530
+
+ return p1
+
+ :pswitch_7
+ const p1, 0x7f120533
+
+ return p1
+
+ :pswitch_8
+ const p1, 0x7f120534
+
+ return p1
+
:pswitch_9
- const p1, 0x7f120537
+ const p1, 0x7f120536
return p1
diff --git a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker.smali b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker.smali
index 553c181456..8e1b8379ac 100644
--- a/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker.smali
+++ b/com.discord/smali/com/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker.smali
@@ -1046,12 +1046,12 @@
:cond_1
if-eqz v1, :cond_2
- const v0, 0x7f120d4b
+ const v0, 0x7f120d4f
goto :goto_0
:cond_2
- const v0, 0x7f120d51
+ const v0, 0x7f120d55
:goto_0
invoke-virtual {p0, v0}, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;->getString(I)Ljava/lang/String;
@@ -1060,12 +1060,12 @@
if-eqz v1, :cond_3
- const v1, 0x7f120d4c
+ const v1, 0x7f120d50
goto :goto_1
:cond_3
- const v1, 0x7f120d52
+ const v1, 0x7f120d56
:goto_1
invoke-virtual {p0, v1}, Lcom/discord/widgets/chat/input/emoji/WidgetChatInputEmojiPicker;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali
index 55beac3ee7..e2d12b4487 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatList$1.smali
@@ -47,7 +47,7 @@
if-eqz p0, :cond_0
- const v0, 0x7f120509
+ const v0, 0x7f120508
const/4 v1, 0x1
@@ -98,7 +98,7 @@
check-cast p0, Landroid/content/Context;
- const v0, 0x7f120508
+ const v0, 0x7f120507
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions$configureUI$8.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions$configureUI$8.smali
index 99ddd3f559..20745f3dde 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions$configureUI$8.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions$configureUI$8.smali
@@ -89,7 +89,7 @@
iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListActions$configureUI$8;->this$0:Lcom/discord/widgets/chat/list/WidgetChatListActions;
- const v2, 0x7f120eff
+ const v2, 0x7f120f03
invoke-virtual {v1, v2}, Lcom/discord/widgets/chat/list/WidgetChatListActions;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions.smali
index 8f03767466..8a64bc84dc 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions.smali
@@ -1116,7 +1116,7 @@
if-eqz v1, :cond_6
- const v1, 0x7f12105e
+ const v1, 0x7f121064
goto :goto_4
@@ -1653,7 +1653,7 @@
move-result-object v2
- const v3, 0x7f120db8
+ const v3, 0x7f120dbc
invoke-virtual {v0, v3}, Lcom/discord/widgets/chat/list/WidgetChatListActions;->getString(I)Ljava/lang/String;
@@ -1663,7 +1663,7 @@
invoke-static {v3, v4}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
- const v4, 0x7f120db7
+ const v4, 0x7f120dbb
invoke-virtual {v0, v4}, Lcom/discord/widgets/chat/list/WidgetChatListActions;->getString(I)Ljava/lang/String;
@@ -1673,7 +1673,7 @@
invoke-static {v4, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
- const v5, 0x7f1211c2
+ const v5, 0x7f1211c8
invoke-virtual {v0, v5}, Lcom/discord/widgets/chat/list/WidgetChatListActions;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$Data.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$Data.smali
index 2f2fc79267..c52092a710 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$Data.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$Data.smali
@@ -30,6 +30,9 @@
.end annotation
.end method
+.method public abstract getGuild()Lcom/discord/models/domain/ModelGuild;
+.end method
+
.method public abstract getGuildId()J
.end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$EmptyData.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$EmptyData.smali
index 362a094c00..558fe6d9c1 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$EmptyData.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$EmptyData.smali
@@ -31,6 +31,8 @@
.end annotation
.end field
+.field private final guild:Lcom/discord/models/domain/ModelGuild;
+
.field private final guildId:J
.field private final isSpoilerClickAllowed:Z
@@ -116,6 +118,14 @@
return-object v0
.end method
+.method public final getGuild()Lcom/discord/models/domain/ModelGuild;
+ .locals 1
+
+ iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$EmptyData;->guild:Lcom/discord/models/domain/ModelGuild;
+
+ return-object v0
+.end method
+
.method public final getGuildId()J
.locals 2
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight.smali
index 0521855216..5ab714774a 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight.smali
@@ -131,7 +131,7 @@
.end method
.method private final getNewMessageEntryIndex(Ljava/util/List;)I
- .locals 10
+ .locals 11
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
@@ -146,172 +146,203 @@
const-wide/16 v2, 0x0
- cmp-long v4, v0, v2
+ const/4 v4, 0x1
- if-lez v4, :cond_0
+ const/4 v5, 0x0
+
+ cmp-long v6, v0, v2
+
+ if-nez v6, :cond_0
+
+ const/4 v0, 0x1
goto :goto_0
:cond_0
- iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->adapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
-
- invoke-virtual {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->getData()Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;
-
- move-result-object v0
-
- invoke-interface {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;->getNewMessagesMarkerMessageId()J
-
- move-result-wide v0
+ const/4 v0, 0x0
:goto_0
- const/4 v4, -0x1
+ iget-wide v6, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->messageId:J
- cmp-long v5, v0, v2
+ cmp-long v1, v6, v2
- if-gtz v5, :cond_1
+ if-nez v1, :cond_1
- return v4
+ iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->adapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
+
+ invoke-virtual {v1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->getData()Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;
+
+ move-result-object v1
+
+ invoke-interface {v1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;->getNewMessagesMarkerMessageId()J
+
+ move-result-wide v6
:cond_1
+ const/4 v1, -0x1
+
+ cmp-long v8, v6, v2
+
+ if-gtz v8, :cond_2
+
+ return v1
+
+ :cond_2
invoke-interface {p1}, Ljava/util/List;->iterator()Ljava/util/Iterator;
move-result-object v2
const/4 v3, 0x0
- const/4 v5, 0x0
-
:goto_1
invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
- move-result v6
+ move-result v8
- const/4 v7, 0x1
-
- if-eqz v6, :cond_4
+ if-eqz v8, :cond_5
invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
- move-result-object v6
+ move-result-object v8
- check-cast v6, Lcom/discord/widgets/chat/list/entries/ChatListEntry;
+ check-cast v8, Lcom/discord/widgets/chat/list/entries/ChatListEntry;
- instance-of v8, v6, Lcom/discord/widgets/chat/list/entries/MessageEntry;
+ instance-of v9, v8, Lcom/discord/widgets/chat/list/entries/MessageEntry;
- if-eqz v8, :cond_2
+ if-eqz v9, :cond_3
- check-cast v6, Lcom/discord/widgets/chat/list/entries/MessageEntry;
+ check-cast v8, Lcom/discord/widgets/chat/list/entries/MessageEntry;
- invoke-virtual {v6}, Lcom/discord/widgets/chat/list/entries/MessageEntry;->getMessage()Lcom/discord/models/domain/ModelMessage;
+ invoke-virtual {v8}, Lcom/discord/widgets/chat/list/entries/MessageEntry;->getMessage()Lcom/discord/models/domain/ModelMessage;
- move-result-object v6
+ move-result-object v8
- invoke-virtual {v6}, Lcom/discord/models/domain/ModelMessage;->getId()J
+ invoke-virtual {v8}, Lcom/discord/models/domain/ModelMessage;->getId()J
move-result-wide v8
- cmp-long v6, v8, v0
+ cmp-long v10, v8, v6
- if-nez v6, :cond_2
+ if-nez v10, :cond_3
- const/4 v6, 0x1
+ const/4 v8, 0x1
goto :goto_2
- :cond_2
- const/4 v6, 0x0
+ :cond_3
+ const/4 v8, 0x0
:goto_2
- if-eqz v6, :cond_3
-
- move v4, v5
+ if-eqz v8, :cond_4
goto :goto_3
- :cond_3
- add-int/lit8 v5, v5, 0x1
+ :cond_4
+ add-int/lit8 v3, v3, 0x1
goto :goto_1
- :cond_4
- :goto_3
- invoke-static {v4, v3}, Lkotlin/ranges/b;->Z(II)Lkotlin/ranges/IntProgression;
-
- move-result-object v2
-
- check-cast v2, Ljava/lang/Iterable;
-
- invoke-interface {v2}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
-
- move-result-object v2
-
:cond_5
- invoke-interface {v2}, Ljava/util/Iterator;->hasNext()Z
+ const/4 v3, -0x1
- move-result v5
+ :goto_3
+ if-gez v3, :cond_7
- if-eqz v5, :cond_7
+ if-eqz v0, :cond_7
- invoke-interface {v2}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+ invoke-static {p1}, Lkotlin/a/l;->W(Ljava/util/List;)I
- move-result-object v5
+ move-result v0
- move-object v6, v5
+ const/16 v2, 0xa
- check-cast v6, Ljava/lang/Number;
+ if-ge v0, v2, :cond_6
- invoke-virtual {v6}, Ljava/lang/Number;->intValue()I
+ return v1
- move-result v6
+ :cond_6
+ invoke-static {p1}, Lkotlin/a/l;->W(Ljava/util/List;)I
- invoke-interface {p1, v6}, Ljava/util/List;->get(I)Ljava/lang/Object;
+ move-result v3
- move-result-object v6
+ :cond_7
+ invoke-static {v3, v5}, Lkotlin/ranges/b;->Z(II)Lkotlin/ranges/IntProgression;
- check-cast v6, Lcom/discord/widgets/chat/list/entries/ChatListEntry;
+ move-result-object v0
- instance-of v8, v6, Lcom/discord/widgets/chat/list/entries/NewMessagesEntry;
+ check-cast v0, Ljava/lang/Iterable;
- if-eqz v8, :cond_6
+ invoke-interface {v0}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator;
- check-cast v6, Lcom/discord/widgets/chat/list/entries/NewMessagesEntry;
+ move-result-object v0
- invoke-virtual {v6}, Lcom/discord/widgets/chat/list/entries/NewMessagesEntry;->getMessageId()J
+ :cond_8
+ invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z
+
+ move-result v1
+
+ if-eqz v1, :cond_a
+
+ invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object;
+
+ move-result-object v1
+
+ move-object v2, v1
+
+ check-cast v2, Ljava/lang/Number;
+
+ invoke-virtual {v2}, Ljava/lang/Number;->intValue()I
+
+ move-result v2
+
+ invoke-interface {p1, v2}, Ljava/util/List;->get(I)Ljava/lang/Object;
+
+ move-result-object v2
+
+ check-cast v2, Lcom/discord/widgets/chat/list/entries/ChatListEntry;
+
+ instance-of v8, v2, Lcom/discord/widgets/chat/list/entries/NewMessagesEntry;
+
+ if-eqz v8, :cond_9
+
+ check-cast v2, Lcom/discord/widgets/chat/list/entries/NewMessagesEntry;
+
+ invoke-virtual {v2}, Lcom/discord/widgets/chat/list/entries/NewMessagesEntry;->getMessageId()J
move-result-wide v8
- cmp-long v6, v8, v0
+ cmp-long v2, v8, v6
- if-nez v6, :cond_6
+ if-nez v2, :cond_9
- const/4 v6, 0x1
+ const/4 v2, 0x1
goto :goto_4
- :cond_6
- const/4 v6, 0x0
+ :cond_9
+ const/4 v2, 0x0
:goto_4
- if-eqz v6, :cond_5
+ if-eqz v2, :cond_8
goto :goto_5
- :cond_7
- const/4 v5, 0x0
+ :cond_a
+ const/4 v1, 0x0
:goto_5
- check-cast v5, Ljava/lang/Integer;
+ check-cast v1, Ljava/lang/Integer;
- if-eqz v5, :cond_8
+ if-eqz v1, :cond_b
- invoke-virtual {v5}, Ljava/lang/Integer;->intValue()I
+ invoke-virtual {v1}, Ljava/lang/Integer;->intValue()I
move-result p1
return p1
- :cond_8
- return v4
+ :cond_b
+ return v3
.end method
.method private final scheduleRetry()V
@@ -404,7 +435,7 @@
.end method
.method public final run()V
- .locals 4
+ .locals 5
iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->adapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
@@ -412,6 +443,36 @@
move-result-object v0
+ instance-of v1, v0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;
+
+ const/4 v2, 0x0
+
+ if-nez v1, :cond_0
+
+ move-object v0, v2
+
+ :cond_0
+ check-cast v0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;
+
+ if-eqz v0, :cond_1
+
+ invoke-virtual {v0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->isLoadingMessages()Z
+
+ move-result v0
+
+ if-eqz v0, :cond_1
+
+ invoke-direct {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->scheduleRetry()V
+
+ return-void
+
+ :cond_1
+ iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->adapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
+
+ invoke-virtual {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->getData()Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;
+
+ move-result-object v0
+
invoke-interface {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;->getList()Ljava/util/List;
move-result-object v0
@@ -420,13 +481,13 @@
move-result v0
- if-gez v0, :cond_0
+ if-gez v0, :cond_2
invoke-direct {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->scheduleRetry()V
return-void
- :cond_0
+ :cond_2
iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->adapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
invoke-virtual {v1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->getData()Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;
@@ -443,58 +504,53 @@
instance-of v1, v1, Lcom/discord/widgets/chat/list/entries/NewMessagesEntry;
- iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->adapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
-
- invoke-virtual {v2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->getRecycler()Landroidx/recyclerview/widget/RecyclerView;
-
- move-result-object v2
-
- invoke-virtual {v2}, Landroidx/recyclerview/widget/RecyclerView;->getHeight()I
-
- move-result v2
-
- int-to-float v2, v2
-
- const/high16 v3, 0x40000000 # 2.0f
-
- div-float/2addr v2, v3
-
- float-to-int v2, v2
-
iget-object v3, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->adapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
- invoke-virtual {v3}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->getLayoutManager()Landroidx/recyclerview/widget/LinearLayoutManager;
+ invoke-virtual {v3}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->getRecycler()Landroidx/recyclerview/widget/RecyclerView;
move-result-object v3
- if-eqz v3, :cond_1
+ invoke-virtual {v3}, Landroidx/recyclerview/widget/RecyclerView;->getHeight()I
- invoke-virtual {v3, v0, v2}, Landroidx/recyclerview/widget/LinearLayoutManager;->scrollToPositionWithOffset(II)V
+ move-result v3
- invoke-virtual {v3, v0}, Landroidx/recyclerview/widget/LinearLayoutManager;->findViewByPosition(I)Landroid/view/View;
+ int-to-float v3, v3
- move-result-object v0
+ const/high16 v4, 0x40000000 # 2.0f
- goto :goto_0
+ div-float/2addr v3, v4
- :cond_1
- const/4 v0, 0x0
+ float-to-int v3, v3
- :goto_0
- if-eqz v0, :cond_3
+ iget-object v4, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->adapter:Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
- if-nez v1, :cond_2
+ invoke-virtual {v4}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->getLayoutManager()Landroidx/recyclerview/widget/LinearLayoutManager;
- invoke-direct {p0, v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->animateHighlight(Landroid/view/View;)V
+ move-result-object v4
- :cond_2
+ if-eqz v4, :cond_3
+
+ invoke-virtual {v4, v0, v3}, Landroidx/recyclerview/widget/LinearLayoutManager;->scrollToPositionWithOffset(II)V
+
+ invoke-virtual {v4, v0}, Landroidx/recyclerview/widget/LinearLayoutManager;->findViewByPosition(I)Landroid/view/View;
+
+ move-result-object v2
+
+ :cond_3
+ if-eqz v2, :cond_5
+
+ if-nez v1, :cond_4
+
+ invoke-direct {p0, v2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->animateHighlight(Landroid/view/View;)V
+
+ :cond_4
iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->onCompleted:Lkotlin/jvm/functions/Function0;
invoke-interface {v0}, Lkotlin/jvm/functions/Function0;->invoke()Ljava/lang/Object;
return-void
- :cond_3
+ :cond_5
invoke-direct {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$ScrollToWithHighlight;->scheduleRetry()V
return-void
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 83f71d8981..ccbef95a43 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali
@@ -264,7 +264,7 @@
move-result-object v0
- const v3, 0x7f120f95
+ const v3, 0x7f120f9b
new-array v2, v2, [Ljava/lang/Object;
@@ -285,7 +285,7 @@
move-result-object v0
- const v3, 0x7f120f94
+ const v3, 0x7f120f9a
new-array v2, v2, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali
index fbf28a52ef..d246365183 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali
@@ -610,7 +610,7 @@
if-eqz p1, :cond_2
- const p1, 0x7f12076f
+ const p1, 0x7f12076e
invoke-virtual {v0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -621,7 +621,7 @@
goto :goto_2
:cond_2
- const p1, 0x7f12076e
+ const p1, 0x7f12076d
invoke-virtual {v0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -636,7 +636,7 @@
move-result-object p1
- const v2, 0x7f12076b
+ const v2, 0x7f12076a
invoke-virtual {p1, v2}, Landroid/widget/TextView;->setText(I)V
@@ -666,7 +666,7 @@
const p1, 0x7f0401cd
- const v2, 0x7f0803a3
+ const v2, 0x7f0803ae
invoke-static {v0, p1, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/content/Context;II)I
@@ -734,7 +734,7 @@
move-result-object v1
- const v2, 0x7f120770
+ const v2, 0x7f12076f
invoke-virtual {v1, v2}, Lcom/discord/app/AppTextView;->setText(I)V
@@ -1060,7 +1060,7 @@
const v3, 0x7f040144
- const v12, 0x7f080398
+ const v12, 0x7f0803a3
invoke-static {v2, v3, v12}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes(Landroid/content/Context;II)I
@@ -1133,7 +1133,7 @@
if-eqz v4, :cond_7
- const v4, 0x7f120773
+ const v4, 0x7f120772
invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1144,7 +1144,7 @@
goto :goto_6
:cond_7
- const v4, 0x7f120772
+ const v4, 0x7f120771
invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1273,7 +1273,7 @@
aput-object v4, v13, v6
- const v4, 0x7f120766
+ const v4, 0x7f120765
invoke-virtual {v2, v4, v13}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -1398,7 +1398,7 @@
if-nez v3, :cond_c
- const v3, 0x7f12071e
+ const v3, 0x7f12071d
invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1427,7 +1427,7 @@
:cond_c
if-eqz v7, :cond_d
- const v3, 0x7f12074e
+ const v3, 0x7f12074d
invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1438,7 +1438,7 @@
:cond_d
if-eqz v9, :cond_e
- const v3, 0x7f12072a
+ const v3, 0x7f120729
invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1453,7 +1453,7 @@
if-eqz v3, :cond_f
- const v3, 0x7f12071d
+ const v3, 0x7f12071c
const/4 v8, 0x1
@@ -1488,7 +1488,7 @@
:cond_f
if-eqz v8, :cond_10
- const v3, 0x7f12071c
+ const v3, 0x7f12071b
invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -1562,7 +1562,7 @@
if-eqz v9, :cond_13
- const v4, 0x7f120761
+ const v4, 0x7f120760
goto :goto_b
@@ -1573,7 +1573,7 @@
if-eqz v4, :cond_14
- const v4, 0x7f120763
+ const v4, 0x7f120762
goto :goto_b
@@ -1586,12 +1586,12 @@
if-eqz v4, :cond_15
- const v4, 0x7f120764
+ const v4, 0x7f120763
goto :goto_b
:cond_15
- const v4, 0x7f120762
+ const v4, 0x7f120761
:goto_b
invoke-virtual {v3, v4}, Landroid/widget/Button;->setText(I)V
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali
index fc1b72f80b..666c2e977d 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali
@@ -312,7 +312,7 @@
check-cast v3, Landroid/view/View;
- const v6, 0x7f1211ae
+ const v6, 0x7f1211b4
new-array v7, v4, [Ljava/lang/Object;
@@ -333,7 +333,7 @@
check-cast v3, Landroid/view/View;
- const v6, 0x7f1211b3
+ const v6, 0x7f1211b9
new-array v7, v4, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali
index 31d3a1361f..f2f3da2d61 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali
@@ -671,7 +671,7 @@
move-result-object v3
- const v5, 0x7f0803af
+ const v5, 0x7f0803ba
invoke-virtual {v3, v5}, Lcom/facebook/drawee/view/SimpleDraweeView;->setActualImageResource(I)V
@@ -799,7 +799,7 @@
if-eqz v2, :cond_8
- const v3, 0x7f120452
+ const v3, 0x7f120451
invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali
index a86accaa78..6ad8111310 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali
@@ -558,7 +558,7 @@
move-result-object v5
- const v7, 0x7f1210b7
+ const v7, 0x7f1210bd
new-array v3, v3, [Ljava/lang/Object;
@@ -720,7 +720,7 @@
return-object v0
:cond_0
- const p2, 0x7f1205cc
+ const p2, 0x7f1205cb
invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemStart.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemStart.smali
index ad3ebcf92e..e5fc78cc21 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemStart.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemStart.smali
@@ -193,7 +193,7 @@
move-result-object p1
- const v3, 0x7f12105d
+ const v3, 0x7f121063
invoke-virtual {p1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1.smali
index 4ee1ec314a..d0d16b3257 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1.smali
@@ -8,7 +8,7 @@
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->getSystemMessage(Lcom/discord/models/domain/ModelMessage;Landroid/content/Context;Ljava/lang/String;Ljava/util/Map;)Ljava/lang/String;
+ value = Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->getSystemMessage(Lcom/discord/models/domain/ModelMessage;Landroid/content/Context;Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;)Ljava/lang/String;
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
@@ -32,6 +32,8 @@
.field final synthetic $context:Landroid/content/Context;
+.field final synthetic $guildName:Ljava/lang/String;
+
.field final synthetic $otherUserId:Ljava/lang/Long;
.field final synthetic $otherUserNickname:Ljava/lang/String;
@@ -40,7 +42,7 @@
# direct methods
-.method constructor (Lcom/discord/models/domain/ModelMessage;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Landroid/content/Context;)V
+.method constructor (Lcom/discord/models/domain/ModelMessage;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Landroid/content/Context;Ljava/lang/String;)V
.locals 0
iput-object p1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$this_getSystemMessage:Lcom/discord/models/domain/ModelMessage;
@@ -53,6 +55,8 @@
iput-object p5, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$context:Landroid/content/Context;
+ iput-object p6, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$guildName:Ljava/lang/String;
+
const/4 p1, 0x1
invoke-direct {p0, p1}, Lkotlin/jvm/internal/k;->(I)V
@@ -87,54 +91,228 @@
move-result v0
- const/4 v1, 0x2
+ const/4 v1, 0x3
- const/4 v2, 0x0
+ const v2, 0x7f120fc6
- const/4 v3, 0x1
+ const/4 v3, 0x2
- if-eq v0, v3, :cond_7
+ const/4 v4, 0x1
- if-eq v0, v1, :cond_4
+ const/4 v5, 0x0
- const/4 v4, 0x4
-
- if-eq v0, v4, :cond_3
-
- const/4 v1, 0x5
-
- if-eq v0, v1, :cond_2
-
- const/4 v1, 0x6
-
- if-eq v0, v1, :cond_1
-
- const/4 v1, 0x7
-
- if-eq v0, v1, :cond_0
+ packed-switch v0, :pswitch_data_0
+ :pswitch_0
const-string p1, ""
return-object p1
- :cond_0
+ :pswitch_1
+ new-array v0, v1, [Ljava/lang/Object;
+
+ iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String;
+
+ aput-object v1, v0, v5
+
+ iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$guildName:Ljava/lang/String;
+
+ aput-object v1, v0, v4
+
+ const v1, 0x7f120d01
+
+ invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+ move-result-object v1
+
+ aput-object v1, v0, v3
+
+ invoke-virtual {p1, v2, v0}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+ move-result-object p1
+
+ return-object p1
+
+ :pswitch_2
+ new-array v0, v1, [Ljava/lang/Object;
+
+ iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String;
+
+ aput-object v1, v0, v5
+
+ iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$guildName:Ljava/lang/String;
+
+ aput-object v1, v0, v4
+
+ const v1, 0x7f120d00
+
+ invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+ move-result-object v1
+
+ aput-object v1, v0, v3
+
+ invoke-virtual {p1, v2, v0}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+ move-result-object p1
+
+ return-object p1
+
+ :pswitch_3
+ new-array v0, v1, [Ljava/lang/Object;
+
+ iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String;
+
+ aput-object v1, v0, v5
+
+ iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$guildName:Ljava/lang/String;
+
+ aput-object v1, v0, v4
+
+ const v1, 0x7f120cff
+
+ invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
+
+ move-result-object v1
+
+ aput-object v1, v0, v3
+
+ invoke-virtual {p1, v2, v0}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+ move-result-object p1
+
+ return-object p1
+
+ :pswitch_4
+ const v0, 0x7f120fc5
+
+ new-array v1, v4, [Ljava/lang/Object;
+
+ iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String;
+
+ aput-object v2, v1, v5
+
+ invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+ move-result-object p1
+
+ return-object p1
+
+ :pswitch_5
iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$context:Landroid/content/Context;
iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$this_getSystemMessage:Lcom/discord/models/domain/ModelMessage;
invoke-virtual {v1}, Lcom/discord/models/domain/ModelMessage;->getId()J
- move-result-wide v4
+ move-result-wide v1
- invoke-static {v0, v4, v5}, Lcom/discord/utilities/textprocessing/MessageUtils;->getSystemMessageUserJoin(Landroid/content/Context;J)I
+ invoke-static {v0, v1, v2}, Lcom/discord/utilities/textprocessing/MessageUtils;->getSystemMessageUserJoin(Landroid/content/Context;J)I
move-result v0
+ new-array v1, v4, [Ljava/lang/Object;
+
+ iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String;
+
+ aput-object v2, v1, v5
+
+ invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+ move-result-object p1
+
+ return-object p1
+
+ :pswitch_6
+ const v0, 0x7f120fc9
+
+ new-array v1, v4, [Ljava/lang/Object;
+
+ iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String;
+
+ aput-object v2, v1, v5
+
+ invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+ move-result-object p1
+
+ return-object p1
+
+ :pswitch_7
+ const v0, 0x7f120f9c
+
+ new-array v1, v4, [Ljava/lang/Object;
+
+ iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String;
+
+ aput-object v2, v1, v5
+
+ invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+ move-result-object p1
+
+ return-object p1
+
+ :pswitch_8
+ const v0, 0x7f120f9d
+
new-array v1, v3, [Ljava/lang/Object;
- iget-object v3, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String;
+ iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String;
- aput-object v3, v1, v2
+ aput-object v2, v1, v5
+
+ iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$this_getSystemMessage:Lcom/discord/models/domain/ModelMessage;
+
+ invoke-virtual {v2}, Lcom/discord/models/domain/ModelMessage;->getContent()Ljava/lang/String;
+
+ move-result-object v2
+
+ aput-object v2, v1, v4
+
+ invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
+
+ move-result-object p1
+
+ return-object p1
+
+ :pswitch_9
+ iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$otherUserId:Ljava/lang/Long;
+
+ iget-object v1, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$this_getSystemMessage:Lcom/discord/models/domain/ModelMessage;
+
+ invoke-virtual {v1}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
+
+ move-result-object v1
+
+ const-string v2, "author"
+
+ invoke-static {v1, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+ invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
+
+ move-result-wide v1
+
+ if-nez v0, :cond_0
+
+ goto :goto_0
+
+ :cond_0
+ invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+ move-result-wide v6
+
+ cmp-long v0, v6, v1
+
+ if-nez v0, :cond_1
+
+ const v0, 0x7f120fce
+
+ new-array v1, v4, [Ljava/lang/Object;
+
+ iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String;
+
+ aput-object v2, v1, v5
invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -143,115 +321,18 @@
return-object p1
:cond_1
- const v0, 0x7f120fc3
-
- new-array v1, v3, [Ljava/lang/Object;
-
- iget-object v3, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String;
-
- aput-object v3, v1, v2
-
- invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
- move-result-object p1
-
- return-object p1
-
- :cond_2
- const v0, 0x7f120f96
-
- new-array v1, v3, [Ljava/lang/Object;
-
- iget-object v3, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String;
-
- aput-object v3, v1, v2
-
- invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
- move-result-object p1
-
- return-object p1
-
- :cond_3
- const v0, 0x7f120f97
-
- new-array v1, v1, [Ljava/lang/Object;
-
- iget-object v4, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String;
-
- aput-object v4, v1, v2
-
- iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$this_getSystemMessage:Lcom/discord/models/domain/ModelMessage;
-
- invoke-virtual {v2}, Lcom/discord/models/domain/ModelMessage;->getContent()Ljava/lang/String;
-
- move-result-object v2
-
- aput-object v2, v1, v3
-
- invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
- move-result-object p1
-
- return-object p1
-
- :cond_4
- iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$otherUserId:Ljava/lang/Long;
-
- iget-object v4, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$this_getSystemMessage:Lcom/discord/models/domain/ModelMessage;
-
- invoke-virtual {v4}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
-
- move-result-object v4
-
- const-string v5, "author"
-
- invoke-static {v4, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
- invoke-virtual {v4}, Lcom/discord/models/domain/ModelUser;->getId()J
-
- move-result-wide v4
-
- if-nez v0, :cond_5
-
- goto :goto_0
-
- :cond_5
- invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
-
- move-result-wide v6
-
- cmp-long v0, v6, v4
-
- if-nez v0, :cond_6
-
- const v0, 0x7f120fc8
-
- new-array v1, v3, [Ljava/lang/Object;
-
- iget-object v3, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String;
-
- aput-object v3, v1, v2
-
- invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
-
- move-result-object p1
-
- return-object p1
-
- :cond_6
:goto_0
- const v0, 0x7f120fc7
+ const v0, 0x7f120fcd
- new-array v1, v1, [Ljava/lang/Object;
+ new-array v1, v3, [Ljava/lang/Object;
- iget-object v4, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String;
+ iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String;
- aput-object v4, v1, v2
+ aput-object v2, v1, v5
iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$otherUserNickname:Ljava/lang/String;
- aput-object v2, v1, v3
+ aput-object v2, v1, v4
invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -259,22 +340,39 @@
return-object p1
- :cond_7
- const v0, 0x7f120fc6
+ :pswitch_a
+ const v0, 0x7f120fcc
- new-array v1, v1, [Ljava/lang/Object;
+ new-array v1, v3, [Ljava/lang/Object;
- iget-object v4, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String;
+ iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$authorName:Ljava/lang/String;
- aput-object v4, v1, v2
+ aput-object v2, v1, v5
iget-object v2, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->$otherUserNickname:Ljava/lang/String;
- aput-object v2, v1, v3
+ aput-object v2, v1, v4
invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
move-result-object p1
return-object p1
+
+ nop
+
+ :pswitch_data_0
+ .packed-switch 0x1
+ :pswitch_a
+ :pswitch_9
+ :pswitch_0
+ :pswitch_8
+ :pswitch_7
+ :pswitch_6
+ :pswitch_5
+ :pswitch_4
+ :pswitch_3
+ :pswitch_2
+ :pswitch_1
+ .end packed-switch
.end method
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 8d25d363c7..b47189f3c6 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage.smali
@@ -197,54 +197,55 @@
move-result p1
- const/4 v0, 0x1
+ const v0, 0x7f080249
- const v1, 0x7f080249
+ const v1, 0x7f080248
- if-eq p1, v0, :cond_4
+ const v2, 0x7f08032e
- const/4 v0, 0x2
+ packed-switch p1, :pswitch_data_0
- if-eq p1, v0, :cond_3
-
- const/4 v0, 0x4
-
- const v2, 0x7f080248
-
- if-eq p1, v0, :cond_2
-
- const/4 v0, 0x5
-
- if-eq p1, v0, :cond_2
-
- const/4 v0, 0x6
-
- if-eq p1, v0, :cond_1
-
- const/4 v0, 0x7
-
- if-eq p1, v0, :cond_0
-
- return v2
-
- :cond_0
+ :pswitch_0
return v1
- :cond_1
+ :pswitch_1
+ return v2
+
+ :pswitch_2
+ return v0
+
+ :pswitch_3
const p1, 0x7f0801d3
return p1
- :cond_2
- return v2
+ :pswitch_4
+ return v1
- :cond_3
+ :pswitch_5
const p1, 0x7f08024a
return p1
- :cond_4
- return v1
+ :pswitch_6
+ return v0
+
+ nop
+
+ :pswitch_data_0
+ .packed-switch 0x1
+ :pswitch_6
+ :pswitch_5
+ :pswitch_0
+ :pswitch_4
+ :pswitch_4
+ :pswitch_3
+ :pswitch_2
+ :pswitch_1
+ :pswitch_1
+ :pswitch_1
+ :pswitch_1
+ .end packed-switch
.end method
.method private final getItemText()Landroid/widget/TextView;
@@ -307,8 +308,8 @@
return-object v0
.end method
-.method private final getSystemMessage(Lcom/discord/models/domain/ModelMessage;Landroid/content/Context;Ljava/lang/String;Ljava/util/Map;)Ljava/lang/String;
- .locals 8
+.method private final getSystemMessage(Lcom/discord/models/domain/ModelMessage;Landroid/content/Context;Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;)Ljava/lang/String;
+ .locals 9
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
@@ -318,7 +319,9 @@
"Ljava/util/Map<",
"Ljava/lang/Long;",
"Ljava/lang/String;",
- ">;)",
+ ">;",
+ "Ljava/lang/String;",
+ ")",
"Ljava/lang/String;"
}
.end annotation
@@ -392,7 +395,9 @@
move-object v7, p2
- invoke-direct/range {v2 .. v7}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->(Lcom/discord/models/domain/ModelMessage;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Landroid/content/Context;)V
+ move-object v8, p5
+
+ invoke-direct/range {v2 .. v8}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->(Lcom/discord/models/domain/ModelMessage;Ljava/lang/String;Ljava/lang/String;Ljava/lang/Long;Landroid/content/Context;Ljava/lang/String;)V
invoke-virtual {p4, p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$getSystemMessage$1;->invoke(Landroid/content/Context;)Ljava/lang/String;
@@ -408,7 +413,7 @@
# virtual methods
.method protected final onConfigure(ILcom/discord/widgets/chat/list/entries/ChatListEntry;)V
- .locals 5
+ .locals 7
const-string v0, "data"
@@ -428,119 +433,151 @@
invoke-virtual {p2}, Lcom/discord/widgets/chat/list/entries/MessageEntry;->component5()Ljava/util/Map;
- move-result-object p2
+ move-result-object v4
invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser;
- move-result-object v1
+ move-result-object p2
- const-string v2, "message.author"
+ const-string v1, "message.author"
- invoke-static {v1, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-static {p2, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getId()J
+ invoke-virtual {p2}, Lcom/discord/models/domain/ModelUser;->getId()J
move-result-wide v1
invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
- move-result-object v1
+ move-result-object p2
- invoke-interface {p2, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-interface {v4, p2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
- move-result-object v1
+ move-result-object p2
- check-cast v1, Ljava/lang/String;
+ check-cast p2, Ljava/lang/String;
- const/4 v2, 0x0
+ const/4 v6, 0x0
- if-eqz v1, :cond_0
+ if-eqz p2, :cond_0
- new-instance v3, Ljava/lang/StringBuilder;
+ new-instance v1, Ljava/lang/StringBuilder;
- const-string v4, "**"
+ const-string v2, "**"
- invoke-direct {v3, v4}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V
+ invoke-direct {v1, v2}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V
- invoke-virtual {v3, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+ invoke-virtual {v1, p2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
- invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+ invoke-virtual {v1, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
- invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
+ invoke-virtual {v1}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String;
- move-result-object v1
+ move-result-object p2
+
+ move-object v3, p2
goto :goto_0
:cond_0
- move-object v1, v2
+ move-object v3, v6
:goto_0
invoke-direct {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->getItemText()Landroid/widget/TextView;
- move-result-object v3
+ move-result-object p2
- invoke-virtual {v3}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
-
- move-result-object v3
-
- const v4, 0x7f040361
-
- invoke-static {v3, v4}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
-
- move-result v3
-
- invoke-static {v0, v3}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getColor(Lcom/discord/models/domain/ModelGuildMember$Computed;I)I
-
- move-result v0
-
- invoke-direct {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->getItemText()Landroid/widget/TextView;
-
- move-result-object v3
-
- invoke-virtual {v3}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
-
- move-result-object v3
-
- const-string v4, "itemText.context"
-
- invoke-static {v3, v4}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
-
- invoke-direct {p0, p1, v3, v1, p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->getSystemMessage(Lcom/discord/models/domain/ModelMessage;Landroid/content/Context;Ljava/lang/String;Ljava/util/Map;)Ljava/lang/String;
+ invoke-virtual {p2}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
move-result-object p2
+ const v1, 0x7f040361
+
+ invoke-static {p2, v1}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I
+
+ move-result p2
+
+ invoke-static {v0, p2}, Lcom/discord/models/domain/ModelGuildMember$Computed;->getColor(Lcom/discord/models/domain/ModelGuildMember$Computed;I)I
+
+ move-result p2
+
+ iget-object v0, p0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->adapter:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter;
+
+ check-cast v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;
+
+ invoke-virtual {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter;->getData()Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;
+
+ move-result-object v0
+
+ invoke-interface {v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapter$Data;->getGuild()Lcom/discord/models/domain/ModelGuild;
+
+ move-result-object v0
+
+ if-eqz v0, :cond_1
+
+ invoke-virtual {v0}, Lcom/discord/models/domain/ModelGuild;->getName()Ljava/lang/String;
+
+ move-result-object v0
+
+ move-object v5, v0
+
+ goto :goto_1
+
+ :cond_1
+ move-object v5, v6
+
+ :goto_1
+ invoke-direct {p0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->getItemText()Landroid/widget/TextView;
+
+ move-result-object v0
+
+ invoke-virtual {v0}, Landroid/widget/TextView;->getContext()Landroid/content/Context;
+
+ move-result-object v2
+
+ const-string v0, "itemText.context"
+
+ invoke-static {v2, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+ move-object v0, p0
+
+ move-object v1, p1
+
+ invoke-direct/range {v0 .. v5}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage;->getSystemMessage(Lcom/discord/models/domain/ModelMessage;Landroid/content/Context;Ljava/lang/String;Ljava/util/Map;Ljava/lang/String;)Ljava/lang/String;
+
+ move-result-object v0
+
new-instance v1, Lcom/discord/simpleast/core/parser/Parser;
- const/4 v3, 0x0
+ const/4 v2, 0x0
- const/4 v4, 0x1
+ const/4 v3, 0x1
- invoke-direct {v1, v3, v4, v2}, Lcom/discord/simpleast/core/parser/Parser;->(ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ invoke-direct {v1, v2, v3, v6}, Lcom/discord/simpleast/core/parser/Parser;->(ZILkotlin/jvm/internal/DefaultConstructorMarker;)V
- sget-object v3, Lcom/discord/simpleast/core/a/a;->xp:Lcom/discord/simpleast/core/a/a;
+ sget-object v2, Lcom/discord/simpleast/core/a/a;->xp:Lcom/discord/simpleast/core/a/a;
invoke-static {}, Lcom/discord/simpleast/core/a/a;->ed()Ljava/util/regex/Pattern;
- move-result-object v3
+ move-result-object v2
- const-string v4, "SimpleMarkdownRules.PATTERN_BOLD"
+ const-string v3, "SimpleMarkdownRules.PATTERN_BOLD"
- invoke-static {v3, v4}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-static {v2, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
- new-instance v4, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$onConfigure$systemMessageAst$1;
+ new-instance v3, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$onConfigure$systemMessageAst$1;
- invoke-direct {v4, v0}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$onConfigure$systemMessageAst$1;->(I)V
+ invoke-direct {v3, p2}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage$onConfigure$systemMessageAst$1;->(I)V
- check-cast v4, Lkotlin/jvm/functions/Function0;
+ check-cast v3, Lkotlin/jvm/functions/Function0;
- invoke-static {v3, v4}, Lcom/discord/simpleast/core/a/a;->a(Ljava/util/regex/Pattern;Lkotlin/jvm/functions/Function0;)Lcom/discord/simpleast/core/parser/Rule;
+ invoke-static {v2, v3}, Lcom/discord/simpleast/core/a/a;->a(Ljava/util/regex/Pattern;Lkotlin/jvm/functions/Function0;)Lcom/discord/simpleast/core/parser/Rule;
- move-result-object v0
+ move-result-object p2
- invoke-virtual {v1, v0}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
+ invoke-virtual {v1, p2}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
- move-result-object v0
+ move-result-object p2
sget-object v1, Lcom/discord/simpleast/core/a/a;->xp:Lcom/discord/simpleast/core/a/a;
@@ -548,15 +585,15 @@
move-result-object v1
- invoke-virtual {v0, v1}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
+ invoke-virtual {p2, v1}, Lcom/discord/simpleast/core/parser/Parser;->addRule(Lcom/discord/simpleast/core/parser/Rule;)Lcom/discord/simpleast/core/parser/Parser;
- move-result-object v0
+ move-result-object p2
- check-cast p2, Ljava/lang/CharSequence;
+ check-cast v0, Ljava/lang/CharSequence;
const/4 v1, 0x2
- invoke-static {v0, p2, v2, v1, v2}, Lcom/discord/simpleast/core/parser/Parser;->parse$default(Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/CharSequence;Ljava/util/List;ILjava/lang/Object;)Ljava/util/List;
+ invoke-static {p2, v0, v6, v1, v6}, Lcom/discord/simpleast/core/parser/Parser;->parse$default(Lcom/discord/simpleast/core/parser/Parser;Ljava/lang/CharSequence;Ljava/util/List;ILjava/lang/Object;)Ljava/util/List;
move-result-object p2
@@ -572,15 +609,15 @@
move-result-object v1
- const-string v3, "itemTimestamp.context"
+ const-string v2, "itemTimestamp.context"
- invoke-static {v1, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-static {v1, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessage;->getTimestamp()J
- move-result-wide v3
+ move-result-wide v2
- invoke-static {v1, v3, v4}, Lcom/discord/utilities/time/TimeUtils;->toReadableTimeString(Landroid/content/Context;J)Ljava/lang/CharSequence;
+ invoke-static {v1, v2, v3}, Lcom/discord/utilities/time/TimeUtils;->toReadableTimeString(Landroid/content/Context;J)Ljava/lang/CharSequence;
move-result-object v1
@@ -592,7 +629,7 @@
check-cast p2, Ljava/util/Collection;
- invoke-static {p2, v2}, Lcom/discord/utilities/textprocessing/AstRenderer;->render(Ljava/util/Collection;Ljava/lang/Object;)Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
+ invoke-static {p2, v6}, Lcom/discord/utilities/textprocessing/AstRenderer;->render(Ljava/util/Collection;Ljava/lang/Object;)Lcom/facebook/drawee/span/DraweeSpanStringBuilder;
move-result-object p2
diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress.smali
index 05bf914144..211b89d790 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress.smali
@@ -621,7 +621,7 @@
check-cast p2, Landroid/view/View;
- const v0, 0x7f121085
+ const v0, 0x7f12108b
invoke-static {p2, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String;
@@ -648,7 +648,7 @@
const/4 v6, 0x1
- const v7, 0x7f1000af
+ const v7, 0x7f1000b3
const-string v8, "title"
diff --git a/com.discord/smali/com/discord/widgets/chat/list/model/-$$Lambda$d2LqPR2IqPtCY3Dv9sHatCJcTNs.smali b/com.discord/smali/com/discord/widgets/chat/list/model/-$$Lambda$d2LqPR2IqPtCY3Dv9sHatCJcTNs.smali
new file mode 100644
index 0000000000..6fdfdcad6c
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/chat/list/model/-$$Lambda$d2LqPR2IqPtCY3Dv9sHatCJcTNs.smali
@@ -0,0 +1,86 @@
+.class public final synthetic Lcom/discord/widgets/chat/list/model/-$$Lambda$d2LqPR2IqPtCY3Dv9sHatCJcTNs;
+.super Ljava/lang/Object;
+.source "lambda"
+
+# interfaces
+.implements Lrx/functions/Func9;
+
+
+# static fields
+.field public static final synthetic INSTANCE:Lcom/discord/widgets/chat/list/model/-$$Lambda$d2LqPR2IqPtCY3Dv9sHatCJcTNs;
+
+
+# direct methods
+.method static synthetic constructor ()V
+ .locals 1
+
+ new-instance v0, Lcom/discord/widgets/chat/list/model/-$$Lambda$d2LqPR2IqPtCY3Dv9sHatCJcTNs;
+
+ invoke-direct {v0}, Lcom/discord/widgets/chat/list/model/-$$Lambda$d2LqPR2IqPtCY3Dv9sHatCJcTNs;->()V
+
+ sput-object v0, Lcom/discord/widgets/chat/list/model/-$$Lambda$d2LqPR2IqPtCY3Dv9sHatCJcTNs;->INSTANCE:Lcom/discord/widgets/chat/list/model/-$$Lambda$d2LqPR2IqPtCY3Dv9sHatCJcTNs;
+
+ return-void
+.end method
+
+.method private synthetic constructor ()V
+ .locals 0
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public final call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ .locals 12
+
+ new-instance v11, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;
+
+ move-object v1, p1
+
+ check-cast v1, Lcom/discord/models/domain/ModelChannel;
+
+ move-object v2, p2
+
+ check-cast v2, Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop;
+
+ move-object v3, p3
+
+ check-cast v3, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;
+
+ move-object/from16 v4, p4
+
+ check-cast v4, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
+
+ move-object/from16 v5, p5
+
+ check-cast v5, Ljava/util/Map;
+
+ move-object/from16 v0, p6
+
+ check-cast v0, Ljava/lang/Long;
+
+ invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+ move-result-wide v6
+
+ move-object/from16 v8, p7
+
+ check-cast v8, Ljava/util/Map;
+
+ move-object/from16 v9, p8
+
+ check-cast v9, Lcom/discord/models/domain/ModelGuild;
+
+ move-object/from16 v10, p9
+
+ check-cast v10, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState;
+
+ move-object v0, v11
+
+ invoke-direct/range {v0 .. v10}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->(Lcom/discord/models/domain/ModelChannel;Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop;Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;Ljava/util/Map;JLjava/util/Map;Lcom/discord/models/domain/ModelGuild;Lcom/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState;)V
+
+ return-object v11
+.end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/model/-$$Lambda$dBW72U9y3fexk387210Jvq5gK5k.smali b/com.discord/smali/com/discord/widgets/chat/list/model/-$$Lambda$dBW72U9y3fexk387210Jvq5gK5k.smali
deleted file mode 100644
index ba6f7754a6..0000000000
--- a/com.discord/smali/com/discord/widgets/chat/list/model/-$$Lambda$dBW72U9y3fexk387210Jvq5gK5k.smali
+++ /dev/null
@@ -1,78 +0,0 @@
-.class public final synthetic Lcom/discord/widgets/chat/list/model/-$$Lambda$dBW72U9y3fexk387210Jvq5gK5k;
-.super Ljava/lang/Object;
-.source "lambda"
-
-# interfaces
-.implements Lrx/functions/Func7;
-
-
-# static fields
-.field public static final synthetic INSTANCE:Lcom/discord/widgets/chat/list/model/-$$Lambda$dBW72U9y3fexk387210Jvq5gK5k;
-
-
-# direct methods
-.method static synthetic constructor ()V
- .locals 1
-
- new-instance v0, Lcom/discord/widgets/chat/list/model/-$$Lambda$dBW72U9y3fexk387210Jvq5gK5k;
-
- invoke-direct {v0}, Lcom/discord/widgets/chat/list/model/-$$Lambda$dBW72U9y3fexk387210Jvq5gK5k;->()V
-
- sput-object v0, Lcom/discord/widgets/chat/list/model/-$$Lambda$dBW72U9y3fexk387210Jvq5gK5k;->INSTANCE:Lcom/discord/widgets/chat/list/model/-$$Lambda$dBW72U9y3fexk387210Jvq5gK5k;
-
- return-void
-.end method
-
-.method private synthetic constructor ()V
- .locals 0
-
- invoke-direct {p0}, Ljava/lang/Object;->()V
-
- return-void
-.end method
-
-
-# virtual methods
-.method public final call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- .locals 10
-
- new-instance v9, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;
-
- move-object v1, p1
-
- check-cast v1, Lcom/discord/models/domain/ModelChannel;
-
- move-object v2, p2
-
- check-cast v2, Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop;
-
- move-object v3, p3
-
- check-cast v3, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;
-
- move-object v4, p4
-
- check-cast v4, Ljava/util/Map;
-
- move-object v0, p5
-
- check-cast v0, Ljava/lang/Long;
-
- invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
-
- move-result-wide v5
-
- move-object/from16 v7, p6
-
- check-cast v7, Ljava/util/Map;
-
- move-object/from16 v8, p7
-
- check-cast v8, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState;
-
- move-object v0, v9
-
- invoke-direct/range {v0 .. v8}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->(Lcom/discord/models/domain/ModelChannel;Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop;Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;Ljava/util/Map;JLjava/util/Map;Lcom/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState;)V
-
- return-object v9
-.end method
diff --git a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModel.smali b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModel.smali
index 6391d69c8b..fa8a105b89 100644
--- a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModel.smali
+++ b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModel.smali
@@ -33,8 +33,15 @@
.end annotation
.end field
+.field private final guild:Lcom/discord/models/domain/ModelGuild;
+ .annotation build Landroidx/annotation/Nullable;
+ .end annotation
+.end field
+
.field private final guildId:J
+.field private final isLoadingMessages:Z
+
.field private final list:Ljava/util/List;
.annotation system Ldalvik/annotation/Signature;
value = {
@@ -65,7 +72,7 @@
# direct methods
-.method public constructor (Lcom/discord/models/domain/ModelChannel;Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop;Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;Ljava/util/Map;JLjava/util/Map;Lcom/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState;)V
+.method public constructor (Lcom/discord/models/domain/ModelChannel;Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop;Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;Ljava/util/Map;JLjava/util/Map;Lcom/discord/models/domain/ModelGuild;Lcom/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState;)V
.locals 2
.param p1 # Lcom/discord/models/domain/ModelChannel;
.annotation build Landroidx/annotation/NonNull;
@@ -79,15 +86,23 @@
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
- .param p4 # Ljava/util/Map;
+ .param p4 # Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
- .param p7 # Ljava/util/Map;
+ .param p5 # Ljava/util/Map;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
- .param p8 # Lcom/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState;
+ .param p8 # Ljava/util/Map;
+ .annotation build Landroidx/annotation/NonNull;
+ .end annotation
+ .end param
+ .param p9 # Lcom/discord/models/domain/ModelGuild;
+ .annotation build Landroidx/annotation/Nullable;
+ .end annotation
+ .end param
+ .param p10 # Lcom/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState;
.annotation build Landroidx/annotation/NonNull;
.end annotation
.end param
@@ -97,6 +112,7 @@
"Lcom/discord/models/domain/ModelChannel;",
"Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop;",
"Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;",
+ "Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;",
"Ljava/util/Map<",
"Ljava/lang/Long;",
"Ljava/lang/String;",
@@ -105,6 +121,7 @@
"Ljava/lang/Long;",
"Lcom/discord/models/domain/ModelGuildMember$Computed;",
">;",
+ "Lcom/discord/models/domain/ModelGuild;",
"Lcom/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState;",
")V"
}
@@ -112,9 +129,9 @@
invoke-direct {p0}, Ljava/lang/Object;->()V
- iput-wide p5, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->userId:J
+ iput-wide p6, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->userId:J
- iput-object p4, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->channelNames:Ljava/util/Map;
+ iput-object p5, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->channelNames:Ljava/util/Map;
invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getId()J
@@ -122,29 +139,37 @@
iput-wide v0, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->channelId:J
+ iput-object p9, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->guild:Lcom/discord/models/domain/ModelGuild;
+
invoke-virtual {p1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J
move-result-wide v0
iput-wide v0, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->guildId:J
+ invoke-virtual {p4}, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;->isLoadingMessages()Z
+
+ move-result p1
+
+ iput-boolean p1, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->isLoadingMessages:Z
+
invoke-static {p3}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->access$000(Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;)J
- move-result-wide v0
+ move-result-wide p4
- iput-wide v0, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->oldestMessageId:J
+ iput-wide p4, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->oldestMessageId:J
invoke-static {p3}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->access$100(Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;)J
- move-result-wide v0
+ move-result-wide p4
- iput-wide v0, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->newestKnownMessageId:J
+ iput-wide p4, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->newestKnownMessageId:J
- invoke-static {p5, p6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+ invoke-static {p6, p7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
move-result-object p1
- invoke-interface {p7, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-interface {p8, p1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
move-result-object p1
@@ -152,11 +177,11 @@
new-instance p1, Ljava/util/HashSet;
- invoke-static {p5, p6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+ invoke-static {p6, p7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
move-result-object p4
- invoke-interface {p7, p4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-interface {p8, p4}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
move-result-object p4
@@ -184,7 +209,7 @@
iput-wide p4, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->newMessagesMarkerMessageId:J
- invoke-direct {p0, p2, p3, p8}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->computeList(Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop;Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;Lcom/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState;)Ljava/util/List;
+ invoke-direct {p0, p2, p3, p10}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->computeList(Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop;Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;Lcom/discord/widgets/chat/list/model/WidgetChatListModel$ChatListState;)Ljava/util/List;
move-result-object p1
@@ -432,7 +457,7 @@
.end method
.method static synthetic lambda$get$1(Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
- .locals 8
+ .locals 10
invoke-static {p0}, Lrx/Observable;->bA(Ljava/lang/Object;)Lrx/Observable;
@@ -446,45 +471,69 @@
move-result-object v2
- invoke-static {}, Lcom/discord/stores/StoreStream;->getChannels()Lcom/discord/stores/StoreChannels;
+ invoke-static {}, Lcom/discord/stores/StoreStream;->getMessagesLoader()Lcom/discord/stores/StoreMessagesLoader;
move-result-object v3
- invoke-virtual {v3}, Lcom/discord/stores/StoreChannels;->getNames()Lrx/Observable;
-
- move-result-object v3
-
- invoke-static {}, Lcom/discord/stores/StoreStream;->getUsers()Lcom/discord/stores/StoreUser;
-
- move-result-object v4
-
- invoke-virtual {v4}, Lcom/discord/stores/StoreUser;->getMeId()Lrx/Observable;
-
- move-result-object v4
-
- invoke-static {}, Lcom/discord/stores/StoreStream;->getGuilds()Lcom/discord/stores/StoreGuilds;
-
- move-result-object v5
-
- invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J
-
- move-result-wide v6
-
- invoke-virtual {v5, v6, v7}, Lcom/discord/stores/StoreGuilds;->getComputed(J)Lrx/Observable;
-
- move-result-object v5
-
invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getId()J
- move-result-wide v6
+ move-result-wide v4
- invoke-static {v6, v7}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getChatListState(J)Lrx/Observable;
+ invoke-virtual {v3, v4, v5}, Lcom/discord/stores/StoreMessagesLoader;->getMessagesLoadedState(J)Lrx/Observable;
+
+ move-result-object v3
+
+ invoke-static {}, Lcom/discord/stores/StoreStream;->getChannels()Lcom/discord/stores/StoreChannels;
+
+ move-result-object v4
+
+ invoke-virtual {v4}, Lcom/discord/stores/StoreChannels;->getNames()Lrx/Observable;
+
+ move-result-object v4
+
+ invoke-static {}, Lcom/discord/stores/StoreStream;->getUsers()Lcom/discord/stores/StoreUser;
+
+ move-result-object v5
+
+ invoke-virtual {v5}, Lcom/discord/stores/StoreUser;->getMeId()Lrx/Observable;
+
+ move-result-object v5
+
+ invoke-static {}, Lcom/discord/stores/StoreStream;->getGuilds()Lcom/discord/stores/StoreGuilds;
move-result-object v6
- sget-object v7, Lcom/discord/widgets/chat/list/model/-$$Lambda$dBW72U9y3fexk387210Jvq5gK5k;->INSTANCE:Lcom/discord/widgets/chat/list/model/-$$Lambda$dBW72U9y3fexk387210Jvq5gK5k;
+ invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J
- invoke-static/range {v0 .. v7}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func7;)Lrx/Observable;
+ move-result-wide v7
+
+ invoke-virtual {v6, v7, v8}, Lcom/discord/stores/StoreGuilds;->getComputed(J)Lrx/Observable;
+
+ move-result-object v6
+
+ invoke-static {}, Lcom/discord/stores/StoreStream;->getGuilds()Lcom/discord/stores/StoreGuilds;
+
+ move-result-object v7
+
+ invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J
+
+ move-result-wide v8
+
+ invoke-virtual {v7, v8, v9}, Lcom/discord/stores/StoreGuilds;->get(J)Lrx/Observable;
+
+ move-result-object v7
+
+ invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getId()J
+
+ move-result-wide v8
+
+ invoke-static {v8, v9}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getChatListState(J)Lrx/Observable;
+
+ move-result-object v8
+
+ sget-object v9, Lcom/discord/widgets/chat/list/model/-$$Lambda$d2LqPR2IqPtCY3Dv9sHatCJcTNs;->INSTANCE:Lcom/discord/widgets/chat/list/model/-$$Lambda$d2LqPR2IqPtCY3Dv9sHatCJcTNs;
+
+ invoke-static/range {v0 .. v9}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func9;)Lrx/Observable;
move-result-object p0
@@ -615,6 +664,31 @@
return v2
:cond_4
+ invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getGuild()Lcom/discord/models/domain/ModelGuild;
+
+ move-result-object v1
+
+ invoke-virtual {p1}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getGuild()Lcom/discord/models/domain/ModelGuild;
+
+ move-result-object v3
+
+ if-nez v1, :cond_5
+
+ if-eqz v3, :cond_6
+
+ goto :goto_0
+
+ :cond_5
+ invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+ move-result v1
+
+ if-nez v1, :cond_6
+
+ :goto_0
+ return v2
+
+ :cond_6
invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getGuildId()J
move-result-wide v3
@@ -625,11 +699,11 @@
cmp-long v1, v3, v5
- if-eqz v1, :cond_5
+ if-eqz v1, :cond_7
return v2
- :cond_5
+ :cond_7
invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getChannelNames()Ljava/util/Map;
move-result-object v1
@@ -638,23 +712,23 @@
move-result-object v3
- if-nez v1, :cond_6
+ if-nez v1, :cond_8
- if-eqz v3, :cond_7
+ if-eqz v3, :cond_9
- goto :goto_0
+ goto :goto_1
- :cond_6
+ :cond_8
invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
move-result v1
- if-nez v1, :cond_7
+ if-nez v1, :cond_9
- :goto_0
+ :goto_1
return v2
- :cond_7
+ :cond_9
invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getOldestMessageId()J
move-result-wide v3
@@ -665,11 +739,24 @@
cmp-long v1, v3, v5
- if-eqz v1, :cond_8
+ if-eqz v1, :cond_a
return v2
- :cond_8
+ :cond_a
+ invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->isLoadingMessages()Z
+
+ move-result v1
+
+ invoke-virtual {p1}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->isLoadingMessages()Z
+
+ move-result v3
+
+ if-eq v1, v3, :cond_b
+
+ return v2
+
+ :cond_b
invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getMyRoleIds()Ljava/util/Set;
move-result-object v1
@@ -678,46 +765,6 @@
move-result-object v3
- if-nez v1, :cond_9
-
- if-eqz v3, :cond_a
-
- goto :goto_1
-
- :cond_9
- invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
- move-result v1
-
- if-nez v1, :cond_a
-
- :goto_1
- return v2
-
- :cond_a
- invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getNewMessagesMarkerMessageId()J
-
- move-result-wide v3
-
- invoke-virtual {p1}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getNewMessagesMarkerMessageId()J
-
- move-result-wide v5
-
- cmp-long v1, v3, v5
-
- if-eqz v1, :cond_b
-
- return v2
-
- :cond_b
- invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getList()Ljava/util/List;
-
- move-result-object v1
-
- invoke-virtual {p1}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getList()Ljava/util/List;
-
- move-result-object v3
-
if-nez v1, :cond_c
if-eqz v3, :cond_d
@@ -735,6 +782,46 @@
return v2
:cond_d
+ invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getNewMessagesMarkerMessageId()J
+
+ move-result-wide v3
+
+ invoke-virtual {p1}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getNewMessagesMarkerMessageId()J
+
+ move-result-wide v5
+
+ cmp-long v1, v3, v5
+
+ if-eqz v1, :cond_e
+
+ return v2
+
+ :cond_e
+ invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getList()Ljava/util/List;
+
+ move-result-object v1
+
+ invoke-virtual {p1}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getList()Ljava/util/List;
+
+ move-result-object v3
+
+ if-nez v1, :cond_f
+
+ if-eqz v3, :cond_10
+
+ goto :goto_3
+
+ :cond_f
+ invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+ move-result v1
+
+ if-nez v1, :cond_10
+
+ :goto_3
+ return v2
+
+ :cond_10
invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getNewestKnownMessageId()J
move-result-wide v3
@@ -745,11 +832,11 @@
cmp-long p1, v3, v5
- if-eqz p1, :cond_e
+ if-eqz p1, :cond_11
return v2
- :cond_e
+ :cond_11
return v0
.end method
@@ -778,6 +865,14 @@
return-object v0
.end method
+.method public getGuild()Lcom/discord/models/domain/ModelGuild;
+ .locals 1
+
+ iget-object v0, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->guild:Lcom/discord/models/domain/ModelGuild;
+
+ return-object v0
+.end method
+
.method public getGuildId()J
.locals 2
@@ -884,21 +979,7 @@
add-int/2addr v1, v0
- invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getGuildId()J
-
- move-result-wide v3
-
- mul-int/lit8 v1, v1, 0x3b
-
- ushr-long v5, v3, v2
-
- xor-long/2addr v3, v5
-
- long-to-int v0, v3
-
- add-int/2addr v1, v0
-
- invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getChannelNames()Ljava/util/Map;
+ invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getGuild()Lcom/discord/models/domain/ModelGuild;
move-result-object v0
@@ -920,7 +1001,7 @@
:goto_0
add-int/2addr v1, v0
- invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getOldestMessageId()J
+ invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getGuildId()J
move-result-wide v4
@@ -934,7 +1015,7 @@
add-int/2addr v1, v0
- invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getMyRoleIds()Ljava/util/Set;
+ invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getChannelNames()Ljava/util/Map;
move-result-object v0
@@ -954,6 +1035,58 @@
:goto_1
add-int/2addr v1, v0
+ invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getOldestMessageId()J
+
+ move-result-wide v4
+
+ mul-int/lit8 v1, v1, 0x3b
+
+ ushr-long v6, v4, v2
+
+ xor-long/2addr v4, v6
+
+ long-to-int v0, v4
+
+ add-int/2addr v1, v0
+
+ mul-int/lit8 v1, v1, 0x3b
+
+ invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->isLoadingMessages()Z
+
+ move-result v0
+
+ if-eqz v0, :cond_2
+
+ const/16 v0, 0x4f
+
+ goto :goto_2
+
+ :cond_2
+ const/16 v0, 0x61
+
+ :goto_2
+ add-int/2addr v1, v0
+
+ invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getMyRoleIds()Ljava/util/Set;
+
+ move-result-object v0
+
+ mul-int/lit8 v1, v1, 0x3b
+
+ if-nez v0, :cond_3
+
+ const/16 v0, 0x2b
+
+ goto :goto_3
+
+ :cond_3
+ invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+ move-result v0
+
+ :goto_3
+ add-int/2addr v1, v0
+
invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getNewMessagesMarkerMessageId()J
move-result-wide v4
@@ -974,16 +1107,16 @@
mul-int/lit8 v1, v1, 0x3b
- if-nez v0, :cond_2
+ if-nez v0, :cond_4
- goto :goto_2
+ goto :goto_4
- :cond_2
+ :cond_4
invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
move-result v3
- :goto_2
+ :goto_4
add-int/2addr v1, v3
invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getNewestKnownMessageId()J
@@ -1003,6 +1136,14 @@
return v1
.end method
+.method public isLoadingMessages()Z
+ .locals 1
+
+ iget-boolean v0, p0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->isLoadingMessages:Z
+
+ return v0
+.end method
+
.method public isSpoilerClickAllowed()Z
.locals 1
@@ -1036,6 +1177,16 @@
invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+ const-string v1, ", guild="
+
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+ invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->getGuild()Lcom/discord/models/domain/ModelGuild;
+
+ move-result-object v1
+
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
const-string v1, ", guildId="
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
@@ -1066,6 +1217,16 @@
invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+ const-string v1, ", isLoadingMessages="
+
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+ invoke-virtual {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->isLoadingMessages()Z
+
+ move-result v1
+
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder;
+
const-string v1, ", myRoleIds="
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions.smali b/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions.smali
index c76ae4ff5c..ca620fc81d 100644
--- a/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions.smali
+++ b/com.discord/smali/com/discord/widgets/chat/managereactions/WidgetManageReactions.smali
@@ -282,7 +282,7 @@
invoke-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const p1, 0x7f120d9c
+ const p1, 0x7f120da0
invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/managereactions/WidgetManageReactions;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$sCxyzJ3AGITCcosiwmEU9HlJ4VQ.smali b/com.discord/smali/com/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$zcPOgPNbjn37xwYeWHBryUPrv84.smali
similarity index 50%
rename from com.discord/smali/com/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$sCxyzJ3AGITCcosiwmEU9HlJ4VQ.smali
rename to com.discord/smali/com/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$zcPOgPNbjn37xwYeWHBryUPrv84.smali
index 86425694d4..ca0cccfd64 100644
--- a/com.discord/smali/com/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$sCxyzJ3AGITCcosiwmEU9HlJ4VQ.smali
+++ b/com.discord/smali/com/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$zcPOgPNbjn37xwYeWHBryUPrv84.smali
@@ -1,9 +1,9 @@
-.class public final synthetic Lcom/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$sCxyzJ3AGITCcosiwmEU9HlJ4VQ;
+.class public final synthetic Lcom/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$zcPOgPNbjn37xwYeWHBryUPrv84;
.super Ljava/lang/Object;
.source "lambda"
# interfaces
-.implements Lrx/functions/Func6;
+.implements Lrx/functions/Func7;
# instance fields
@@ -18,49 +18,55 @@
invoke-direct {p0}, Ljava/lang/Object;->()V
- iput-object p1, p0, Lcom/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$sCxyzJ3AGITCcosiwmEU9HlJ4VQ;->f$0:Landroid/content/Context;
+ iput-object p1, p0, Lcom/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$zcPOgPNbjn37xwYeWHBryUPrv84;->f$0:Landroid/content/Context;
- iput-object p2, p0, Lcom/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$sCxyzJ3AGITCcosiwmEU9HlJ4VQ;->f$1:Lcom/discord/models/domain/ModelChannel;
+ iput-object p2, p0, Lcom/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$zcPOgPNbjn37xwYeWHBryUPrv84;->f$1:Lcom/discord/models/domain/ModelChannel;
return-void
.end method
# virtual methods
-.method public final call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
- .locals 8
+.method public final call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ .locals 10
- iget-object v0, p0, Lcom/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$sCxyzJ3AGITCcosiwmEU9HlJ4VQ;->f$0:Landroid/content/Context;
+ move-object v0, p0
- iget-object v1, p0, Lcom/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$sCxyzJ3AGITCcosiwmEU9HlJ4VQ;->f$1:Lcom/discord/models/domain/ModelChannel;
+ iget-object v1, v0, Lcom/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$zcPOgPNbjn37xwYeWHBryUPrv84;->f$0:Landroid/content/Context;
- move-object v2, p1
+ iget-object v2, v0, Lcom/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$zcPOgPNbjn37xwYeWHBryUPrv84;->f$1:Lcom/discord/models/domain/ModelChannel;
- check-cast v2, Ljava/lang/Long;
+ move-object v3, p1
- move-object v3, p2
+ check-cast v3, Ljava/lang/Long;
- check-cast v3, Ljava/util/List;
+ move-object v4, p2
- move-object v4, p3
+ check-cast v4, Ljava/util/List;
- check-cast v4, Ljava/util/Map;
-
- move-object v5, p4
+ move-object v5, p3
check-cast v5, Ljava/util/Map;
- move-object v6, p5
+ move-object v6, p4
check-cast v6, Ljava/util/Map;
- move-object v7, p6
+ move-object v7, p5
- check-cast v7, Ljava/lang/Boolean;
+ check-cast v7, Ljava/util/Map;
- invoke-static/range {v0 .. v7}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->lambda$null$0(Landroid/content/Context;Lcom/discord/models/domain/ModelChannel;Ljava/lang/Long;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/lang/Boolean;)Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;
+ move-object/from16 v8, p6
- move-result-object p1
+ check-cast v8, Ljava/lang/Boolean;
- return-object p1
+ move-object/from16 v9, p7
+
+ check-cast v9, Lcom/discord/models/domain/ModelGuild;
+
+ invoke-static/range {v1 .. v9}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->lambda$null$0(Landroid/content/Context;Lcom/discord/models/domain/ModelChannel;Ljava/lang/Long;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;
+
+ move-result-object v1
+
+ return-object v1
.end method
diff --git a/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model.smali b/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model.smali
index a818364d0c..26356727c1 100644
--- a/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model.smali
+++ b/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model.smali
@@ -31,6 +31,11 @@
.end annotation
.end field
+.field private final guild:Lcom/discord/models/domain/ModelGuild;
+ .annotation build Landroidx/annotation/Nullable;
+ .end annotation
+.end field
+
.field private final list:Ljava/util/List;
.annotation system Ldalvik/annotation/Signature;
value = {
@@ -55,12 +60,13 @@
# direct methods
-.method public constructor (Lcom/discord/models/domain/ModelChannel;JLjava/util/Map;Ljava/util/List;Ljava/util/Set;)V
+.method public constructor (Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;JLjava/util/Map;Ljava/util/List;Ljava/util/Set;)V
.locals 0
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
"Lcom/discord/models/domain/ModelChannel;",
+ "Lcom/discord/models/domain/ModelGuild;",
"J",
"Ljava/util/Map<",
"Ljava/lang/Long;",
@@ -79,13 +85,15 @@
iput-object p1, p0, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->channel:Lcom/discord/models/domain/ModelChannel;
- iput-wide p2, p0, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->userId:J
+ iput-object p2, p0, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->guild:Lcom/discord/models/domain/ModelGuild;
- iput-object p4, p0, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->channelNames:Ljava/util/Map;
+ iput-wide p3, p0, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->userId:J
- iput-object p5, p0, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->list:Ljava/util/List;
+ iput-object p5, p0, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->channelNames:Ljava/util/Map;
- iput-object p6, p0, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->myRoleIds:Ljava/util/Set;
+ iput-object p6, p0, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->list:Ljava/util/List;
+
+ iput-object p7, p0, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->myRoleIds:Ljava/util/Set;
return-void
.end method
@@ -98,8 +106,12 @@
return-object p0
.end method
-.method private static create(Landroid/content/Context;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelChannel;JLjava/util/Map;Z)Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;
+.method private static create(Landroid/content/Context;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelChannel;JLjava/util/Map;ZLcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;
.locals 15
+ .param p9 # Lcom/discord/models/domain/ModelGuild;
+ .annotation build Landroidx/annotation/Nullable;
+ .end annotation
+ .end param
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
@@ -120,7 +132,9 @@
"Ljava/util/Map<",
"Ljava/lang/Long;",
"Ljava/lang/String;",
- ">;Z)",
+ ">;Z",
+ "Lcom/discord/models/domain/ModelGuild;",
+ ")",
"Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;"
}
.end annotation
@@ -156,7 +170,7 @@
:cond_1
:goto_0
- move-object v5, v0
+ move-object v6, v0
goto :goto_3
@@ -303,21 +317,23 @@
move-result-object v0
:goto_4
- move-object v6, v0
+ move-object v7, v0
- new-instance v7, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;
+ new-instance v8, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;
- move-object v0, v7
+ move-object v0, v8
move-object/from16 v1, p4
- move-wide/from16 v2, p5
+ move-object/from16 v2, p9
- move-object/from16 v4, p7
+ move-wide/from16 v3, p5
- invoke-direct/range {v0 .. v6}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->(Lcom/discord/models/domain/ModelChannel;JLjava/util/Map;Ljava/util/List;Ljava/util/Set;)V
+ move-object/from16 v5, p7
- return-object v7
+ invoke-direct/range {v0 .. v7}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->(Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;JLjava/util/Map;Ljava/util/List;Ljava/util/Set;)V
+
+ return-object v8
:cond_7
:goto_5
@@ -359,7 +375,7 @@
.end method
.method static synthetic lambda$get$1(JLandroid/content/Context;Lcom/discord/models/domain/ModelChannel;)Lrx/Observable;
- .locals 8
+ .locals 9
if-nez p3, :cond_0
@@ -428,19 +444,31 @@
move-result-object v6
- new-instance v7, Lcom/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$sCxyzJ3AGITCcosiwmEU9HlJ4VQ;
+ invoke-static {}, Lcom/discord/stores/StoreStream;->getGuilds()Lcom/discord/stores/StoreGuilds;
- invoke-direct {v7, p2, p3}, Lcom/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$sCxyzJ3AGITCcosiwmEU9HlJ4VQ;->(Landroid/content/Context;Lcom/discord/models/domain/ModelChannel;)V
+ move-result-object p0
- 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;
+ invoke-virtual {p3}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J
+
+ move-result-wide v7
+
+ invoke-virtual {p0, v7, v8}, Lcom/discord/stores/StoreGuilds;->get(J)Lrx/Observable;
+
+ move-result-object v7
+
+ new-instance v8, Lcom/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$zcPOgPNbjn37xwYeWHBryUPrv84;
+
+ invoke-direct {v8, p2, p3}, Lcom/discord/widgets/chat/pins/-$$Lambda$WidgetChannelPinnedMessages$Model$zcPOgPNbjn37xwYeWHBryUPrv84;->(Landroid/content/Context;Lcom/discord/models/domain/ModelChannel;)V
+
+ invoke-static/range {v1 .. v8}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func7;)Lrx/Observable;
move-result-object p0
return-object p0
.end method
-.method static synthetic lambda$null$0(Landroid/content/Context;Lcom/discord/models/domain/ModelChannel;Ljava/lang/Long;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/lang/Boolean;)Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;
- .locals 9
+.method static synthetic lambda$null$0(Landroid/content/Context;Lcom/discord/models/domain/ModelChannel;Ljava/lang/Long;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/lang/Boolean;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;
+ .locals 10
invoke-virtual {p2}, Ljava/lang/Long;->longValue()J
@@ -460,9 +488,11 @@
move-object v4, p1
- move-object v7, p6
+ move-object/from16 v7, p6
- invoke-static/range {v0 .. v8}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->create(Landroid/content/Context;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelChannel;JLjava/util/Map;Z)Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;
+ move-object/from16 v9, p8
+
+ invoke-static/range {v0 .. v9}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->create(Landroid/content/Context;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelChannel;JLjava/util/Map;ZLcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;
move-result-object v0
@@ -534,6 +564,31 @@
return v2
:cond_4
+ invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getGuild()Lcom/discord/models/domain/ModelGuild;
+
+ move-result-object v1
+
+ invoke-virtual {p1}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getGuild()Lcom/discord/models/domain/ModelGuild;
+
+ move-result-object v3
+
+ if-nez v1, :cond_5
+
+ if-eqz v3, :cond_6
+
+ goto :goto_1
+
+ :cond_5
+ invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+ move-result v1
+
+ if-nez v1, :cond_6
+
+ :goto_1
+ return v2
+
+ :cond_6
invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getUserId()J
move-result-wide v3
@@ -544,11 +599,11 @@
cmp-long v1, v3, v5
- if-eqz v1, :cond_5
+ if-eqz v1, :cond_7
return v2
- :cond_5
+ :cond_7
invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getChannelNames()Ljava/util/Map;
move-result-object v1
@@ -557,31 +612,6 @@
move-result-object v3
- if-nez v1, :cond_6
-
- if-eqz v3, :cond_7
-
- goto :goto_1
-
- :cond_6
- invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
-
- move-result v1
-
- if-nez v1, :cond_7
-
- :goto_1
- return v2
-
- :cond_7
- invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getList()Ljava/util/List;
-
- move-result-object v1
-
- invoke-virtual {p1}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getList()Ljava/util/List;
-
- move-result-object v3
-
if-nez v1, :cond_8
if-eqz v3, :cond_9
@@ -599,6 +629,31 @@
return v2
:cond_9
+ invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getList()Ljava/util/List;
+
+ move-result-object v1
+
+ invoke-virtual {p1}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getList()Ljava/util/List;
+
+ move-result-object v3
+
+ if-nez v1, :cond_a
+
+ if-eqz v3, :cond_b
+
+ goto :goto_3
+
+ :cond_a
+ invoke-virtual {v1, v3}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
+
+ move-result v1
+
+ if-nez v1, :cond_b
+
+ :goto_3
+ return v2
+
+ :cond_b
invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getMyRoleIds()Ljava/util/Set;
move-result-object v1
@@ -607,23 +662,23 @@
move-result-object p1
- if-nez v1, :cond_a
+ if-nez v1, :cond_c
- if-eqz p1, :cond_b
+ if-eqz p1, :cond_d
- goto :goto_3
+ goto :goto_4
- :cond_a
+ :cond_c
invoke-virtual {v1, p1}, Ljava/lang/Object;->equals(Ljava/lang/Object;)Z
move-result p1
- if-nez p1, :cond_b
+ if-nez p1, :cond_d
- :goto_3
+ :goto_4
return v2
- :cond_b
+ :cond_d
return v0
.end method
@@ -664,6 +719,16 @@
return-object v0
.end method
+.method public getGuild()Lcom/discord/models/domain/ModelGuild;
+ .locals 1
+ .annotation build Landroidx/annotation/Nullable;
+ .end annotation
+
+ iget-object v0, p0, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->guild:Lcom/discord/models/domain/ModelGuild;
+
+ return-object v0
+.end method
+
.method public getGuildId()J
.locals 2
@@ -758,6 +823,26 @@
:goto_0
add-int/lit8 v0, v0, 0x3b
+ invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getGuild()Lcom/discord/models/domain/ModelGuild;
+
+ move-result-object v2
+
+ mul-int/lit8 v0, v0, 0x3b
+
+ if-nez v2, :cond_1
+
+ const/16 v2, 0x2b
+
+ goto :goto_1
+
+ :cond_1
+ invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+ move-result v2
+
+ :goto_1
+ add-int/2addr v0, v2
+
invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getUserId()J
move-result-wide v2
@@ -780,26 +865,6 @@
mul-int/lit8 v0, v0, 0x3b
- if-nez v2, :cond_1
-
- const/16 v2, 0x2b
-
- goto :goto_1
-
- :cond_1
- invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
-
- move-result v2
-
- :goto_1
- add-int/2addr v0, v2
-
- invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getList()Ljava/util/List;
-
- move-result-object v2
-
- mul-int/lit8 v0, v0, 0x3b
-
if-nez v2, :cond_2
const/16 v2, 0x2b
@@ -814,7 +879,7 @@
:goto_2
add-int/2addr v0, v2
- invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getMyRoleIds()Ljava/util/Set;
+ invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getList()Ljava/util/List;
move-result-object v2
@@ -822,14 +887,34 @@
if-nez v2, :cond_3
+ const/16 v2, 0x2b
+
goto :goto_3
:cond_3
invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
- move-result v1
+ move-result v2
:goto_3
+ add-int/2addr v0, v2
+
+ invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getMyRoleIds()Ljava/util/Set;
+
+ move-result-object v2
+
+ mul-int/lit8 v0, v0, 0x3b
+
+ if-nez v2, :cond_4
+
+ goto :goto_4
+
+ :cond_4
+ invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I
+
+ move-result v1
+
+ :goto_4
add-int/2addr v0, v1
return v0
@@ -858,6 +943,16 @@
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+ const-string v1, ", guild="
+
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+ invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages$Model;->getGuild()Lcom/discord/models/domain/ModelGuild;
+
+ move-result-object v1
+
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
const-string v1, ", userId="
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/com/discord/widgets/chat/typing/WidgetChatTypingUsers.smali b/com.discord/smali/com/discord/widgets/chat/typing/WidgetChatTypingUsers.smali
index cf82da6e70..a9f4fa3de5 100644
--- a/com.discord/smali/com/discord/widgets/chat/typing/WidgetChatTypingUsers.smali
+++ b/com.discord/smali/com/discord/widgets/chat/typing/WidgetChatTypingUsers.smali
@@ -451,7 +451,7 @@
if-eq v0, v5, :cond_0
- const p2, 0x7f120ef9
+ const p2, 0x7f120efd
invoke-virtual {p1, p2}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -462,7 +462,7 @@
:cond_0
sget-object v0, Lkotlin/jvm/internal/y;->bfP:Lkotlin/jvm/internal/y;
- const v0, 0x7f120fe7
+ const v0, 0x7f120fed
invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
@@ -507,7 +507,7 @@
:cond_1
sget-object v0, Lkotlin/jvm/internal/y;->bfP:Lkotlin/jvm/internal/y;
- const v0, 0x7f121040
+ const v0, 0x7f121046
invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging.smali
index 2e2f577b08..521c9c95d6 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging.smali
@@ -250,7 +250,7 @@
invoke-static {p0, p1, v1, v0, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const p1, 0x7f12049e
+ const p1, 0x7f12049d
invoke-virtual {p0, p1}, Lcom/discord/widgets/debugging/WidgetDebugging;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
index 550db0e2c6..873ecb243f 100644
--- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
+++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali
@@ -419,7 +419,7 @@
aput-object v3, v1, v2
- const v3, 0x7f12044a
+ const v3, 0x7f120449
invoke-virtual {p0, v3, v1}, Lcom/discord/widgets/debugging/WidgetFatalCrash;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -447,7 +447,7 @@
if-eqz p1, :cond_0
- const v5, 0x7f120f4c
+ const v5, 0x7f120f51
invoke-virtual {p0, v5}, Lcom/discord/widgets/debugging/WidgetFatalCrash;->getString(I)Ljava/lang/String;
@@ -467,7 +467,7 @@
:goto_0
aput-object v5, v3, v2
- const v5, 0x7f120449
+ const v5, 0x7f120448
invoke-virtual {p0, v5, v3}, Lcom/discord/widgets/debugging/WidgetFatalCrash;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -481,7 +481,7 @@
move-result-object v1
- const v3, 0x7f12044b
+ const v3, 0x7f12044a
new-array v5, v0, [Ljava/lang/Object;
@@ -508,11 +508,11 @@
move-result-object p1
- const v1, 0x7f120443
+ const v1, 0x7f120442
new-array v3, v0, [Ljava/lang/Object;
- const-string v4, "8.9.9"
+ const-string v4, "9.0.0"
aput-object v4, v3, v2
@@ -528,7 +528,7 @@
move-result-object p1
- const v1, 0x7f120447
+ const v1, 0x7f120446
new-array v3, v0, [Ljava/lang/Object;
@@ -552,7 +552,7 @@
move-result-object p1
- const v1, 0x7f120446
+ const v1, 0x7f120445
new-array v0, v0, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali
index e3abd4868e..152d3739be 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali
@@ -460,7 +460,7 @@
invoke-static {p0, p1, v0, v1, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const v1, 0x7f120663
+ const v1, 0x7f120662
invoke-virtual {p0, v1}, Lcom/discord/widgets/friends/WidgetFriendsAdd;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali
index 278c273113..a517fda76d 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali
@@ -96,11 +96,11 @@
invoke-direct {v1, p0, p1, v0, p2}, Lcom/discord/widgets/friends/WidgetFriendsList$addTab$1;->(Lcom/discord/widgets/friends/WidgetFriendsList;Lcom/google/android/material/tabs/TabLayout;Lcom/google/android/material/tabs/TabLayout$Tab;I)V
- const v2, 0x7f120666
+ const v2, 0x7f120665
if-eq p2, v2, :cond_1
- const v2, 0x7f120f78
+ const v2, 0x7f120f7e
if-eq p2, v2, :cond_0
@@ -164,6 +164,10 @@
invoke-static {v0, v1, v3, v4, v5}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy$default(Landroid/view/View;ZIILjava/lang/Object;)V
+ const v0, 0x7f120663
+
+ invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V
+
const v0, 0x7f120664
invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V
@@ -176,10 +180,6 @@
invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V
- const v0, 0x7f120667
-
- invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V
-
const v0, 0x7f12031f
invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V
diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemSuggestion.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemSuggestion.smali
index d8146124f8..dc143472e3 100644
--- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemSuggestion.smali
+++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemSuggestion.smali
@@ -449,7 +449,7 @@
if-eqz p1, :cond_2
- const p1, 0x7f0802fb
+ const p1, 0x7f080305
return p1
@@ -462,7 +462,7 @@
if-eqz p1, :cond_2
- const p1, 0x7f0802f0
+ const p1, 0x7f0802fa
return p1
@@ -488,7 +488,7 @@
if-eqz p1, :cond_2
- const p1, 0x7f080279
+ const p1, 0x7f080281
return p1
diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet.smali
index d0cd478f4b..b678bb85f7 100644
--- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet.smali
@@ -934,7 +934,7 @@
invoke-virtual {p0, v1, v3}, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet;->setOnClickAndDismissListener(Landroid/view/View;Lkotlin/jvm/functions/Function1;)V
- const v1, 0x7f120ec2
+ const v1, 0x7f120ec6
new-array v2, v2, [Ljava/lang/Object;
@@ -992,7 +992,7 @@
if-eqz p1, :cond_2
- const p1, 0x7f120f07
+ const p1, 0x7f120f0b
goto :goto_2
diff --git a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate.smali b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate.smali
index d8bd47d740..bfafa4944e 100644
--- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate.smali
@@ -284,7 +284,7 @@
.method private getCommunityGuidelines()Ljava/lang/CharSequence;
.locals 4
- const v0, 0x7f12045c
+ const v0, 0x7f12045b
invoke-virtual {p0, v0}, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->getString(I)Ljava/lang/String;
@@ -466,7 +466,7 @@
if-eqz v1, :cond_0
- const p1, 0x7f120ebb
+ const p1, 0x7f120ebf
invoke-static {p0, p1}, Lcom/discord/app/g;->b(Landroidx/fragment/app/Fragment;I)V
@@ -479,7 +479,7 @@
if-eqz v1, :cond_1
- const p1, 0x7f121058
+ const p1, 0x7f12105e
invoke-static {p0, p1}, Lcom/discord/app/g;->b(Landroidx/fragment/app/Fragment;I)V
@@ -544,9 +544,9 @@
.method public synthetic lambda$null$3$WidgetGuildCreate()V
.locals 2
- const v0, 0x7f1203b2
+ const v0, 0x7f1203b1
- const v1, 0x7f121049
+ const v1, 0x7f12104f
invoke-static {p0, v0, v1}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V
@@ -648,7 +648,7 @@
invoke-virtual {p0}, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar;
- const p1, 0x7f120457
+ const p1, 0x7f120456
invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->setActionBarTitle(I)Lkotlin/Unit;
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 dc69889cdb..3a0dd0c3d7 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.smali
@@ -1575,7 +1575,7 @@
invoke-static {p1, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
- const v1, 0x7f120ff2
+ const v1, 0x7f120ff8
invoke-virtual {p0, v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getString(I)Ljava/lang/String;
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 4891dfd259..605a86cde3 100644
--- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo.smali
@@ -920,7 +920,7 @@
move-result-object v9
- const v10, 0x7f080324
+ const v10, 0x7f08032f
const/4 v11, 0x0
@@ -934,18 +934,52 @@
invoke-static/range {v9 .. v15}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setCompoundDrawableWithIntrinsicBounds$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
+ goto :goto_3
+
:cond_4
+ invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelInvite;->getGuild()Lcom/discord/models/domain/ModelGuild;
+
+ move-result-object v2
+
+ if-eqz v2, :cond_5
+
+ invoke-virtual {v2}, Lcom/discord/models/domain/ModelGuild;->isPartneredServer()Z
+
+ move-result v2
+
+ if-ne v2, v3, :cond_5
+
+ invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->getInviteMessage()Landroid/widget/TextView;
+
+ move-result-object v9
+
+ const v10, 0x7f0802b8
+
+ const/4 v11, 0x0
+
+ const/4 v12, 0x0
+
+ const/4 v13, 0x0
+
+ const/16 v14, 0xe
+
+ const/4 v15, 0x0
+
+ invoke-static/range {v9 .. v15}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setCompoundDrawableWithIntrinsicBounds$default(Landroid/widget/TextView;IIIIILjava/lang/Object;)V
+
+ :cond_5
+ :goto_3
invoke-direct/range {p0 .. p0}, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->getTitle()Landroid/widget/TextView;
move-result-object v2
- if-eqz v1, :cond_5
+ if-eqz v1, :cond_6
invoke-virtual {v1}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String;
move-result-object v8
- :cond_5
+ :cond_6
invoke-direct {v0, v8}, Lcom/discord/widgets/guilds/invite/WidgetInviteInfo;->getIntroText(Ljava/lang/String;)Ljava/lang/CharSequence;
move-result-object v1
diff --git a/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement.smali b/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement.smali
index 153c0477e1..2a94e8f34b 100644
--- a/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement.smali
+++ b/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement.smali
@@ -322,7 +322,7 @@
invoke-virtual {p0}, Lcom/discord/widgets/guilds/management/WidgetGuildManagement;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar;
- const p1, 0x7f120ec9
+ const p1, 0x7f120ecd
invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/management/WidgetGuildManagement;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager.smali
index e5efbc98cb..7a14d75a8f 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager.smali
@@ -174,7 +174,7 @@
return-object v2
:cond_4
- const p1, 0x7f1203a6
+ const p1, 0x7f1203a5
invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -183,7 +183,7 @@
goto :goto_0
:cond_5
- const p1, 0x7f120658
+ const p1, 0x7f120657
invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNoChannels.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNoChannels.smali
index e4fcdf6bcc..93e92583a0 100644
--- a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNoChannels.smali
+++ b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNoChannels.smali
@@ -108,7 +108,7 @@
move-result-object v0
- const v1, 0x7f1203a6
+ const v1, 0x7f1203a5
invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -127,7 +127,7 @@
move-result-object v0
- const v1, 0x7f1203a5
+ const v1, 0x7f1203a4
invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$1.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$1.smali
index e4f49980e4..cb30d01915 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$1.smali
@@ -91,7 +91,7 @@
iget-object v1, v1, Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/media/WidgetMedia;
- const v2, 0x7f120509
+ const v2, 0x7f120508
const/4 v3, 0x1
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$2.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$2.smali
index 18a68c0a46..cf52c87a13 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1$1$2.smali
@@ -91,7 +91,7 @@
iget-object v0, v0, Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/media/WidgetMedia;
- const v1, 0x7f120508
+ const v1, 0x7f120507
invoke-virtual {v0, v1}, Lcom/discord/widgets/media/WidgetMedia;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali b/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali
index 4138937b73..acb26fef94 100644
--- a/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali
+++ b/com.discord/smali/com/discord/widgets/media/WidgetMedia.smali
@@ -531,7 +531,7 @@
invoke-static {p0, v3, v5, v4, v5}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const v4, 0x7f121173
+ const v4, 0x7f121179
invoke-virtual {p0, v4}, Lcom/discord/widgets/media/WidgetMedia;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion.smali
index c9b6a48169..f3b3726b9b 100644
--- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticeDialog$Companion.smali
@@ -472,7 +472,7 @@
move-result-object v14
- const v1, 0x7f1203f9
+ const v1, 0x7f1203f8
invoke-virtual {v0, v1}, Lcom/discord/app/AppActivity;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/search/WidgetSearch$Model.smali b/com.discord/smali/com/discord/widgets/search/WidgetSearch$Model.smali
index 7fc23e2b50..1d8d01b3ee 100644
--- a/com.discord/smali/com/discord/widgets/search/WidgetSearch$Model.smali
+++ b/com.discord/smali/com/discord/widgets/search/WidgetSearch$Model.smali
@@ -238,7 +238,7 @@
aput-object p1, v0, v1
- const p1, 0x7f120e84
+ const p1, 0x7f120e88
invoke-virtual {p0, p1, v0}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -273,7 +273,7 @@
goto :goto_0
:cond_0
- const p1, 0x7f120e84
+ const p1, 0x7f120e88
new-array v2, v2, [Ljava/lang/Object;
@@ -286,7 +286,7 @@
return-object p0
:cond_1
- const p1, 0x7f120e67
+ const p1, 0x7f120e6b
new-array v2, v2, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults$Model.smali b/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults$Model.smali
index c617ea403d..018c465c67 100644
--- a/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults$Model.smali
+++ b/com.discord/smali/com/discord/widgets/search/results/WidgetSearchResults$Model.smali
@@ -273,7 +273,7 @@
move-result-object v11
- const v12, 0x7f1000ae
+ const v12, 0x7f1000b2
new-array v9, v9, [Ljava/lang/Object;
@@ -828,6 +828,16 @@
return-object v0
.end method
+.method public getGuild()Lcom/discord/models/domain/ModelGuild;
+ .locals 1
+ .annotation build Landroidx/annotation/Nullable;
+ .end annotation
+
+ const/4 v0, 0x0
+
+ return-object v0
+.end method
+
.method public getGuildId()J
.locals 2
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterViewHolder.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterViewHolder.smali
index e6fba29231..233e2ae387 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$FilterViewHolder.smali
@@ -119,27 +119,27 @@
if-eq p1, v0, :cond_0
- const p1, 0x7f120dff
+ const p1, 0x7f120e03
return p1
:cond_0
- const p1, 0x7f120e5e
+ const p1, 0x7f120e62
return p1
:cond_1
- const p1, 0x7f120e57
+ const p1, 0x7f120e5b
return p1
:cond_2
- const p1, 0x7f120e60
+ const p1, 0x7f120e64
return p1
:cond_3
- const p1, 0x7f120e56
+ const p1, 0x7f120e5a
return p1
.end method
@@ -173,27 +173,27 @@
if-eq p1, v0, :cond_0
- const p1, 0x7f120dff
+ const p1, 0x7f120e03
return p1
:cond_0
- const p1, 0x7f120e70
+ const p1, 0x7f120e74
return p1
:cond_1
- const p1, 0x7f120e6f
+ const p1, 0x7f120e73
return p1
:cond_2
- const p1, 0x7f120e72
+ const p1, 0x7f120e76
return p1
:cond_3
- const p1, 0x7f120e6e
+ const p1, 0x7f120e72
return p1
.end method
diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderViewHolder.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderViewHolder.smali
index d219c1879e..5bb5329c19 100644
--- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HeaderViewHolder.smali
@@ -80,32 +80,32 @@
throw v0
:pswitch_0
- const p1, 0x7f120e78
-
- return p1
-
- :pswitch_1
- const p1, 0x7f120e79
-
- return p1
-
- :pswitch_2
- const p1, 0x7f120e7d
-
- return p1
-
- :pswitch_3
const p1, 0x7f120e7c
return p1
- :pswitch_4
+ :pswitch_1
+ const p1, 0x7f120e7d
+
+ return p1
+
+ :pswitch_2
+ const p1, 0x7f120e81
+
+ return p1
+
+ :pswitch_3
const p1, 0x7f120e80
return p1
+ :pswitch_4
+ const p1, 0x7f120e84
+
+ return p1
+
:pswitch_5
- const p1, 0x7f120e81
+ const p1, 0x7f120e85
return p1
diff --git a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$CategoryOverridesViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$CategoryOverridesViewHolder.smali
index d30da8b62b..edc38a4298 100644
--- a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$CategoryOverridesViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$CategoryOverridesViewHolder.smali
@@ -115,7 +115,7 @@
if-eqz v0, :cond_0
- const p1, 0x7f1205f9
+ const p1, 0x7f1205f8
goto :goto_0
diff --git a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder.smali
index 6d50180d41..a10e5f0062 100644
--- a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder$ChannelOverridesViewHolder.smali
@@ -153,7 +153,7 @@
if-eqz v0, :cond_1
- const p1, 0x7f1205f9
+ const p1, 0x7f1205f8
goto :goto_1
diff --git a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder.smali
index 1c5ba1d999..a0009d1bef 100644
--- a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder.smali
@@ -96,7 +96,7 @@
if-ne p1, v0, :cond_0
- const p1, 0x7f1205af
+ const p1, 0x7f1205ae
return p1
@@ -105,7 +105,7 @@
if-ne p1, v0, :cond_1
- const p1, 0x7f120603
+ const p1, 0x7f120602
return p1
@@ -114,7 +114,7 @@
if-ne p1, v0, :cond_2
- const p1, 0x7f1205fd
+ const p1, 0x7f1205fc
return p1
diff --git a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem.smali b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem.smali
index 834478bbef..7dcd4d0203 100644
--- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem.smali
@@ -172,7 +172,7 @@
move-result-object p1
- const v0, 0x7f121050
+ const v0, 0x7f121056
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali
index e2a489d472..63b06fb178 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali
@@ -540,7 +540,7 @@
move-result-object v0
- const v3, 0x7f1205f7
+ const v3, 0x7f1205f6
new-array v6, v4, [Ljava/lang/Object;
@@ -614,7 +614,7 @@
move-result-object v0
- const v3, 0x7f120629
+ const v3, 0x7f120628
invoke-virtual {p0, v3}, Lcom/discord/widgets/servers/WidgetServerNotifications;->getString(I)Ljava/lang/String;
@@ -682,7 +682,7 @@
move-result-object v0
- const v1, 0x7f120603
+ const v1, 0x7f120602
invoke-virtual {p0, v1}, Lcom/discord/widgets/servers/WidgetServerNotifications;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali
index 66e0760cc7..5a8b0dc6ea 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali
@@ -238,7 +238,7 @@
invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;->setActionBarTitle(I)Lkotlin/Unit;
- const p1, 0x7f120e9b
+ const p1, 0x7f120e9f
invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;->setActionBarSubtitle(I)Lkotlin/Unit;
@@ -246,7 +246,7 @@
move-result-object p1
- const v1, 0x7f120e51
+ const v1, 0x7f120e55
invoke-virtual {p1, v1}, Landroid/widget/EditText;->setHint(I)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali
index 8a6899aef7..1d54c25829 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali
@@ -1802,7 +1802,7 @@
invoke-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const p1, 0x7f120ec0
+ const p1, 0x7f120ec4
invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettings;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali
index bd5786a0bc..fa7d54d5dd 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali
@@ -451,7 +451,7 @@
aput-object v4, v3, v5
- const v4, 0x7f12104c
+ const v4, 0x7f121052
invoke-virtual {v1, v4, v3}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -477,7 +477,7 @@
aput-object v3, v2, v5
- const v3, 0x7f12104b
+ const v3, 0x7f121051
invoke-virtual {v1, v3, v2}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -507,7 +507,7 @@
check-cast v1, Lkotlin/jvm/functions/Function1;
- const p1, 0x7f12104a
+ const p1, 0x7f121050
invoke-virtual {v0, p1, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setPositiveButton(ILkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali
index 0110cc9179..db8f5e10c6 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali
@@ -70,7 +70,7 @@
goto :goto_0
:cond_0
- const v0, 0x7f120f10
+ const v0, 0x7f120f14
:goto_0
invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsChannels;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali
index af49c39cf6..4b79777137 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali
@@ -505,7 +505,7 @@
aput-object p1, v1, v2
- const p1, 0x7f1207b5
+ const p1, 0x7f1207b4
invoke-virtual {p0, p1, v1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali
index de389a3b4c..651641c605 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali
@@ -299,7 +299,7 @@
if-eqz p2, :cond_0
- const p1, 0x7f1205cd
+ const p1, 0x7f1205cc
invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->getString(I)Ljava/lang/String;
@@ -341,7 +341,7 @@
return-object p1
:cond_1
- const p1, 0x7f12102c
+ const p1, 0x7f121032
invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->getString(I)Ljava/lang/String;
@@ -782,7 +782,7 @@
invoke-virtual {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar;
- const v2, 0x7f120615
+ const v2, 0x7f120614
invoke-virtual {p0, v2}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->getString(I)Ljava/lang/String;
@@ -1354,7 +1354,7 @@
return-void
:cond_0
- const p1, 0x7f120613
+ const p1, 0x7f120612
invoke-static {p0, p1}, Lcom/discord/app/g;->b(Landroidx/fragment/app/Fragment;I)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiSectionViewHolder.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiSectionViewHolder.smali
index da6393b227..43ad9f76a9 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiSectionViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Adapter$EmojiSectionViewHolder.smali
@@ -173,7 +173,7 @@
aput-object v0, v1, v5
- const v0, 0x7f12053f
+ const v0, 0x7f12053e
invoke-virtual {p1, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -199,7 +199,7 @@
aput-object v0, v3, v2
- const p2, 0x7f12053e
+ const p2, 0x7f12053d
invoke-virtual {p1, p2, v3}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion.smali
index 59b1cdacf0..ff027bb365 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$Model$Companion.smali
@@ -325,7 +325,7 @@
move-result v5
- const v6, 0x7f120530
+ const v6, 0x7f12052f
invoke-direct {v4, v0, v5, v6}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis$Item$EmojiSection;->(III)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$showMediaPicker$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$showMediaPicker$1.smali
index 85198f1724..bbac426448 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$showMediaPicker$1.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis$showMediaPicker$1.smali
@@ -41,9 +41,9 @@
check-cast v0, Lcom/miguelgaeta/media_picker/MediaPicker$Provider;
- const v1, 0x7f1203b2
+ const v1, 0x7f1203b1
- const v2, 0x7f121049
+ const v2, 0x7f12104f
invoke-static {v0, v1, v2}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis.smali
index b0b16ad6e8..94660f8452 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojis.smali
@@ -178,7 +178,7 @@
.method private final configureToolbar(Ljava/lang/String;)V
.locals 1
- const v0, 0x7f120530
+ const v0, 0x7f12052f
invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojis;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.smali
index 006d119e5d..172a8a17b0 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEmojisEdit.smali
@@ -259,7 +259,7 @@
.method private final configureToolbar(Ljava/lang/String;)V
.locals 1
- const v0, 0x7f120530
+ const v0, 0x7f12052f
invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojisEdit;->setActionBarTitle(I)Lkotlin/Unit;
@@ -523,7 +523,7 @@
check-cast p1, Landroidx/fragment/app/Fragment;
- const v0, 0x7f120e1b
+ const v0, 0x7f120e1f
invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsEmojisEdit;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3.smali
index a4b17b71fb..7669bd22c8 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3.smali
@@ -65,7 +65,7 @@
aput-object v0, v2, v3
- const v3, 0x7f120efd
+ const v3, 0x7f120f01
invoke-virtual {v1, v3, v2}, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali
index 21f3b34ff0..6cd61392e8 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali
@@ -600,12 +600,12 @@
if-eqz p5, :cond_2
- const v0, 0x7f1204da
+ const v0, 0x7f1204d9
goto :goto_0
:cond_2
- const v0, 0x7f1204db
+ const v0, 0x7f1204da
:goto_0
invoke-virtual {v8, v0}, Landroid/widget/TextView;->setText(I)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali
index c508e47e51..b3ebd975df 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali
@@ -367,7 +367,7 @@
.method public synthetic lambda$updateGuild$2$WidgetServerSettingsModeration(Lcom/discord/models/domain/ModelGuild;)V
.locals 0
- const p1, 0x7f120ec1
+ const p1, 0x7f120ec5
invoke-static {p0, p1}, Lcom/discord/app/g;->b(Landroidx/fragment/app/Fragment;I)V
@@ -527,7 +527,7 @@
aput-object v1, v0, v2
- const v1, 0x7f12114d
+ const v1, 0x7f121153
invoke-virtual {p0, v1, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsModeration;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -549,7 +549,7 @@
aput-object v1, v0, v2
- const v1, 0x7f121149
+ const v1, 0x7f12114f
invoke-virtual {p0, v1, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsModeration;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureBanner$1$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureBanner$1$2.smali
index ac3c955baf..32c72f1ddc 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureBanner$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureBanner$1$2.smali
@@ -43,9 +43,9 @@
check-cast v0, Lcom/miguelgaeta/media_picker/MediaPicker$Provider;
- const v1, 0x7f1203b2
+ const v1, 0x7f1203b1
- const v2, 0x7f121049
+ const v2, 0x7f12104f
invoke-static {v0, v1, v2}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1$2.smali
index 591705bf17..9700c1cd86 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1$2.smali
@@ -43,9 +43,9 @@
check-cast v0, Lcom/miguelgaeta/media_picker/MediaPicker$Provider;
- const v1, 0x7f1203b2
+ const v1, 0x7f1203b1
- const v2, 0x7f121049
+ const v2, 0x7f12104f
invoke-static {v0, v1, v2}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureSplash$1$2.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureSplash$1$2.smali
index 8300e07d38..e0df23a0c8 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureSplash$1$2.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureSplash$1$2.smali
@@ -43,9 +43,9 @@
check-cast v0, Lcom/miguelgaeta/media_picker/MediaPicker$Provider;
- const v1, 0x7f1203b2
+ const v1, 0x7f1203b1
- const v2, 0x7f121049
+ const v2, 0x7f12104f
invoke-static {v0, v1, v2}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali
index 2d47a8d445..c3e67146b4 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali
@@ -2111,7 +2111,7 @@
goto :goto_0
:cond_1
- const v1, 0x7f120ebf
+ const v1, 0x7f120ec3
invoke-virtual {p0, v1}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->getString(I)Ljava/lang/String;
@@ -2565,7 +2565,7 @@
check-cast p1, Landroidx/fragment/app/Fragment;
- const v0, 0x7f120ec1
+ const v0, 0x7f120ec5
invoke-static {p1, v0}, Lcom/discord/app/g;->a(Landroidx/fragment/app/Fragment;I)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali
index fa480c9061..74e63f9e99 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali
@@ -86,7 +86,7 @@
.method private configureToolbar(Ljava/lang/String;)V
.locals 1
- const v0, 0x7f120de3
+ const v0, 0x7f120de7
invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsRolesList;->setActionBarTitle(I)Lkotlin/Unit;
@@ -549,7 +549,7 @@
.method public synthetic lambda$processRoleDrop$3$WidgetServerSettingsRolesList(Ljava/lang/Void;)V
.locals 0
- const p1, 0x7f120de2
+ const p1, 0x7f120de6
invoke-static {p0, p1}, Lcom/discord/app/g;->b(Landroidx/fragment/app/Fragment;I)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem.smali
index 8994cf19e0..deabf43b63 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem.smali
@@ -87,7 +87,7 @@
move-result-object p0
- const v0, 0x7f1205cd
+ const v0, 0x7f1205cc
invoke-static {p0, v0}, Lcom/discord/app/g;->d(Landroid/content/Context;I)V
@@ -119,7 +119,7 @@
move-result-object p0
- const v0, 0x7f12102c
+ const v0, 0x7f121032
invoke-static {p0, v0}, Lcom/discord/app/g;->d(Landroid/content/Context;I)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog.smali
index 8102dba7a8..1a9abfa7eb 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog.smali
@@ -61,12 +61,12 @@
if-eqz p3, :cond_1
- const v1, 0x7f1204d2
+ const v1, 0x7f1204d1
goto :goto_0
:cond_1
- const v1, 0x7f120543
+ const v1, 0x7f120542
:goto_0
invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity.smali
index 86b5f1f589..ae1fbda0a9 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity.smali
@@ -41,7 +41,7 @@
.method private configureToolbar(Ljava/lang/String;)V
.locals 1
- const v0, 0x7f120e99
+ const v0, 0x7f120e9d
invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali
index 977de3b10e..df20bfe1c8 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali
@@ -106,7 +106,7 @@
move-result-object v0
- const v2, 0x7f121006
+ const v2, 0x7f12100c
const/4 v3, 0x1
diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali
index 377450dd19..47968d1143 100644
--- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali
+++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali
@@ -82,7 +82,7 @@
iget-object v3, p0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->currentUrl:Lcom/discord/app/AppTextView;
- const v4, 0x7f12113b
+ const v4, 0x7f121141
const/4 v5, 0x1
@@ -130,7 +130,7 @@
.method private configureToolbar(Ljava/lang/String;)V
.locals 1
- const v0, 0x7f120ef8
+ const v0, 0x7f120efc
invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.smali
index 2c99e4f4c7..92645e3389 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.smali
@@ -568,7 +568,7 @@
move-result-object v0
- const v1, 0x7f12044c
+ const v1, 0x7f12044b
invoke-static {v0, v1}, Lcom/discord/app/g;->c(Landroid/content/Context;I)V
diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.smali
index bee830e95e..4823d01c19 100644
--- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.smali
+++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.smali
@@ -512,13 +512,13 @@
if-nez p2, :cond_3
- const p2, 0x7f120e85
+ const p2, 0x7f120e89
goto :goto_3
:cond_3
:goto_2
- const p2, 0x7f120e52
+ const p2, 0x7f120e56
:goto_3
invoke-virtual {p1, p2}, Landroid/widget/EditText;->setHint(I)V
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali
index 45f8141740..b0fb3e382a 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali
@@ -731,7 +731,7 @@
invoke-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const p1, 0x7f1211b5
+ const p1, 0x7f1211bb
invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetChangeLog;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
index 0f208db3f2..cd47822dfc 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali
@@ -1327,7 +1327,7 @@
move-result-object v1
- const v2, 0x7f1210f4
+ const v2, 0x7f1210fa
invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
@@ -1381,7 +1381,7 @@
invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
- const p1, 0x7f1210d8
+ const p1, 0x7f1210de
invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettings;->setActionBarTitle(I)Lkotlin/Unit;
@@ -1429,7 +1429,7 @@
invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
- const-string v2, " - 8.9.9 (899)"
+ const-string v2, " - 9.0.0 (900)"
invoke-virtual {v3, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali
index a722210331..1763b866c8 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali
@@ -1144,7 +1144,7 @@
move-result-object p1
- const v0, 0x7f1210e9
+ const v0, 0x7f1210ef
invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->getString(I)Ljava/lang/String;
@@ -1172,7 +1172,7 @@
invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V
- const p1, 0x7f1210d8
+ const p1, 0x7f1210de
invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsAppearance;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali
index e341260b58..19197d21cf 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali
@@ -291,11 +291,11 @@
invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V
- const p1, 0x7f1210d8
+ const p1, 0x7f1210de
invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsBehavior;->setActionBarSubtitle(I)Lkotlin/Unit;
- const p1, 0x7f1205e6
+ const p1, 0x7f1205e5
invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsBehavior;->setActionBarTitle(I)Lkotlin/Unit;
@@ -391,7 +391,7 @@
aput-object v4, v2, v3
- const v3, 0x7f1204cc
+ const v3, 0x7f1204cb
invoke-virtual {p0, v3, v2}, Lcom/discord/widgets/settings/WidgetSettingsBehavior;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper.smali
index 003f270dfd..6a1a26df38 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper.smali
@@ -39,7 +39,7 @@
invoke-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const p1, 0x7f1204cd
+ const p1, 0x7f1204cc
invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsDeveloper;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2.smali
index ca529d41d7..4556a94867 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2.smali
@@ -77,7 +77,7 @@
iget-object v1, v0, Lcom/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsGames;
- const v5, 0x7f121088
+ const v5, 0x7f12108e
invoke-virtual {v1, v5}, Lcom/discord/widgets/settings/WidgetSettingsGames;->getString(I)Ljava/lang/String;
@@ -89,7 +89,7 @@
iget-object v1, v0, Lcom/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsGames;
- const v6, 0x7f12068f
+ const v6, 0x7f12068e
invoke-virtual {v1, v6}, Lcom/discord/widgets/settings/WidgetSettingsGames;->getString(I)Ljava/lang/String;
@@ -101,7 +101,7 @@
iget-object v1, v0, Lcom/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsGames;
- const v7, 0x7f120690
+ const v7, 0x7f12068f
invoke-virtual {v1, v7}, Lcom/discord/widgets/settings/WidgetSettingsGames;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames.smali
index 860cc41400..2320c4a833 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames.smali
@@ -315,7 +315,7 @@
move-result-object v0
- const v1, 0x7f120ee1
+ const v1, 0x7f120ee5
invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -348,7 +348,7 @@
move-result-object v0
- const v1, 0x7f120edc
+ const v1, 0x7f120ee0
invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -356,7 +356,7 @@
move-result-object v0
- const v1, 0x7f120ede
+ const v1, 0x7f120ee2
invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -677,11 +677,11 @@
invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V
- const p1, 0x7f1210d8
+ const p1, 0x7f1210de
invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsGames;->setActionBarSubtitle(I)Lkotlin/Unit;
- const p1, 0x7f120702
+ const p1, 0x7f120701
invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsGames;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali
index 2a6c5328be..3d8492fb78 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali
@@ -1060,139 +1060,139 @@
const/4 p0, -0x1
:goto_1
- const v0, 0x7f080344
+ const v0, 0x7f08034f
packed-switch p0, :pswitch_data_0
return v0
:pswitch_0
- const p0, 0x7f08034b
-
- return p0
-
- :pswitch_1
- const p0, 0x7f080359
-
- return p0
-
- :pswitch_2
- const p0, 0x7f08035d
-
- return p0
-
- :pswitch_3
- const p0, 0x7f08035e
-
- return p0
-
- :pswitch_4
- const p0, 0x7f080355
-
- return p0
-
- :pswitch_5
- const p0, 0x7f08034c
-
- return p0
-
- :pswitch_6
- const p0, 0x7f080350
-
- return p0
-
- :pswitch_7
- const p0, 0x7f080342
-
- return p0
-
- :pswitch_8
- const p0, 0x7f080352
-
- return p0
-
- :pswitch_9
- const p0, 0x7f080347
-
- return p0
-
- :pswitch_a
- const p0, 0x7f08034f
-
- return p0
-
- :pswitch_b
- const p0, 0x7f08035f
-
- return p0
-
- :pswitch_c
- const p0, 0x7f08034e
-
- return p0
-
- :pswitch_d
- const p0, 0x7f08035b
-
- return p0
-
- :pswitch_e
const p0, 0x7f080356
return p0
- :pswitch_f
- const p0, 0x7f08033e
+ :pswitch_1
+ const p0, 0x7f080364
return p0
- :pswitch_10
- const p0, 0x7f08033f
+ :pswitch_2
+ const p0, 0x7f080368
return p0
- :pswitch_11
- const p0, 0x7f08035a
+ :pswitch_3
+ const p0, 0x7f080369
return p0
- :pswitch_12
- const p0, 0x7f080358
+ :pswitch_4
+ const p0, 0x7f080360
return p0
- :pswitch_13
- const p0, 0x7f080354
+ :pswitch_5
+ const p0, 0x7f080357
return p0
- :pswitch_14
- const p0, 0x7f080353
+ :pswitch_6
+ const p0, 0x7f08035b
return p0
- :pswitch_15
- const p0, 0x7f080351
-
- return p0
-
- :pswitch_16
+ :pswitch_7
const p0, 0x7f08034d
return p0
+ :pswitch_8
+ const p0, 0x7f08035d
+
+ return p0
+
+ :pswitch_9
+ const p0, 0x7f080352
+
+ return p0
+
+ :pswitch_a
+ const p0, 0x7f08035a
+
+ return p0
+
+ :pswitch_b
+ const p0, 0x7f08036a
+
+ return p0
+
+ :pswitch_c
+ const p0, 0x7f080359
+
+ return p0
+
+ :pswitch_d
+ const p0, 0x7f080366
+
+ return p0
+
+ :pswitch_e
+ const p0, 0x7f080361
+
+ return p0
+
+ :pswitch_f
+ const p0, 0x7f080349
+
+ return p0
+
+ :pswitch_10
+ const p0, 0x7f08034a
+
+ return p0
+
+ :pswitch_11
+ const p0, 0x7f080365
+
+ return p0
+
+ :pswitch_12
+ const p0, 0x7f080363
+
+ return p0
+
+ :pswitch_13
+ const p0, 0x7f08035f
+
+ return p0
+
+ :pswitch_14
+ const p0, 0x7f08035e
+
+ return p0
+
+ :pswitch_15
+ const p0, 0x7f08035c
+
+ return p0
+
+ :pswitch_16
+ const p0, 0x7f080358
+
+ return p0
+
:pswitch_17
- const p0, 0x7f080348
+ const p0, 0x7f080353
return p0
:pswitch_18
- const p0, 0x7f080345
+ const p0, 0x7f080350
return p0
:pswitch_19
- const p0, 0x7f080343
+ const p0, 0x7f08034e
return p0
@@ -1200,12 +1200,12 @@
return v0
:pswitch_1b
- const p0, 0x7f080341
+ const p0, 0x7f08034c
return p0
:pswitch_1c
- const p0, 0x7f080340
+ const p0, 0x7f08034b
return p0
@@ -1671,29 +1671,29 @@
const/4 p0, -0x1
:goto_1
- const v0, 0x7f120542
+ const v0, 0x7f120541
packed-switch p0, :pswitch_data_0
return v0
:pswitch_0
- const p0, 0x7f120fdd
+ const p0, 0x7f120fe3
return p0
:pswitch_1
- const p0, 0x7f121165
+ const p0, 0x7f12116b
return p0
:pswitch_2
- const p0, 0x7f1211c7
+ const p0, 0x7f1211cd
return p0
:pswitch_3
- const p0, 0x7f120de1
+ const p0, 0x7f120de5
return p0
@@ -1708,7 +1708,7 @@
return p0
:pswitch_6
- const p0, 0x7f120529
+ const p0, 0x7f120528
return p0
@@ -1718,7 +1718,7 @@
return p0
:pswitch_8
- const p0, 0x7f12056c
+ const p0, 0x7f12056b
return p0
@@ -1733,7 +1733,7 @@
return p0
:pswitch_b
- const p0, 0x7f1211c8
+ const p0, 0x7f1211ce
return p0
@@ -1743,12 +1743,12 @@
return p0
:pswitch_d
- const p0, 0x7f121046
+ const p0, 0x7f12104c
return p0
:pswitch_e
- const p0, 0x7f120df6
+ const p0, 0x7f120dfa
return p0
@@ -1758,22 +1758,22 @@
return p0
:pswitch_10
- const p0, 0x7f120478
+ const p0, 0x7f120477
return p0
:pswitch_11
- const p0, 0x7f121003
+ const p0, 0x7f121009
return p0
:pswitch_12
- const p0, 0x7f120f7e
+ const p0, 0x7f120f84
return p0
:pswitch_13
- const p0, 0x7f120d6f
+ const p0, 0x7f120d73
return p0
@@ -1793,17 +1793,17 @@
return p0
:pswitch_17
- const p0, 0x7f120643
+ const p0, 0x7f120642
return p0
:pswitch_18
- const p0, 0x7f120553
+ const p0, 0x7f120552
return p0
:pswitch_19
- const p0, 0x7f120541
+ const p0, 0x7f120540
return p0
@@ -1811,12 +1811,12 @@
return v0
:pswitch_1b
- const p0, 0x7f120498
+ const p0, 0x7f120497
return p0
:pswitch_1c
- const p0, 0x7f12047e
+ const p0, 0x7f12047d
return p0
@@ -1936,7 +1936,7 @@
invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
- const v0, 0x7f1210d8
+ const v0, 0x7f1210de
invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/WidgetSettingsLanguage;->setActionBarSubtitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali
index 182185baae..20581c26c1 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali
@@ -378,11 +378,11 @@
invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V
- const p1, 0x7f1210d8
+ const p1, 0x7f1210de
invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->setActionBarSubtitle(I)Lkotlin/Unit;
- const p1, 0x7f120fd7
+ const p1, 0x7f120fdd
invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali
index 39a0efe09b..f9dab74084 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali
@@ -533,7 +533,7 @@
invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
- const p1, 0x7f1210d8
+ const p1, 0x7f1210de
invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsNotifications;->setActionBarSubtitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1.smali
index 8b0e9f804a..8cfd9d041e 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$1$1.smali
@@ -109,15 +109,15 @@
invoke-static {p5, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
- const v0, 0x7f12108c
+ const v0, 0x7f121092
invoke-virtual {p2, v0}, Landroid/widget/TextView;->setText(I)V
- const p2, 0x7f121089
+ const p2, 0x7f12108f
invoke-virtual {p3, p2}, Landroid/widget/TextView;->setText(I)V
- const p2, 0x7f12108a
+ const p2, 0x7f121090
invoke-virtual {p4, p2}, Landroid/widget/TextView;->setText(I)V
@@ -129,7 +129,7 @@
invoke-virtual {p4, p2}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V
- const p2, 0x7f12108b
+ const p2, 0x7f121091
invoke-virtual {p5, p2}, Landroid/widget/TextView;->setText(I)V
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.smali
index e7f2c2a27f..aa20afd348 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configureRequestDataButton$1.smali
@@ -79,7 +79,7 @@
check-cast p1, Landroidx/fragment/app/Fragment;
- const v0, 0x7f120492
+ const v0, 0x7f120491
invoke-static {p1, v0}, Lcom/discord/app/g;->a(Landroidx/fragment/app/Fragment;I)V
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.smali
index aac0df685e..95510c3836 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$1.smali
@@ -75,13 +75,13 @@
invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V
- const v1, 0x7f120491
+ const v1, 0x7f120490
invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
move-result-object v0
- const v1, 0x7f120490
+ const v1, 0x7f12048f
invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.smali
index 550dff8e21..88149da657 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.smali
@@ -86,7 +86,7 @@
invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V
- const v1, 0x7f120488
+ const v1, 0x7f120487
invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
@@ -96,7 +96,7 @@
iget-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2;->$context:Landroid/content/Context;
- const v1, 0x7f120487
+ const v1, 0x7f120486
invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.smali
index 756129548b..907b61065f 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.smali
@@ -72,13 +72,13 @@
invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V
- const v1, 0x7f120486
+ const v1, 0x7f120485
invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
move-result-object v0
- const v1, 0x7f12048b
+ const v1, 0x7f12048a
invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali
index c08c6e8849..591d45860d 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali
@@ -1792,7 +1792,7 @@
move-result-object p1
- const p2, 0x7f12047f
+ const p2, 0x7f12047e
const/4 v1, 0x1
@@ -1810,7 +1810,7 @@
invoke-direct {p2, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V
- const v0, 0x7f120495
+ const v0, 0x7f120494
invoke-virtual {p2, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
@@ -2147,11 +2147,11 @@
invoke-static {p0, v1, v0, v2, v0}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const v0, 0x7f1210d8
+ const v0, 0x7f1210de
invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->setActionBarSubtitle(I)Lkotlin/Unit;
- const v0, 0x7f120d63
+ const v0, 0x7f120d67
invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->setActionBarTitle(I)Lkotlin/Unit;
@@ -2179,7 +2179,7 @@
aput-object v0, v3, v1
- const v0, 0x7f120484
+ const v0, 0x7f120483
invoke-virtual {p0, v0, v3}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
@@ -2217,7 +2217,7 @@
move-result-object v0
- const v3, 0x7f120481
+ const v3, 0x7f120480
invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder.smali
index d8967317f2..2ac5f2a27f 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections$Adapter$ViewHolder.smali
@@ -749,7 +749,7 @@
move-result-object v1
- const v5, 0x7f1204f6
+ const v5, 0x7f1204f5
new-array v6, v3, [Ljava/lang/Object;
@@ -934,7 +934,7 @@
move-result-object v0
- const v1, 0x7f120f2c
+ const v1, 0x7f120f31
invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali
index 1e57deff39..5eed24f67e 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali
@@ -376,11 +376,11 @@
invoke-static {p0, p1, v1, v0, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const p1, 0x7f1210d8
+ const p1, 0x7f1210de
invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections;->setActionBarSubtitle(I)Lkotlin/Unit;
- const p1, 0x7f12042d
+ const p1, 0x7f12042c
invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsUserConnections;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali
index cde9ff4fa6..d0b50dad72 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali
@@ -253,7 +253,7 @@
move-result-object v0
- const v1, 0x7f12041d
+ const v1, 0x7f12041c
invoke-static {v0, v1}, Lcom/discord/app/g;->c(Landroid/content/Context;I)V
@@ -359,11 +359,11 @@
invoke-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const p1, 0x7f1210d8
+ const p1, 0x7f1210de
invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;->setActionBarSubtitle(I)Lkotlin/Unit;
- const p1, 0x7f12042d
+ const p1, 0x7f12042c
invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali
index ae81c8d876..0dfd09d21b 100644
--- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali
+++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali
@@ -2084,7 +2084,7 @@
check-cast v0, Landroidx/fragment/app/Fragment;
- const v1, 0x7f12111a
+ const v1, 0x7f121120
invoke-static {v0, v1}, Lcom/discord/app/g;->a(Landroidx/fragment/app/Fragment;I)V
@@ -2106,11 +2106,11 @@
invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V
- const p1, 0x7f1210d8
+ const p1, 0x7f1210de
invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->setActionBarSubtitle(I)Lkotlin/Unit;
- const p1, 0x7f121176
+ const p1, 0x7f12117c
invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$Mode.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$Mode.smali
index 94f992c2e4..4035633fd3 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$Mode.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetDisableDeleteAccountDialog$Mode.smali
@@ -52,11 +52,11 @@
const/4 v3, 0x0
- const v4, 0x7f1204d3
+ const v4, 0x7f1204d2
- const v5, 0x7f1204d4
+ const v5, 0x7f1204d3
- const v6, 0x7f1204d2
+ const v6, 0x7f1204d1
move-object v1, v7
@@ -74,11 +74,11 @@
const/4 v10, 0x1
- const v11, 0x7f1204a4
+ const v11, 0x7f1204a3
- const v12, 0x7f1204a5
+ const v12, 0x7f1204a4
- const v13, 0x7f1204a3
+ const v13, 0x7f1204a2
move-object v8, v1
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.smali
index 24b9ddbbea..6f24e6d6cd 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetEnableSMSBackupDialog.smali
@@ -628,7 +628,7 @@
move-result-object v2
- const v3, 0x7f120543
+ const v3, 0x7f120542
invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -683,7 +683,7 @@
move-result-object v2
- const v3, 0x7f1204d2
+ const v3, 0x7f1204d1
invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$4.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$4.smali
index 339e3b1259..db9870bdd1 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$4.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$4.smali
@@ -101,7 +101,7 @@
iget-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$4;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccount;
- const v2, 0x7f120d48
+ const v2, 0x7f120d4c
invoke-virtual {p1, v2}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$6$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$6$1.smali
index dccd5f53c7..e16156dd2f 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$6$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$configureUI$6$1.smali
@@ -43,9 +43,9 @@
check-cast v0, Lcom/miguelgaeta/media_picker/MediaPicker$Provider;
- const v1, 0x7f1203b2
+ const v1, 0x7f1203b1
- const v2, 0x7f121049
+ const v2, 0x7f12104f
invoke-static {v0, v1, v2}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1$1.smali
index ffb35e1422..4d7760d956 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount$showRemove2FAModal$1$1.smali
@@ -77,7 +77,7 @@
move-result-object v1
- const v2, 0x7f12110f
+ const v2, 0x7f121115
invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount.smali
index de9e926902..5486779c22 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccount.smali
@@ -2528,13 +2528,13 @@
invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V
- const v1, 0x7f1204a7
+ const v1, 0x7f1204a6
invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
move-result-object v0
- const v1, 0x7f1204a8
+ const v1, 0x7f1204a7
invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
@@ -2581,7 +2581,7 @@
move-result-object v2
- const v3, 0x7f121036
+ const v3, 0x7f12103c
invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -2595,7 +2595,7 @@
move-result-object v3
- const v4, 0x7f12110c
+ const v4, 0x7f121112
invoke-virtual {v3, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -2609,7 +2609,7 @@
move-result-object v4
- const v5, 0x7f121012
+ const v5, 0x7f121018
invoke-virtual {v4, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -2730,11 +2730,11 @@
invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
- const p1, 0x7f1210d8
+ const p1, 0x7f1210de
invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->setActionBarSubtitle(I)Lkotlin/Unit;
- const p1, 0x7f121112
+ const p1, 0x7f121118
invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccount;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.smali
index c74ff869f1..844d2c825c 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$Adapter$BackupCodeViewHolder$onConfigure$1.smali
@@ -84,7 +84,7 @@
move-result-object p1
- const v0, 0x7f120435
+ const v0, 0x7f120434
invoke-static {p1, v0}, Lcom/discord/app/g;->c(Landroid/content/Context;I)V
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.smali
index eb4192fb63..4b17f75c47 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes$getBackupCodes$1.smali
@@ -179,7 +179,7 @@
move-result-object v4
- const v5, 0x7f1210f2
+ const v5, 0x7f1210f8
invoke-virtual {v4, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -258,7 +258,7 @@
move-result-object v2
- const v4, 0x7f121122
+ const v4, 0x7f121128
invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.smali
index de2a7f4fbe..b24da79181 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes.smali
@@ -448,7 +448,7 @@
move-result-object v2
- const v3, 0x7f1210f8
+ const v3, 0x7f1210fe
invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -462,7 +462,7 @@
move-result-object v2
- const v4, 0x7f121018
+ const v4, 0x7f12101e
invoke-virtual {v2, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -517,11 +517,11 @@
invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V
- const p1, 0x7f1210d8
+ const p1, 0x7f1210de
invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;->setActionBarSubtitle(I)Lkotlin/Unit;
- const p1, 0x7f121018
+ const p1, 0x7f12101e
invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountBackupCodes;->setActionBarTitle(I)Lkotlin/Unit;
@@ -553,7 +553,7 @@
new-array p2, p2, [Ljava/lang/Object;
- const v0, 0x7f121017
+ const v0, 0x7f12101d
invoke-virtual {p1, v0, p2}, Lcom/discord/app/AppTextView;->a(I[Ljava/lang/Object;)V
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.smali
index 5127a50c76..afe42d8365 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountChangePassword.smali
@@ -617,7 +617,7 @@
move-result-object v2
- const v3, 0x7f12103b
+ const v3, 0x7f121041
invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -740,7 +740,7 @@
invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
- const p1, 0x7f1210d8
+ const p1, 0x7f1210de
invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountChangePassword;->setActionBarSubtitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1.smali
index b56d8422cc..52ab6f65e7 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1.smali
@@ -63,7 +63,7 @@
iget-object p1, p0, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit$configureUI$1;->this$0:Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;
- const p2, 0x7f120d54
+ const p2, 0x7f120d58
invoke-virtual {p1, p2}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$validationManager$2.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$validationManager$2.smali
index 4d2359afac..c918c3e13a 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$validationManager$2.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit$validationManager$2.smali
@@ -68,7 +68,7 @@
sget-object v6, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
- const v7, 0x7f121133
+ const v7, 0x7f121139
invoke-virtual {v6, v7}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
@@ -134,7 +134,7 @@
sget-object v8, Lcom/discord/utilities/view/validators/BasicTextInputValidator;->Companion:Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;
- const v9, 0x7f12052c
+ const v9, 0x7f12052b
invoke-virtual {v8, v9}, Lcom/discord/utilities/view/validators/BasicTextInputValidator$Companion;->createRequiredInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
@@ -146,7 +146,7 @@
sget-object v8, Lcom/discord/utilities/auth/AuthUtils;->INSTANCE:Lcom/discord/utilities/auth/AuthUtils;
- const v9, 0x7f12052b
+ const v9, 0x7f12052a
invoke-virtual {v8, v9}, Lcom/discord/utilities/auth/AuthUtils;->createEmailInputValidator(I)Lcom/discord/utilities/view/validators/BasicTextInputValidator;
diff --git a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit.smali b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit.smali
index 841b6005be..e7e75d37cf 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/WidgetSettingsAccountEdit.smali
@@ -1088,11 +1088,11 @@
invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
- const p1, 0x7f1210d8
+ const p1, 0x7f1210de
invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->setActionBarSubtitle(I)Lkotlin/Unit;
- const p1, 0x7f1210f5
+ const p1, 0x7f1210fb
invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/account/WidgetSettingsAccountEdit;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.smali b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.smali
index 3d1207a8d6..6c9e063d8f 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFADownload.smali
@@ -119,7 +119,7 @@
aput-object v2, v0, v1
- const v1, 0x7f12101e
+ const v1, 0x7f121024
invoke-virtual {p0, v1, v0}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFADownload;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.smali b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.smali
index e100d2284b..e86c0d0bfe 100644
--- a/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.smali
+++ b/com.discord/smali/com/discord/widgets/settings/account/mfa/WidgetEnableMFAKey.smali
@@ -202,7 +202,7 @@
invoke-virtual {v1, v0}, Landroid/content/ClipboardManager;->setPrimaryClip(Landroid/content/ClipData;)V
:cond_0
- const v0, 0x7f120435
+ const v0, 0x7f120434
invoke-static {p1, v0}, Lcom/discord/app/g;->c(Landroid/content/Context;I)V
@@ -309,7 +309,7 @@
new-array v5, v2, [Ljava/lang/Object;
- const v6, 0x7f121010
+ const v6, 0x7f121016
invoke-virtual {p0, v6}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAKey;->getString(I)Ljava/lang/String;
@@ -360,7 +360,7 @@
new-array v2, v2, [Ljava/lang/Object;
- const v5, 0x7f121011
+ const v5, 0x7f121017
invoke-virtual {p0, v5}, Lcom/discord/widgets/settings/account/mfa/WidgetEnableMFAKey;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsBilling.smali b/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsBilling.smali
index bfe737a68c..ab1b49c421 100644
--- a/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsBilling.smali
+++ b/com.discord/smali/com/discord/widgets/settings/billing/WidgetSettingsBilling.smali
@@ -121,7 +121,7 @@
invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling;->setActionBarTitle(I)Lkotlin/Unit;
- const p1, 0x7f1210d8
+ const p1, 0x7f1210de
invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/billing/WidgetSettingsBilling;->setActionBarSubtitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetCancelPremiumDialog.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetCancelPremiumDialog.smali
index aa1c8fbe9e..0b6acd0a4c 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetCancelPremiumDialog.smali
+++ b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetCancelPremiumDialog.smali
@@ -390,7 +390,7 @@
goto :goto_1
:pswitch_0
- const v2, 0x7f120d30
+ const v2, 0x7f120d34
invoke-virtual {p0, v2}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->getString(I)Ljava/lang/String;
@@ -407,7 +407,7 @@
goto :goto_1
:pswitch_1
- const v2, 0x7f120d31
+ const v2, 0x7f120d35
invoke-virtual {p0, v2}, Lcom/discord/widgets/settings/nitro/WidgetCancelPremiumDialog;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium.smali
index 65567c8910..76068d0e3a 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium.smali
+++ b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetSettingsPremium.smali
@@ -703,7 +703,7 @@
new-instance v2, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium$ButtonConfig;
- const v3, 0x7f120dda
+ const v3, 0x7f120dde
invoke-virtual {v0, v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
@@ -1523,7 +1523,7 @@
throw p1
:pswitch_0
- const v3, 0x7f120d31
+ const v3, 0x7f120d35
invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
@@ -1532,7 +1532,7 @@
goto :goto_1
:pswitch_1
- const v3, 0x7f120d30
+ const v3, 0x7f120d34
invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
@@ -1587,7 +1587,7 @@
aput-object v3, v5, v6
- const v3, 0x7f120fd1
+ const v3, 0x7f120fd7
invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
@@ -2219,12 +2219,12 @@
if-eq p1, v0, :cond_0
- const p1, 0x7f080391
+ const p1, 0x7f08039c
return p1
:cond_0
- const p1, 0x7f08038f
+ const p1, 0x7f08039a
return p1
.end method
@@ -2282,7 +2282,7 @@
move-result-object v1
- const v2, 0x7f120d0d
+ const v2, 0x7f120d11
new-array v3, v7, [Ljava/lang/Object;
@@ -2366,7 +2366,7 @@
if-ne v2, v3, :cond_2
- const v2, 0x7f120d07
+ const v2, 0x7f120d0b
goto :goto_0
@@ -2378,7 +2378,7 @@
throw v1
:cond_3
- const v2, 0x7f120d06
+ const v2, 0x7f120d0a
:goto_0
invoke-virtual {v1}, Lcom/discord/models/domain/ModelSubscriptionPlan$SubscriptionPlanType;->getPrice()I
@@ -2622,7 +2622,7 @@
if-ne p1, v0, :cond_1
- const p1, 0x7f12058e
+ const p1, 0x7f12058d
new-array v0, v0, [Ljava/lang/Object;
@@ -2954,7 +2954,7 @@
invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V
- const v1, 0x7f120d40
+ const v1, 0x7f120d44
invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
@@ -2966,7 +2966,7 @@
move-result-object v0
- const v1, 0x7f120d3f
+ const v1, 0x7f120d43
invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;
@@ -3295,11 +3295,11 @@
invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V
- const p1, 0x7f1210d8
+ const p1, 0x7f1210de
invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->setActionBarSubtitle(I)Lkotlin/Unit;
- const p1, 0x7f120d32
+ const p1, 0x7f120d36
invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->setActionBarTitle(I)Lkotlin/Unit;
@@ -3319,7 +3319,7 @@
new-array v2, v2, [Ljava/lang/Object;
- const v3, 0x7f120571
+ const v3, 0x7f120570
invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
@@ -3327,7 +3327,7 @@
aput-object v3, v2, p1
- const p1, 0x7f120573
+ const p1, 0x7f120572
invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetSettingsPremium;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog.smali b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog.smali
index 157eacd3ea..f7c043d83b 100644
--- a/com.discord/smali/com/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog.smali
+++ b/com.discord/smali/com/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog.smali
@@ -349,7 +349,7 @@
move-result-object v4
- const v5, 0x7f120d3b
+ const v5, 0x7f120d3f
const/4 v6, 0x1
@@ -387,7 +387,7 @@
if-ne v4, v8, :cond_6
- const v4, 0x7f120d37
+ const v4, 0x7f120d3b
new-array v8, v7, [Ljava/lang/Object;
@@ -436,7 +436,7 @@
if-ne v4, v8, :cond_7
- const v4, 0x7f120d38
+ const v4, 0x7f120d3c
new-array v8, v7, [Ljava/lang/Object;
@@ -485,7 +485,7 @@
if-ne v4, v8, :cond_8
- const v4, 0x7f120d36
+ const v4, 0x7f120d3a
new-array v8, v7, [Ljava/lang/Object;
@@ -522,7 +522,7 @@
goto :goto_3
:cond_8
- const v2, 0x7f120d39
+ const v2, 0x7f120d3d
new-array v4, v6, [Ljava/lang/Object;
@@ -794,7 +794,7 @@
throw p1
:pswitch_0
- const p1, 0x7f120d30
+ const p1, 0x7f120d34
invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->getString(I)Ljava/lang/String;
@@ -803,7 +803,7 @@
goto :goto_0
:pswitch_1
- const p1, 0x7f120d31
+ const p1, 0x7f120d35
invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/nitro/WidgetUpgradePremiumDialog;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3$2.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3$2.smali
index c944f54e2e..e46f0f0b6a 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3$2.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare$onSendClicked$3$2.smali
@@ -167,7 +167,7 @@
iget-object v0, v0, Lcom/discord/widgets/share/WidgetIncomingShare$onSendClicked$3;->$context:Landroid/content/Context;
- const v3, 0x7f120d57
+ const v3, 0x7f120d5b
invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali
index 207bcf270d..8330357bf6 100644
--- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali
+++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali
@@ -685,7 +685,7 @@
goto :goto_1
:cond_3
- const p1, 0x7f121077
+ const p1, 0x7f12107d
:goto_1
invoke-virtual {v0, p1}, Landroid/widget/TextView;->setHint(I)V
@@ -1641,7 +1641,7 @@
return-void
:cond_0
- const v0, 0x7f120efa
+ const v0, 0x7f120efe
invoke-virtual {p0, v0}, Lcom/discord/widgets/share/WidgetIncomingShare;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$1.smali
similarity index 63%
rename from com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$get$1.smali
rename to com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$1.smali
index 0d396276df..db8cb3cdc0 100644
--- a/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$1.smali
@@ -1,14 +1,14 @@
-.class final synthetic Lcom/discord/widgets/status/WidgetStatus$Model$Companion$get$1;
+.class final synthetic Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$1;
.super Lkotlin/jvm/internal/i;
.source "WidgetStatus.kt"
# interfaces
-.implements Lkotlin/jvm/functions/Function3;
+.implements Lkotlin/jvm/functions/Function4;
# annotations
.annotation system Ldalvik/annotation/EnclosingMethod;
- value = Lcom/discord/widgets/status/WidgetStatus$Model$Companion;->get()Lrx/Observable;
+ value = Lcom/discord/widgets/status/WidgetStatus$Model$Companion;->getNew()Lrx/Observable;
.end annotation
.annotation system Ldalvik/annotation/InnerClass;
@@ -19,8 +19,9 @@
.annotation system Ldalvik/annotation/Signature;
value = {
"Lkotlin/jvm/internal/i;",
- "Lkotlin/jvm/functions/Function3<",
+ "Lkotlin/jvm/functions/Function4<",
"Ljava/lang/Integer;",
+ "Ljava/lang/Boolean;",
"Ljava/util/Set<",
"+",
"Ljava/lang/Long;",
@@ -36,7 +37,7 @@
.method constructor (Lcom/discord/widgets/status/WidgetStatus$Model$Companion;)V
.locals 1
- const/4 v0, 0x3
+ const/4 v0, 0x4
invoke-direct {p0, v0, p1}, Lkotlin/jvm/internal/i;->(ILjava/lang/Object;)V
@@ -68,16 +69,16 @@
.method public final getSignature()Ljava/lang/String;
.locals 1
- const-string v0, "createModel(ILjava/util/Set;Lcom/discord/models/application/Unread;)Lcom/discord/widgets/status/WidgetStatus$Model;"
+ const-string v0, "createModel(IZLjava/util/Set;Lcom/discord/models/application/Unread;)Lcom/discord/widgets/status/WidgetStatus$Model;"
return-object v0
.end method
-.method public final invoke(ILjava/util/Set;Lcom/discord/models/application/Unread;)Lcom/discord/widgets/status/WidgetStatus$Model;
+.method public final invoke(IZLjava/util/Set;Lcom/discord/models/application/Unread;)Lcom/discord/widgets/status/WidgetStatus$Model;
.locals 1
.annotation system Ldalvik/annotation/Signature;
value = {
- "(I",
+ "(IZ",
"Ljava/util/Set<",
"Ljava/lang/Long;",
">;",
@@ -87,26 +88,26 @@
}
.end annotation
- const-string v0, "p2"
-
- invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
-
const-string v0, "p3"
invoke-static {p3, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
- iget-object v0, p0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$get$1;->receiver:Ljava/lang/Object;
+ const-string v0, "p4"
+
+ invoke-static {p4, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+
+ iget-object v0, p0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$1;->receiver:Ljava/lang/Object;
check-cast v0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion;
- invoke-static {v0, p1, p2, p3}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion;->access$createModel(Lcom/discord/widgets/status/WidgetStatus$Model$Companion;ILjava/util/Set;Lcom/discord/models/application/Unread;)Lcom/discord/widgets/status/WidgetStatus$Model;
+ invoke-static {v0, p1, p2, p3, p4}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion;->access$createModel(Lcom/discord/widgets/status/WidgetStatus$Model$Companion;IZLjava/util/Set;Lcom/discord/models/application/Unread;)Lcom/discord/widgets/status/WidgetStatus$Model;
move-result-object p1
return-object p1
.end method
-.method public final synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+.method public final synthetic invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
.locals 0
check-cast p1, Ljava/lang/Number;
@@ -115,11 +116,17 @@
move-result p1
- check-cast p2, Ljava/util/Set;
+ check-cast p2, Ljava/lang/Boolean;
- check-cast p3, Lcom/discord/models/application/Unread;
+ invoke-virtual {p2}, Ljava/lang/Boolean;->booleanValue()Z
- invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$get$1;->invoke(ILjava/util/Set;Lcom/discord/models/application/Unread;)Lcom/discord/widgets/status/WidgetStatus$Model;
+ move-result p2
+
+ check-cast p3, Ljava/util/Set;
+
+ check-cast p4, Lcom/discord/models/application/Unread;
+
+ invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$1;->invoke(IZLjava/util/Set;Lcom/discord/models/application/Unread;)Lcom/discord/widgets/status/WidgetStatus$Model;
move-result-object p1
diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$1.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$1.smali
new file mode 100644
index 0000000000..e338ec0979
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$1.smali
@@ -0,0 +1,99 @@
+.class final Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$1;
+.super Ljava/lang/Object;
+.source "WidgetStatus.kt"
+
+# interfaces
+.implements Lrx/functions/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1;->call(Ljava/lang/Long;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x18
+ name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+ value = {
+ "",
+ "Ljava/lang/Object;",
+ "Lrx/functions/b<",
+ "Lcom/discord/stores/StoreChat$InteractionState;",
+ "Ljava/lang/Boolean;",
+ ">;"
+ }
+.end annotation
+
+
+# instance fields
+.field final synthetic $selectedChannelId:Ljava/lang/Long;
+
+
+# direct methods
+.method constructor (Ljava/lang/Long;)V
+ .locals 0
+
+ iput-object p1, p0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$1;->$selectedChannelId:Ljava/lang/Long;
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public final synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+ .locals 0
+
+ check-cast p1, Lcom/discord/stores/StoreChat$InteractionState;
+
+ invoke-virtual {p0, p1}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$1;->call(Lcom/discord/stores/StoreChat$InteractionState;)Z
+
+ move-result p1
+
+ invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+ move-result-object p1
+
+ return-object p1
+.end method
+
+.method public final call(Lcom/discord/stores/StoreChat$InteractionState;)Z
+ .locals 4
+
+ invoke-virtual {p1}, Lcom/discord/stores/StoreChat$InteractionState;->getChannelId()J
+
+ move-result-wide v0
+
+ iget-object p1, p0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$1;->$selectedChannelId:Ljava/lang/Long;
+
+ if-nez p1, :cond_0
+
+ goto :goto_0
+
+ :cond_0
+ invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
+
+ move-result-wide v2
+
+ cmp-long p1, v0, v2
+
+ if-nez p1, :cond_1
+
+ const/4 p1, 0x1
+
+ return p1
+
+ :cond_1
+ :goto_0
+ const/4 p1, 0x0
+
+ return p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$2.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$2.smali
new file mode 100644
index 0000000000..d1b1374b61
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$2.smali
@@ -0,0 +1,112 @@
+.class final Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$2;
+.super Ljava/lang/Object;
+.source "WidgetStatus.kt"
+
+# interfaces
+.implements Lrx/functions/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1;->call(Ljava/lang/Long;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x18
+ name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+ value = {
+ "",
+ "Ljava/lang/Object;",
+ "Lrx/functions/b<",
+ "TT;",
+ "Lrx/Observable<",
+ "+TR;>;>;"
+ }
+.end annotation
+
+
+# instance fields
+.field final synthetic $selectedChannelId:Ljava/lang/Long;
+
+
+# direct methods
+.method constructor (Ljava/lang/Long;)V
+ .locals 0
+
+ iput-object p1, p0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$2;->$selectedChannelId:Ljava/lang/Long;
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+ .locals 0
+
+ check-cast p1, Lcom/discord/stores/StoreChat$InteractionState;
+
+ invoke-virtual {p0, p1}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$2;->call(Lcom/discord/stores/StoreChat$InteractionState;)Lrx/Observable;
+
+ move-result-object p1
+
+ return-object p1
+.end method
+
+.method public final call(Lcom/discord/stores/StoreChat$InteractionState;)Lrx/Observable;
+ .locals 2
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Lcom/discord/stores/StoreChat$InteractionState;",
+ ")",
+ "Lrx/Observable<",
+ "+",
+ "Lcom/discord/stores/StoreMessageAck$Ack;",
+ ">;"
+ }
+ .end annotation
+
+ invoke-virtual {p1}, Lcom/discord/stores/StoreChat$InteractionState;->isAtBottomIgnoringTouch()Z
+
+ move-result p1
+
+ if-eqz p1, :cond_0
+
+ invoke-static {}, Lcom/discord/stores/StoreStream;->getMessageAck()Lcom/discord/stores/StoreMessageAck;
+
+ move-result-object p1
+
+ iget-object v0, p0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$2;->$selectedChannelId:Ljava/lang/Long;
+
+ const-string v1, "selectedChannelId"
+
+ invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+ invoke-virtual {v0}, Ljava/lang/Long;->longValue()J
+
+ move-result-wide v0
+
+ invoke-virtual {p1, v0, v1}, Lcom/discord/stores/StoreMessageAck;->get(J)Lrx/Observable;
+
+ move-result-object p1
+
+ return-object p1
+
+ :cond_0
+ const/4 p1, 0x0
+
+ invoke-static {p1}, Lrx/Observable;->bA(Ljava/lang/Object;)Lrx/Observable;
+
+ move-result-object p1
+
+ return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$3.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$3.smali
new file mode 100644
index 0000000000..c962fd36f9
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$3.smali
@@ -0,0 +1,128 @@
+.class final Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$3;
+.super Ljava/lang/Object;
+.source "WidgetStatus.kt"
+
+# interfaces
+.implements Lrx/functions/Func3;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1;->call(Ljava/lang/Long;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x18
+ 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/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$3;
+
+
+# direct methods
+.method static constructor ()V
+ .locals 1
+
+ new-instance v0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$3;
+
+ invoke-direct {v0}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$3;->()V
+
+ sput-object v0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$3;->INSTANCE:Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$3;
+
+ return-void
+.end method
+
+.method constructor ()V
+ .locals 0
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public final synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ .locals 0
+
+ check-cast p1, Lcom/discord/stores/StoreMessageAck$Ack;
+
+ check-cast p2, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;
+
+ check-cast p3, Ljava/lang/Long;
+
+ invoke-virtual {p0, p1, p2, p3}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$3;->call(Lcom/discord/stores/StoreMessageAck$Ack;Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;Ljava/lang/Long;)Z
+
+ move-result p1
+
+ invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+ move-result-object p1
+
+ return-object p1
+.end method
+
+.method public final call(Lcom/discord/stores/StoreMessageAck$Ack;Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;Ljava/lang/Long;)Z
+ .locals 3
+
+ invoke-virtual {p2}, Lcom/discord/stores/StoreMessagesLoader$ChannelLoadedState;->isLoadingMessages()Z
+
+ move-result p2
+
+ const/4 v0, 0x1
+
+ if-eqz p2, :cond_0
+
+ return v0
+
+ :cond_0
+ if-eqz p1, :cond_1
+
+ invoke-virtual {p1}, Lcom/discord/stores/StoreMessageAck$Ack;->getMessageId()J
+
+ move-result-wide p1
+
+ goto :goto_0
+
+ :cond_1
+ const-wide/16 p1, 0x0
+
+ :goto_0
+ const-string v1, "mostRecentIdSnapshot"
+
+ invoke-static {p3, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+ invoke-virtual {p3}, Ljava/lang/Long;->longValue()J
+
+ move-result-wide v1
+
+ cmp-long p3, p1, v1
+
+ if-gez p3, :cond_2
+
+ return v0
+
+ :cond_2
+ const/4 p1, 0x0
+
+ return p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$4.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$4.smali
new file mode 100644
index 0000000000..f7a18b5a19
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$4.smali
@@ -0,0 +1,88 @@
+.class final Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$4;
+.super Ljava/lang/Object;
+.source "WidgetStatus.kt"
+
+# interfaces
+.implements Lrx/functions/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1;->call(Ljava/lang/Long;)Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x18
+ name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+ value = {
+ "",
+ "Ljava/lang/Object;",
+ "Lrx/functions/b<",
+ "Ljava/lang/Boolean;",
+ "Ljava/lang/Boolean;",
+ ">;"
+ }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$4;
+
+
+# direct methods
+.method static constructor ()V
+ .locals 1
+
+ new-instance v0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$4;
+
+ invoke-direct {v0}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$4;->()V
+
+ sput-object v0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$4;->INSTANCE:Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$4;
+
+ return-void
+.end method
+
+.method constructor ()V
+ .locals 0
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public final synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+ .locals 0
+
+ check-cast p1, Ljava/lang/Boolean;
+
+ invoke-virtual {p0, p1}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$4;->call(Ljava/lang/Boolean;)Z
+
+ move-result p1
+
+ invoke-static {p1}, Ljava/lang/Boolean;->valueOf(Z)Ljava/lang/Boolean;
+
+ move-result-object p1
+
+ return-object p1
+.end method
+
+.method public final call(Ljava/lang/Boolean;)Z
+ .locals 1
+
+ sget-object v0, Ljava/lang/Boolean;->FALSE:Ljava/lang/Boolean;
+
+ invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+ move-result p1
+
+ return p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1.smali
new file mode 100644
index 0000000000..d9e55e734d
--- /dev/null
+++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1.smali
@@ -0,0 +1,180 @@
+.class final Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1;
+.super Ljava/lang/Object;
+.source "WidgetStatus.kt"
+
+# interfaces
+.implements Lrx/functions/b;
+
+
+# annotations
+.annotation system Ldalvik/annotation/EnclosingMethod;
+ value = Lcom/discord/widgets/status/WidgetStatus$Model$Companion;->getNew()Lrx/Observable;
+.end annotation
+
+.annotation system Ldalvik/annotation/InnerClass;
+ accessFlags = 0x18
+ name = null
+.end annotation
+
+.annotation system Ldalvik/annotation/Signature;
+ value = {
+ "",
+ "Ljava/lang/Object;",
+ "Lrx/functions/b<",
+ "TT;",
+ "Lrx/Observable<",
+ "+TR;>;>;"
+ }
+.end annotation
+
+
+# static fields
+.field public static final INSTANCE:Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1;
+
+
+# direct methods
+.method static constructor ()V
+ .locals 1
+
+ new-instance v0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1;
+
+ invoke-direct {v0}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1;->()V
+
+ sput-object v0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1;->INSTANCE:Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1;
+
+ return-void
+.end method
+
+.method constructor ()V
+ .locals 0
+
+ invoke-direct {p0}, Ljava/lang/Object;->()V
+
+ return-void
+.end method
+
+
+# virtual methods
+.method public final bridge synthetic call(Ljava/lang/Object;)Ljava/lang/Object;
+ .locals 0
+
+ check-cast p1, Ljava/lang/Long;
+
+ invoke-virtual {p0, p1}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1;->call(Ljava/lang/Long;)Lrx/Observable;
+
+ move-result-object p1
+
+ return-object p1
+.end method
+
+.method public final call(Ljava/lang/Long;)Lrx/Observable;
+ .locals 5
+ .annotation system Ldalvik/annotation/Signature;
+ value = {
+ "(",
+ "Ljava/lang/Long;",
+ ")",
+ "Lrx/Observable<",
+ "Ljava/lang/Boolean;",
+ ">;"
+ }
+ .end annotation
+
+ invoke-static {}, Lcom/discord/stores/StoreStream;->getChat()Lcom/discord/stores/StoreChat;
+
+ move-result-object v0
+
+ invoke-virtual {v0}, Lcom/discord/stores/StoreChat;->getInteractionState()Lrx/Observable;
+
+ move-result-object v0
+
+ new-instance v1, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$1;
+
+ invoke-direct {v1, p1}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$1;->(Ljava/lang/Long;)V
+
+ check-cast v1, Lrx/functions/b;
+
+ invoke-virtual {v0, v1}, Lrx/Observable;->b(Lrx/functions/b;)Lrx/Observable;
+
+ move-result-object v0
+
+ sget-object v1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+ const-wide/16 v2, 0x12c
+
+ invoke-virtual {v0, v2, v3, v1}, Lrx/Observable;->i(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+
+ move-result-object v0
+
+ new-instance v1, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$2;
+
+ invoke-direct {v1, p1}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$2;->(Ljava/lang/Long;)V
+
+ check-cast v1, Lrx/functions/b;
+
+ invoke-virtual {v0, v1}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
+
+ move-result-object v0
+
+ invoke-static {}, Lcom/discord/stores/StoreStream;->getMessagesLoader()Lcom/discord/stores/StoreMessagesLoader;
+
+ move-result-object v1
+
+ const-string v2, "selectedChannelId"
+
+ invoke-static {p1, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+ invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
+
+ move-result-wide v2
+
+ invoke-virtual {v1, v2, v3}, Lcom/discord/stores/StoreMessagesLoader;->getMessagesLoadedState(J)Lrx/Observable;
+
+ move-result-object v1
+
+ invoke-static {}, Lcom/discord/stores/StoreStream;->getMessagesMostRecent()Lcom/discord/stores/StoreMessagesMostRecent;
+
+ move-result-object v2
+
+ invoke-virtual {p1}, Ljava/lang/Long;->longValue()J
+
+ move-result-wide v3
+
+ invoke-virtual {v2, v3, v4}, Lcom/discord/stores/StoreMessagesMostRecent;->get(J)Lrx/Observable;
+
+ move-result-object p1
+
+ sget-object v2, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+ const-wide/16 v3, 0xc8
+
+ invoke-virtual {p1, v3, v4, v2}, Lrx/Observable;->i(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+
+ move-result-object p1
+
+ invoke-virtual {p1}, Lrx/Observable;->Fu()Lrx/Observable;
+
+ move-result-object p1
+
+ sget-object v2, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$3;->INSTANCE:Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$3;
+
+ check-cast v2, Lrx/functions/Func3;
+
+ invoke-static {v0, v1, p1, v2}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func3;)Lrx/Observable;
+
+ move-result-object p1
+
+ sget-object v0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$4;->INSTANCE:Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1$4;
+
+ check-cast v0, Lrx/functions/b;
+
+ invoke-virtual {p1, v0}, Lrx/Observable;->h(Lrx/functions/b;)Lrx/Observable;
+
+ move-result-object p1
+
+ return-object p1
+.end method
diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion.smali
index 143478168c..04bb0db52a 100644
--- a/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus$Model$Companion.smali
@@ -31,21 +31,21 @@
return-void
.end method
-.method public static final synthetic access$createModel(Lcom/discord/widgets/status/WidgetStatus$Model$Companion;ILjava/util/Set;Lcom/discord/models/application/Unread;)Lcom/discord/widgets/status/WidgetStatus$Model;
+.method public static final synthetic access$createModel(Lcom/discord/widgets/status/WidgetStatus$Model$Companion;IZLjava/util/Set;Lcom/discord/models/application/Unread;)Lcom/discord/widgets/status/WidgetStatus$Model;
.locals 0
- invoke-direct {p0, p1, p2, p3}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion;->createModel(ILjava/util/Set;Lcom/discord/models/application/Unread;)Lcom/discord/widgets/status/WidgetStatus$Model;
+ invoke-direct {p0, p1, p2, p3, p4}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion;->createModel(IZLjava/util/Set;Lcom/discord/models/application/Unread;)Lcom/discord/widgets/status/WidgetStatus$Model;
move-result-object p0
return-object p0
.end method
-.method private final createModel(ILjava/util/Set;Lcom/discord/models/application/Unread;)Lcom/discord/widgets/status/WidgetStatus$Model;
+.method private final createModel(IZLjava/util/Set;Lcom/discord/models/application/Unread;)Lcom/discord/widgets/status/WidgetStatus$Model;
.locals 17
.annotation system Ldalvik/annotation/Signature;
value = {
- "(I",
+ "(IZ",
"Ljava/util/Set<",
"Ljava/lang/Long;",
">;",
@@ -57,7 +57,7 @@
move/from16 v0, p1
- invoke-virtual/range {p3 .. p3}, Lcom/discord/models/application/Unread;->getMarker()Lcom/discord/models/application/Unread$Marker;
+ invoke-virtual/range {p4 .. p4}, Lcom/discord/models/application/Unread;->getMarker()Lcom/discord/models/application/Unread$Marker;
move-result-object v1
@@ -69,13 +69,13 @@
move-result-object v2
- move-object/from16 v3, p2
+ move-object/from16 v3, p3
invoke-interface {v3, v2}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z
move-result v2
- invoke-virtual/range {p3 .. p3}, Lcom/discord/models/application/Unread;->getCount()I
+ invoke-virtual/range {p4 .. p4}, Lcom/discord/models/application/Unread;->getCount()I
move-result v3
@@ -123,7 +123,9 @@
if-nez v9, :cond_4
- invoke-virtual/range {p3 .. p3}, Lcom/discord/models/application/Unread;->getCount()I
+ if-eqz p2, :cond_3
+
+ invoke-virtual/range {p4 .. p4}, Lcom/discord/models/application/Unread;->getCount()I
move-result v4
@@ -196,8 +198,8 @@
# virtual methods
-.method public final get()Lrx/Observable;
- .locals 9
+.method public final getNew()Lrx/Observable;
+ .locals 6
.annotation system Ldalvik/annotation/Signature;
value = {
"()",
@@ -207,65 +209,91 @@
}
.end annotation
- invoke-static {}, Lcom/discord/stores/StoreStream;->getConnectivity()Lcom/discord/stores/StoreConnectivity;
+ invoke-static {}, Lcom/discord/stores/StoreStream;->getChannelsSelected()Lcom/discord/stores/StoreChannelsSelected;
move-result-object v0
- const-string v1, "StoreStream\n .getConnectivity()"
+ invoke-virtual {v0}, Lcom/discord/stores/StoreChannelsSelected;->getId()Lrx/Observable;
- invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+ move-result-object v0
- invoke-virtual {v0}, Lcom/discord/stores/StoreConnectivity;->getState()Lrx/Observable;
+ invoke-virtual {v0}, Lrx/Observable;->Fp()Lrx/Observable;
- move-result-object v2
+ move-result-object v0
+
+ sget-object v1, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1;->INSTANCE:Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$isUnreadValidObs$1;
+
+ check-cast v1, Lrx/functions/b;
+
+ invoke-virtual {v0, v1}, Lrx/Observable;->g(Lrx/functions/b;)Lrx/Observable;
+
+ move-result-object v0
+
+ invoke-virtual {v0}, Lrx/Observable;->Fp()Lrx/Observable;
+
+ move-result-object v0
+
+ invoke-static {}, Lcom/discord/stores/StoreStream;->getConnectivity()Lcom/discord/stores/StoreConnectivity;
+
+ move-result-object v1
+
+ const-string v2, "StoreStream\n .getConnectivity()"
+
+ invoke-static {v1, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+ invoke-virtual {v1}, Lcom/discord/stores/StoreConnectivity;->getState()Lrx/Observable;
+
+ move-result-object v1
invoke-static {}, Lcom/discord/stores/StoreStream;->getMessages()Lcom/discord/stores/StoreMessages;
- move-result-object v0
+ move-result-object v2
- invoke-virtual {v0}, Lcom/discord/stores/StoreMessages;->getAllDetached()Lrx/Observable;
+ invoke-virtual {v2}, Lcom/discord/stores/StoreMessages;->getAllDetached()Lrx/Observable;
- move-result-object v3
+ move-result-object v2
invoke-static {}, Lcom/discord/stores/StoreStream;->getReadStates()Lcom/discord/stores/StoreReadStates;
- move-result-object v0
+ move-result-object v3
- const-string v1, "StoreStream\n .getReadStates()"
+ const-string v4, "StoreStream\n .getReadStates()"
- invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-static {v3, v4}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-virtual {v0}, Lcom/discord/stores/StoreReadStates;->getUnreadMarkerForSelectedChannel()Lrx/Observable;
+ invoke-virtual {v3}, Lcom/discord/stores/StoreReadStates;->getUnreadMarkerForSelectedChannel()Lrx/Observable;
- move-result-object v4
+ move-result-object v3
- new-instance v0, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$get$1;
+ new-instance v4, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$1;
- move-object v1, p0
+ move-object v5, p0
- check-cast v1, Lcom/discord/widgets/status/WidgetStatus$Model$Companion;
+ check-cast v5, Lcom/discord/widgets/status/WidgetStatus$Model$Companion;
- invoke-direct {v0, v1}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$get$1;->(Lcom/discord/widgets/status/WidgetStatus$Model$Companion;)V
+ invoke-direct {v4, v5}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion$getNew$1;->(Lcom/discord/widgets/status/WidgetStatus$Model$Companion;)V
- check-cast v0, Lkotlin/jvm/functions/Function3;
+ check-cast v4, Lkotlin/jvm/functions/Function4;
- new-instance v1, Lcom/discord/widgets/status/WidgetStatus$sam$rx_functions_Func3$0;
+ new-instance v5, Lcom/discord/widgets/status/WidgetStatus$sam$rx_functions_Func4$0;
- invoke-direct {v1, v0}, Lcom/discord/widgets/status/WidgetStatus$sam$rx_functions_Func3$0;->(Lkotlin/jvm/functions/Function3;)V
+ invoke-direct {v5, v4}, Lcom/discord/widgets/status/WidgetStatus$sam$rx_functions_Func4$0;->(Lkotlin/jvm/functions/Function4;)V
- move-object v5, v1
+ check-cast v5, Lrx/functions/Func4;
- check-cast v5, Lrx/functions/Func3;
-
- sget-object v8, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
-
- const-wide/16 v6, 0x1f4
-
- invoke-static/range {v2 .. v8}, Lcom/discord/utilities/rx/ObservableWithLeadingEdgeThrottle;->combineLatest(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func3;JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+ invoke-static {v1, v0, v2, v3, v5}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func4;)Lrx/Observable;
move-result-object v0
- const-string v1, "ObservableWithLeadingEdg\u20260, TimeUnit.MILLISECONDS)"
+ sget-object v1, Ljava/util/concurrent/TimeUnit;->MILLISECONDS:Ljava/util/concurrent/TimeUnit;
+
+ const-wide/16 v2, 0x1f4
+
+ invoke-virtual {v0, v2, v3, v1}, Lrx/Observable;->i(JLjava/util/concurrent/TimeUnit;)Lrx/Observable;
+
+ move-result-object v0
+
+ const-string v1, "Observable\n .\u20260, TimeUnit.MILLISECONDS)"
invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
@@ -277,7 +305,7 @@
move-result-object v0
- const-string v1, "ObservableWithLeadingEdg\u2026 .distinctUntilChanged()"
+ const-string v1, "Observable\n .\u2026 .distinctUntilChanged()"
invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus$sam$rx_functions_Func3$0.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus$sam$rx_functions_Func4$0.smali
similarity index 55%
rename from com.discord/smali/com/discord/widgets/status/WidgetStatus$sam$rx_functions_Func3$0.smali
rename to com.discord/smali/com/discord/widgets/status/WidgetStatus$sam$rx_functions_Func4$0.smali
index 0f6ea8ebc8..b51a5cfcb4 100644
--- a/com.discord/smali/com/discord/widgets/status/WidgetStatus$sam$rx_functions_Func3$0.smali
+++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus$sam$rx_functions_Func4$0.smali
@@ -1,34 +1,34 @@
-.class final Lcom/discord/widgets/status/WidgetStatus$sam$rx_functions_Func3$0;
+.class final Lcom/discord/widgets/status/WidgetStatus$sam$rx_functions_Func4$0;
.super Ljava/lang/Object;
.source "WidgetStatus.kt"
# interfaces
-.implements Lrx/functions/Func3;
+.implements Lrx/functions/Func4;
# instance fields
-.field private final synthetic function:Lkotlin/jvm/functions/Function3;
+.field private final synthetic function:Lkotlin/jvm/functions/Function4;
# direct methods
-.method constructor (Lkotlin/jvm/functions/Function3;)V
+.method constructor (Lkotlin/jvm/functions/Function4;)V
.locals 0
invoke-direct {p0}, Ljava/lang/Object;->()V
- iput-object p1, p0, Lcom/discord/widgets/status/WidgetStatus$sam$rx_functions_Func3$0;->function:Lkotlin/jvm/functions/Function3;
+ iput-object p1, p0, Lcom/discord/widgets/status/WidgetStatus$sam$rx_functions_Func4$0;->function:Lkotlin/jvm/functions/Function4;
return-void
.end method
# virtual methods
-.method public final synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+.method public final synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
.locals 1
- iget-object v0, p0, Lcom/discord/widgets/status/WidgetStatus$sam$rx_functions_Func3$0;->function:Lkotlin/jvm/functions/Function3;
+ iget-object v0, p0, Lcom/discord/widgets/status/WidgetStatus$sam$rx_functions_Func4$0;->function:Lkotlin/jvm/functions/Function4;
- invoke-interface {v0, p1, p2, p3}, Lkotlin/jvm/functions/Function3;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-interface {v0, p1, p2, p3, p4}, Lkotlin/jvm/functions/Function4;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
move-result-object p1
diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali
index d7d0d8c578..de63462a99 100644
--- a/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali
+++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali
@@ -573,7 +573,7 @@
invoke-direct {p2}, Ljava/lang/StringBuilder;->()V
- const v0, 0x7f12041a
+ const v0, 0x7f120419
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -888,7 +888,7 @@
sget-object v0, Lcom/discord/widgets/status/WidgetStatus$Model;->Companion:Lcom/discord/widgets/status/WidgetStatus$Model$Companion;
- invoke-virtual {v0}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion;->get()Lrx/Observable;
+ invoke-virtual {v0}, Lcom/discord/widgets/status/WidgetStatus$Model$Companion;->getNew()Lrx/Observable;
move-result-object v0
diff --git a/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali b/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali
index 8b4d0687ab..4c83eb0fca 100644
--- a/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali
+++ b/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali
@@ -224,7 +224,7 @@
if-eqz v0, :cond_1
- const v2, 0x7f120fd1
+ const v2, 0x7f120fd7
invoke-direct {p0, v0, v2}, Lcom/discord/widgets/tos/WidgetTosAccept;->getFormattedUrl(Landroid/content/Context;I)Ljava/lang/CharSequence;
@@ -248,7 +248,7 @@
if-eqz v0, :cond_2
- const v1, 0x7f120d65
+ const v1, 0x7f120d69
invoke-direct {p0, v0, v1}, Lcom/discord/widgets/tos/WidgetTosAccept;->getFormattedUrl(Landroid/content/Context;I)Ljava/lang/CharSequence;
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderGameRichPresence.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderGameRichPresence.smali
index 0abc11bfb6..3c106527a2 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderGameRichPresence.smali
+++ b/com.discord/smali/com/discord/widgets/user/ViewHolderGameRichPresence.smali
@@ -61,7 +61,7 @@
if-eqz v3, :cond_0
- const v4, 0x7f1210bd
+ const v4, 0x7f1210c3
const/4 v5, 0x2
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence.smali
index ef02c03fee..4c574532c3 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence.smali
+++ b/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence.smali
@@ -222,7 +222,7 @@
invoke-static {v5, v7}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
- const v7, 0x7f1210b7
+ const v7, 0x7f1210bd
const/4 v8, 0x1
@@ -246,7 +246,7 @@
invoke-static {v3, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
- const v5, 0x7f1210b6
+ const v5, 0x7f1210bc
new-array v7, v8, [Ljava/lang/Object;
@@ -334,7 +334,7 @@
invoke-static {v3, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
- const v1, 0x7f12109d
+ const v1, 0x7f1210a3
invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -357,7 +357,7 @@
invoke-static {v3, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
- const v1, 0x7f1210ba
+ const v1, 0x7f1210c0
new-array v4, v8, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence.smali
index af937578f3..399bf1f8b4 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence.smali
+++ b/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence.smali
@@ -100,7 +100,7 @@
move-result-object v2
- const v3, 0x7f1210ab
+ const v3, 0x7f1210b1
const/4 v4, 0x1
@@ -186,7 +186,7 @@
move-result-object v1
- const v3, 0x7f1210a1
+ const v3, 0x7f1210a7
new-array v4, v4, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence.smali
index ca47a18389..1a042a82f4 100644
--- a/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence.smali
+++ b/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence.smali
@@ -432,7 +432,7 @@
if-eqz v3, :cond_0
- const v4, 0x7f1210bd
+ const v4, 0x7f1210c3
const/4 v5, 0x2
@@ -832,7 +832,7 @@
move-result-wide v8
- const p1, 0x7f1210bf
+ const p1, 0x7f1210c5
invoke-virtual {p0, p1}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->getString(I)Ljava/lang/String;
@@ -863,7 +863,7 @@
move-result-wide v8
- const p1, 0x7f1210c1
+ const p1, 0x7f1210c7
invoke-virtual {p0, p1}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers.smali b/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers.smali
index cf5993f57c..7669e098da 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers.smali
@@ -127,7 +127,7 @@
invoke-direct {v0}, Ljava/lang/StringBuilder;->()V
- const v1, 0x7f120d6e
+ const v1, 0x7f120d72
invoke-virtual {p0, v1}, Lcom/discord/widgets/user/WidgetPruneUsers;->getString(I)Ljava/lang/String;
@@ -267,7 +267,7 @@
iget-object v3, p0, Lcom/discord/widgets/user/WidgetPruneUsers;->estimateText:Lcom/discord/app/AppTextView;
- const v5, 0x7f12059c
+ const v5, 0x7f12059b
const/4 v6, 0x2
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1.smali
index f9d85469ed..48acb045f8 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model$Companion$get$1.smali
@@ -74,7 +74,7 @@
# virtual methods
.method public final call(Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;Lcom/discord/models/domain/ModelGuild;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/lang/Long;Ljava/lang/Boolean;)Lcom/discord/widgets/user/WidgetUserMentions$Model;
- .locals 33
+ .locals 35
.annotation system Ldalvik/annotation/Signature;
value = {
"(",
@@ -112,293 +112,305 @@
}
.end annotation
- move-object/from16 v0, p6
+ move-object/from16 v0, p5
- move-object/from16 v1, p7
+ move-object/from16 v1, p6
- move-object/from16 v2, p9
+ move-object/from16 v2, p7
+
+ move-object/from16 v3, p9
if-eqz p2, :cond_0
invoke-virtual/range {p2 .. p2}, Lcom/discord/models/domain/ModelGuild;->getId()J
- move-result-wide v3
+ move-result-wide v4
goto :goto_0
:cond_0
- const-wide/16 v3, 0x0
+ const-wide/16 v4, 0x0
:goto_0
- move-wide v10, v3
+ move-wide v12, v4
if-eqz p2, :cond_1
invoke-virtual/range {p2 .. p2}, Lcom/discord/models/domain/ModelGuild;->getName()Ljava/lang/String;
- move-result-object v3
+ move-result-object v4
goto :goto_1
:cond_1
- const/4 v3, 0x0
+ const/4 v4, 0x0
:goto_1
- move-object/from16 v21, v3
+ move-object/from16 v23, v4
- new-instance v3, Ljava/util/ArrayList;
+ new-instance v4, Ljava/util/ArrayList;
invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;->getMentions()Ljava/util/List;
- move-result-object v4
-
- invoke-interface {v4}, Ljava/util/List;->size()I
-
- move-result v4
-
- mul-int/lit8 v4, v4, 0x2
-
- invoke-direct {v3, v4}, Ljava/util/ArrayList;->(I)V
-
- sget-object v4, Lkotlin/a/z;->bff:Lkotlin/a/z;
-
- move-object/from16 v16, v4
-
- check-cast v16, Ljava/util/Set;
-
- invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;->getMentions()Ljava/util/List;
-
- move-result-object v4
-
- invoke-interface {v4}, Ljava/util/List;->iterator()Ljava/util/Iterator;
-
- move-result-object v4
-
- :goto_2
- invoke-interface {v4}, Ljava/util/Iterator;->hasNext()Z
-
- move-result v5
-
- const-string v12, "allowAnimatedEmojis"
-
- if-eqz v5, :cond_5
-
- invoke-interface {v4}, Ljava/util/Iterator;->next()Ljava/lang/Object;
-
move-result-object v5
- check-cast v5, Lcom/discord/models/domain/ModelMessage;
+ invoke-interface {v5}, Ljava/util/List;->size()I
- invoke-virtual {v5}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J
+ move-result v5
- move-result-wide v6
+ mul-int/lit8 v5, v5, 0x2
- invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+ invoke-direct {v4, v5}, Ljava/util/ArrayList;->(I)V
+
+ sget-object v5, Lkotlin/a/z;->bff:Lkotlin/a/z;
+
+ move-object/from16 v18, v5
+
+ check-cast v18, Ljava/util/Set;
+
+ invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;->getMentions()Ljava/util/List;
+
+ move-result-object v5
+
+ invoke-interface {v5}, Ljava/util/List;->iterator()Ljava/util/Iterator;
+
+ move-result-object v5
+
+ :goto_2
+ invoke-interface {v5}, Ljava/util/Iterator;->hasNext()Z
+
+ move-result v6
+
+ const-string v14, "allowAnimatedEmojis"
+
+ if-eqz v6, :cond_5
+
+ invoke-interface {v5}, Ljava/util/Iterator;->next()Ljava/lang/Object;
move-result-object v6
- move-object/from16 v7, p3
+ check-cast v6, Lcom/discord/models/domain/ModelMessage;
- invoke-interface {v7, v6}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v6}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J
- move-result-object v6
+ move-result-wide v7
- check-cast v6, Lcom/discord/models/domain/ModelChannel;
+ invoke-static {v7, v8}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
- if-nez v6, :cond_2
+ move-result-object v7
+
+ move-object/from16 v8, p3
+
+ invoke-interface {v8, v7}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+ move-result-object v7
+
+ check-cast v7, Lcom/discord/models/domain/ModelChannel;
+
+ if-nez v7, :cond_2
goto :goto_2
:cond_2
- const-string v8, "members"
+ const-string v9, "members"
- invoke-static {v1, v8}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-static {v2, v9}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-virtual {v5}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J
+ invoke-virtual {v6}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J
- move-result-wide v8
+ move-result-wide v9
- invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+ invoke-static {v9, v10}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
- move-result-object v8
+ move-result-object v9
- invoke-interface {v1, v8}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-interface {v2, v9}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
- move-result-object v8
+ move-result-object v9
- if-nez v8, :cond_3
+ if-nez v9, :cond_3
invoke-static {}, Lkotlin/a/ab;->emptyMap()Ljava/util/Map;
- move-result-object v8
+ move-result-object v9
:cond_3
- move-object/from16 v23, v8
+ move-object/from16 v25, v9
- check-cast v23, Ljava/util/Map;
+ check-cast v25, Ljava/util/Map;
- const-string v8, "roles"
+ const-string v9, "roles"
- invoke-static {v0, v8}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-static {v1, v9}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
- invoke-virtual {v6}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J
+ invoke-virtual {v7}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J
- move-result-wide v8
+ move-result-wide v9
- invoke-static {v8, v9}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+ invoke-static {v9, v10}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
- move-result-object v8
+ move-result-object v9
- invoke-interface {v0, v8}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-interface {v1, v9}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
- move-result-object v8
+ move-result-object v9
- if-nez v8, :cond_4
+ if-nez v9, :cond_4
invoke-static {}, Lkotlin/a/ab;->emptyMap()Ljava/util/Map;
- move-result-object v8
+ move-result-object v9
:cond_4
- move-object/from16 v24, v8
+ move-object/from16 v26, v9
- check-cast v24, Ljava/util/Map;
+ check-cast v26, Ljava/util/Map;
- sget-object v8, Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry;->Companion:Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry$Companion;
+ sget-object v9, Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry;->Companion:Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry$Companion;
- invoke-virtual {v6}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J
+ invoke-virtual {v7}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J
- move-result-wide v13
+ move-result-wide v10
- invoke-static {v13, v14}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+ invoke-static {v10, v11}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
+
+ move-result-object v10
+
+ invoke-interface {v0, v10}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+
+ move-result-object v10
+
+ check-cast v10, Lcom/discord/models/domain/ModelGuild;
+
+ invoke-virtual {v9, v6, v7, v10}, Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry$Companion;->create(Lcom/discord/models/domain/ModelMessage;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry;
move-result-object v9
- move-object/from16 v13, p5
+ invoke-virtual {v4, v9}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
- invoke-interface {v13, v9}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
+ invoke-virtual {v7}, Lcom/discord/models/domain/ModelChannel;->getNicks()Ljava/util/Map;
- move-result-object v9
-
- check-cast v9, Lcom/discord/models/domain/ModelGuild;
-
- invoke-virtual {v8, v5, v6, v9}, Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry$Companion;->create(Lcom/discord/models/domain/ModelMessage;Lcom/discord/models/domain/ModelChannel;Lcom/discord/models/domain/ModelGuild;)Lcom/discord/widgets/chat/list/entries/MessageHeaderEntry;
-
- move-result-object v8
-
- invoke-virtual {v3, v8}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
-
- invoke-virtual {v6}, Lcom/discord/models/domain/ModelChannel;->getNicks()Ljava/util/Map;
-
- move-result-object v22
-
- const/16 v26, 0x0
-
- const/16 v27, 0x0
+ move-result-object v24
const/16 v28, 0x0
const/16 v29, 0x0
- invoke-static {v2, v12}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+ const/16 v30, 0x0
+
+ const/16 v31, 0x0
+
+ invoke-static {v3, v14}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
invoke-virtual/range {p9 .. p9}, Ljava/lang/Boolean;->booleanValue()Z
- move-result v30
+ move-result v32
- invoke-virtual {v6}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J
+ invoke-virtual {v7}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J
- move-result-wide v31
+ move-result-wide v33
- move-object/from16 v25, v5
+ move-object/from16 v27, v6
- invoke-static/range {v22 .. v32}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->getMessageItems(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;ZZZZJ)Ljava/util/List;
+ invoke-static/range {v24 .. v34}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->getMessageItems(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;ZZZZJ)Ljava/util/List;
- move-result-object v5
+ move-result-object v6
- check-cast v5, Ljava/util/Collection;
+ check-cast v6, Ljava/util/Collection;
- invoke-virtual {v3, v5}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
+ invoke-virtual {v4, v6}, Ljava/util/ArrayList;->addAll(Ljava/util/Collection;)Z
goto/16 :goto_2
:cond_5
invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;->isLoading()Z
- move-result v0
+ move-result v1
- if-eqz v0, :cond_6
+ if-eqz v1, :cond_6
- new-instance v0, Lcom/discord/widgets/chat/list/entries/LoadingEntry;
+ new-instance v1, Lcom/discord/widgets/chat/list/entries/LoadingEntry;
- invoke-direct {v0}, Lcom/discord/widgets/chat/list/entries/LoadingEntry;->()V
+ invoke-direct {v1}, Lcom/discord/widgets/chat/list/entries/LoadingEntry;->()V
- invoke-virtual {v3, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+ invoke-virtual {v4, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
goto :goto_3
:cond_6
invoke-virtual/range {p1 .. p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model$MessageLoader$LoadingState;->isAllLoaded()Z
- move-result v0
+ move-result v1
- if-eqz v0, :cond_7
+ if-eqz v1, :cond_7
- new-instance v0, Lcom/discord/widgets/chat/list/entries/MentionFooterEntry;
+ new-instance v1, Lcom/discord/widgets/chat/list/entries/MentionFooterEntry;
- invoke-direct {v0}, Lcom/discord/widgets/chat/list/entries/MentionFooterEntry;->()V
+ invoke-direct {v1}, Lcom/discord/widgets/chat/list/entries/MentionFooterEntry;->()V
- invoke-virtual {v3, v0}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
+ invoke-virtual {v4, v1}, Ljava/util/ArrayList;->add(Ljava/lang/Object;)Z
:cond_7
:goto_3
- new-instance v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;
+ new-instance v1, Lcom/discord/widgets/user/WidgetUserMentions$Model;
- move-object v5, v0
+ move-object v6, v1
- const-string v1, "userId"
+ const-string v2, "userId"
- move-object/from16 v4, p8
+ move-object/from16 v5, p8
- invoke-static {v4, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-static {v5, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
invoke-virtual/range {p8 .. p8}, Ljava/lang/Long;->longValue()J
- move-result-wide v6
+ move-result-wide v7
- const-wide/16 v8, -0x1
+ const-wide/16 v9, -0x1
- const-string v1, "names"
+ invoke-static {v12, v13}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long;
- move-object/from16 v4, p4
+ move-result-object v2
- invoke-static {v4, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-interface {v0, v2}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object;
- const-wide/16 v13, -0x1
+ move-result-object v0
- move-object v15, v3
+ move-object v11, v0
- check-cast v15, Ljava/util/List;
+ check-cast v11, Lcom/discord/models/domain/ModelGuild;
- const-wide/16 v17, -0x1
+ const-string v0, "names"
- const/16 v19, 0x0
+ move-object/from16 v2, p4
- invoke-static {v2, v12}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-static {v2, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
+
+ const-wide/16 v15, -0x1
+
+ move-object/from16 v17, v4
+
+ check-cast v17, Ljava/util/List;
+
+ const-wide/16 v19, -0x1
+
+ const/16 v21, 0x0
+
+ invoke-static {v3, v14}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V
invoke-virtual/range {p9 .. p9}, Ljava/lang/Boolean;->booleanValue()Z
- move-result v20
+ move-result v22
- const/16 v22, 0x100
+ const/16 v24, 0x200
- const/16 v23, 0x0
+ const/16 v25, 0x0
- move-object/from16 v12, p4
+ move-object/from16 v14, p4
- invoke-direct/range {v5 .. v23}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->(JJJLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ invoke-direct/range {v6 .. v25}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->(JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
- return-object v0
+ return-object v1
.end method
.method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model.smali
index b2559ac787..24753c42d3 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$Model.smali
@@ -44,6 +44,8 @@
.end annotation
.end field
+.field private final guild:Lcom/discord/models/domain/ModelGuild;
+
.field private final guildId:J
.field private final guildName:Ljava/lang/String;
@@ -92,11 +94,13 @@
return-void
.end method
-.method public constructor (JJJLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;)V
+.method public constructor (JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;)V
.locals 6
.annotation system Ldalvik/annotation/Signature;
value = {
- "(JJJ",
+ "(JJ",
+ "Lcom/discord/models/domain/ModelGuild;",
+ "J",
"Ljava/util/Map<",
"Ljava/lang/Long;",
"Ljava/lang/String;",
@@ -114,15 +118,15 @@
move-object v0, p0
- move-object v1, p7
+ move-object v1, p8
- move-object/from16 v2, p10
+ move-object/from16 v2, p11
- move-object/from16 v3, p11
+ move-object/from16 v3, p12
const-string v4, "channelNames"
- invoke-static {p7, v4}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
+ invoke-static {p8, v4}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
const-string v4, "list"
@@ -142,13 +146,17 @@
iput-wide v4, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->channelId:J
- move-wide v4, p5
+ move-object v4, p5
+
+ iput-object v4, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guild:Lcom/discord/models/domain/ModelGuild;
+
+ move-wide v4, p6
iput-wide v4, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guildId:J
iput-object v1, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->channelNames:Ljava/util/Map;
- move-wide v4, p8
+ move-wide v4, p9
iput-wide v4, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->oldestMessageId:J
@@ -156,42 +164,42 @@
iput-object v3, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->myRoleIds:Ljava/util/Set;
- move-wide/from16 v1, p12
+ move-wide/from16 v1, p13
iput-wide v1, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->newMessagesMarkerMessageId:J
- move/from16 v1, p14
+ move/from16 v1, p15
iput-boolean v1, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->isSpoilerClickAllowed:Z
- move/from16 v1, p15
+ move/from16 v1, p16
iput-boolean v1, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->animateEmojis:Z
- move-object/from16 v1, p16
+ move-object/from16 v1, p17
iput-object v1, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guildName:Ljava/lang/String;
return-void
.end method
-.method public synthetic constructor (JJJLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
- .locals 18
+.method public synthetic constructor (JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
+ .locals 19
- move/from16 v0, p17
+ move/from16 v0, p18
- and-int/lit16 v0, v0, 0x100
+ and-int/lit16 v0, v0, 0x200
if-eqz v0, :cond_0
const/4 v0, 0x0
- const/4 v15, 0x0
+ const/16 v16, 0x0
goto :goto_0
:cond_0
- move/from16 v15, p14
+ move/from16 v16, p15
:goto_0
move-object/from16 v1, p0
@@ -200,33 +208,35 @@
move-wide/from16 v4, p3
- move-wide/from16 v6, p5
+ move-object/from16 v6, p5
- move-object/from16 v8, p7
+ move-wide/from16 v7, p6
- move-wide/from16 v9, p8
+ move-object/from16 v9, p8
- move-object/from16 v11, p10
+ move-wide/from16 v10, p9
move-object/from16 v12, p11
- move-wide/from16 v13, p12
+ move-object/from16 v13, p12
- move/from16 v16, p15
+ move-wide/from16 v14, p13
- move-object/from16 v17, p16
+ move/from16 v17, p16
- invoke-direct/range {v1 .. v17}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->(JJJLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;)V
+ move-object/from16 v18, p17
+
+ invoke-direct/range {v1 .. v18}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->(JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;)V
return-void
.end method
-.method public static synthetic copy$default(Lcom/discord/widgets/user/WidgetUserMentions$Model;JJJLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/user/WidgetUserMentions$Model;
+.method public static synthetic copy$default(Lcom/discord/widgets/user/WidgetUserMentions$Model;JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;ILjava/lang/Object;)Lcom/discord/widgets/user/WidgetUserMentions$Model;
.locals 16
move-object/from16 v0, p0
- move/from16 v1, p17
+ move/from16 v1, p18
and-int/lit8 v2, v1, 0x1
@@ -260,63 +270,63 @@
if-eqz v6, :cond_2
- invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getGuildId()J
+ invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getGuild()Lcom/discord/models/domain/ModelGuild;
- move-result-wide v6
+ move-result-object v6
goto :goto_2
:cond_2
- move-wide/from16 v6, p5
+ move-object/from16 v6, p5
:goto_2
- and-int/lit8 v8, v1, 0x8
+ and-int/lit8 v7, v1, 0x8
- if-eqz v8, :cond_3
+ if-eqz v7, :cond_3
- invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getChannelNames()Ljava/util/Map;
+ invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getGuildId()J
- move-result-object v8
+ move-result-wide v7
goto :goto_3
:cond_3
- move-object/from16 v8, p7
+ move-wide/from16 v7, p6
:goto_3
and-int/lit8 v9, v1, 0x10
if-eqz v9, :cond_4
- invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getOldestMessageId()J
+ invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getChannelNames()Ljava/util/Map;
- move-result-wide v9
+ move-result-object v9
goto :goto_4
:cond_4
- move-wide/from16 v9, p8
+ move-object/from16 v9, p8
:goto_4
- and-int/lit8 v11, v1, 0x20
+ and-int/lit8 v10, v1, 0x20
- if-eqz v11, :cond_5
+ if-eqz v10, :cond_5
- invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getList()Ljava/util/List;
+ invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getOldestMessageId()J
- move-result-object v11
+ move-result-wide v10
goto :goto_5
:cond_5
- move-object/from16 v11, p10
+ move-wide/from16 v10, p9
:goto_5
and-int/lit8 v12, v1, 0x40
if-eqz v12, :cond_6
- invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getMyRoleIds()Ljava/util/Set;
+ invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getList()Ljava/util/List;
move-result-object v12
@@ -330,77 +340,93 @@
if-eqz v13, :cond_7
- invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getNewMessagesMarkerMessageId()J
+ invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getMyRoleIds()Ljava/util/Set;
- move-result-wide v13
+ move-result-object v13
goto :goto_7
:cond_7
- move-wide/from16 v13, p12
+ move-object/from16 v13, p12
:goto_7
- and-int/lit16 v15, v1, 0x100
+ and-int/lit16 v14, v1, 0x100
- if-eqz v15, :cond_8
+ if-eqz v14, :cond_8
- invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->isSpoilerClickAllowed()Z
+ invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getNewMessagesMarkerMessageId()J
- move-result v15
+ move-result-wide v14
goto :goto_8
:cond_8
- move/from16 v15, p14
+ move-wide/from16 v14, p13
:goto_8
- move/from16 p14, v15
+ move-wide/from16 p13, v14
- and-int/lit16 v15, v1, 0x200
+ and-int/lit16 v14, v1, 0x200
- if-eqz v15, :cond_9
+ if-eqz v14, :cond_9
- iget-boolean v15, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->animateEmojis:Z
+ invoke-virtual/range {p0 .. p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->isSpoilerClickAllowed()Z
+
+ move-result v14
goto :goto_9
:cond_9
- move/from16 v15, p15
+ move/from16 v14, p15
:goto_9
- and-int/lit16 v1, v1, 0x400
+ and-int/lit16 v15, v1, 0x400
- if-eqz v1, :cond_a
+ if-eqz v15, :cond_a
- iget-object v1, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guildName:Ljava/lang/String;
+ iget-boolean v15, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->animateEmojis:Z
goto :goto_a
:cond_a
- move-object/from16 v1, p16
+ move/from16 v15, p16
:goto_a
+ and-int/lit16 v1, v1, 0x800
+
+ if-eqz v1, :cond_b
+
+ iget-object v1, v0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guildName:Ljava/lang/String;
+
+ goto :goto_b
+
+ :cond_b
+ move-object/from16 v1, p17
+
+ :goto_b
move-wide/from16 p1, v2
move-wide/from16 p3, v4
- move-wide/from16 p5, v6
+ move-object/from16 p5, v6
- move-object/from16 p7, v8
+ move-wide/from16 p6, v7
- move-wide/from16 p8, v9
+ move-object/from16 p8, v9
- move-object/from16 p10, v11
+ move-wide/from16 p9, v10
move-object/from16 p11, v12
- move-wide/from16 p12, v13
+ move-object/from16 p12, v13
- move/from16 p15, v15
+ move/from16 p15, v14
- move-object/from16 p16, v1
+ move/from16 p16, v15
- invoke-virtual/range {p0 .. p16}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->copy(JJJLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;)Lcom/discord/widgets/user/WidgetUserMentions$Model;
+ move-object/from16 p17, v1
+
+ invoke-virtual/range {p0 .. p17}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->copy(JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;)Lcom/discord/widgets/user/WidgetUserMentions$Model;
move-result-object v0
@@ -422,12 +448,22 @@
.method public final component10()Z
.locals 1
+ invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->isSpoilerClickAllowed()Z
+
+ move-result v0
+
+ return v0
+.end method
+
+.method public final component11()Z
+ .locals 1
+
iget-boolean v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->animateEmojis:Z
return v0
.end method
-.method public final component11()Ljava/lang/String;
+.method public final component12()Ljava/lang/String;
.locals 1
iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guildName:Ljava/lang/String;
@@ -445,7 +481,17 @@
return-wide v0
.end method
-.method public final component3()J
+.method public final component3()Lcom/discord/models/domain/ModelGuild;
+ .locals 1
+
+ invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getGuild()Lcom/discord/models/domain/ModelGuild;
+
+ move-result-object v0
+
+ return-object v0
+.end method
+
+.method public final component4()J
.locals 2
invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getGuildId()J
@@ -455,7 +501,7 @@
return-wide v0
.end method
-.method public final component4()Ljava/util/Map;
+.method public final component5()Ljava/util/Map;
.locals 1
.annotation system Ldalvik/annotation/Signature;
value = {
@@ -474,7 +520,7 @@
return-object v0
.end method
-.method public final component5()J
+.method public final component6()J
.locals 2
invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getOldestMessageId()J
@@ -484,7 +530,7 @@
return-wide v0
.end method
-.method public final component6()Ljava/util/List;
+.method public final component7()Ljava/util/List;
.locals 1
.annotation system Ldalvik/annotation/Signature;
value = {
@@ -502,7 +548,7 @@
return-object v0
.end method
-.method public final component7()Ljava/util/Set;
+.method public final component8()Ljava/util/Set;
.locals 1
.annotation system Ldalvik/annotation/Signature;
value = {
@@ -520,7 +566,7 @@
return-object v0
.end method
-.method public final component8()J
+.method public final component9()J
.locals 2
invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getNewMessagesMarkerMessageId()J
@@ -530,21 +576,13 @@
return-wide v0
.end method
-.method public final component9()Z
- .locals 1
-
- invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->isSpoilerClickAllowed()Z
-
- move-result v0
-
- return v0
-.end method
-
-.method public final copy(JJJLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;)Lcom/discord/widgets/user/WidgetUserMentions$Model;
- .locals 18
+.method public final copy(JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;)Lcom/discord/widgets/user/WidgetUserMentions$Model;
+ .locals 19
.annotation system Ldalvik/annotation/Signature;
value = {
- "(JJJ",
+ "(JJ",
+ "Lcom/discord/models/domain/ModelGuild;",
+ "J",
"Ljava/util/Map<",
"Ljava/lang/Long;",
"Ljava/lang/String;",
@@ -565,51 +603,53 @@
move-wide/from16 v3, p3
- move-wide/from16 v5, p5
+ move-object/from16 v5, p5
- move-object/from16 v7, p7
+ move-wide/from16 v6, p6
- move-wide/from16 v8, p8
+ move-object/from16 v8, p8
- move-object/from16 v10, p10
+ move-wide/from16 v9, p9
move-object/from16 v11, p11
- move-wide/from16 v12, p12
+ move-object/from16 v12, p12
- move/from16 v14, p14
+ move-wide/from16 v13, p13
move/from16 v15, p15
- move-object/from16 v16, p16
+ move/from16 v16, p16
+
+ move-object/from16 v17, p17
const-string v0, "channelNames"
- move-object/from16 v1, p7
+ move-object/from16 v1, p8
invoke-static {v1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
const-string v0, "list"
- move-object/from16 v1, p10
+ move-object/from16 v1, p11
invoke-static {v1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
const-string v0, "myRoleIds"
- move-object/from16 v1, p11
+ move-object/from16 v1, p12
invoke-static {v1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V
- new-instance v17, Lcom/discord/widgets/user/WidgetUserMentions$Model;
+ new-instance v18, Lcom/discord/widgets/user/WidgetUserMentions$Model;
- move-object/from16 v0, v17
+ move-object/from16 v0, v18
move-wide/from16 v1, p1
- invoke-direct/range {v0 .. v16}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->(JJJLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;)V
+ invoke-direct/range {v0 .. v17}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->(JJLcom/discord/models/domain/ModelGuild;JLjava/util/Map;JLjava/util/List;Ljava/util/Set;JZZLjava/lang/String;)V
- return-object v17
+ return-object v18
.end method
.method public final equals(Ljava/lang/Object;)Z
@@ -671,6 +711,20 @@
:goto_1
if-eqz v1, :cond_7
+ invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getGuild()Lcom/discord/models/domain/ModelGuild;
+
+ move-result-object v1
+
+ invoke-virtual {p1}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getGuild()Lcom/discord/models/domain/ModelGuild;
+
+ move-result-object v3
+
+ invoke-static {v1, v3}, Lkotlin/jvm/internal/j;->n(Ljava/lang/Object;Ljava/lang/Object;)Z
+
+ move-result v1
+
+ if-eqz v1, :cond_7
+
invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getGuildId()J
move-result-wide v3
@@ -868,6 +922,14 @@
return-object v0
.end method
+.method public final getGuild()Lcom/discord/models/domain/ModelGuild;
+ .locals 1
+
+ iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guild:Lcom/discord/models/domain/ModelGuild;
+
+ return-object v0
+.end method
+
.method public final getGuildId()J
.locals 2
@@ -971,21 +1033,7 @@
mul-int/lit8 v1, v1, 0x1f
- invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getGuildId()J
-
- move-result-wide v3
-
- ushr-long v5, v3, v2
-
- xor-long/2addr v3, v5
-
- long-to-int v0, v3
-
- add-int/2addr v1, v0
-
- mul-int/lit8 v1, v1, 0x1f
-
- invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getChannelNames()Ljava/util/Map;
+ invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getGuild()Lcom/discord/models/domain/ModelGuild;
move-result-object v0
@@ -1007,6 +1055,40 @@
mul-int/lit8 v1, v1, 0x1f
+ invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getGuildId()J
+
+ move-result-wide v4
+
+ ushr-long v6, v4, v2
+
+ xor-long/2addr v4, v6
+
+ long-to-int v0, v4
+
+ add-int/2addr v1, v0
+
+ mul-int/lit8 v1, v1, 0x1f
+
+ invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getChannelNames()Ljava/util/Map;
+
+ move-result-object v0
+
+ if-eqz v0, :cond_1
+
+ invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+ move-result v0
+
+ goto :goto_1
+
+ :cond_1
+ const/4 v0, 0x0
+
+ :goto_1
+ add-int/2addr v1, v0
+
+ mul-int/lit8 v1, v1, 0x1f
+
invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getOldestMessageId()J
move-result-wide v4
@@ -1025,26 +1107,6 @@
move-result-object v0
- if-eqz v0, :cond_1
-
- invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
-
- move-result v0
-
- goto :goto_1
-
- :cond_1
- const/4 v0, 0x0
-
- :goto_1
- add-int/2addr v1, v0
-
- mul-int/lit8 v1, v1, 0x1f
-
- invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getMyRoleIds()Ljava/util/Set;
-
- move-result-object v0
-
if-eqz v0, :cond_2
invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
@@ -1061,6 +1123,26 @@
mul-int/lit8 v1, v1, 0x1f
+ invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getMyRoleIds()Ljava/util/Set;
+
+ move-result-object v0
+
+ if-eqz v0, :cond_3
+
+ invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
+
+ move-result v0
+
+ goto :goto_3
+
+ :cond_3
+ const/4 v0, 0x0
+
+ :goto_3
+ add-int/2addr v1, v0
+
+ mul-int/lit8 v1, v1, 0x1f
+
invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getNewMessagesMarkerMessageId()J
move-result-wide v4
@@ -1081,17 +1163,6 @@
const/4 v2, 0x1
- if-eqz v0, :cond_3
-
- const/4 v0, 0x1
-
- :cond_3
- add-int/2addr v1, v0
-
- mul-int/lit8 v1, v1, 0x1f
-
- iget-boolean v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->animateEmojis:Z
-
if-eqz v0, :cond_4
const/4 v0, 0x1
@@ -1101,15 +1172,26 @@
mul-int/lit8 v1, v1, 0x1f
- iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guildName:Ljava/lang/String;
+ iget-boolean v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->animateEmojis:Z
if-eqz v0, :cond_5
+ const/4 v0, 0x1
+
+ :cond_5
+ add-int/2addr v1, v0
+
+ mul-int/lit8 v1, v1, 0x1f
+
+ iget-object v0, p0, Lcom/discord/widgets/user/WidgetUserMentions$Model;->guildName:Ljava/lang/String;
+
+ if-eqz v0, :cond_6
+
invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I
move-result v3
- :cond_5
+ :cond_6
add-int/2addr v1, v3
return v1
@@ -1148,6 +1230,16 @@
invoke-virtual {v0, v1, v2}, Ljava/lang/StringBuilder;->append(J)Ljava/lang/StringBuilder;
+ const-string v1, ", guild="
+
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
+
+ invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserMentions$Model;->getGuild()Lcom/discord/models/domain/ModelGuild;
+
+ move-result-object v1
+
+ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder;
+
const-string v1, ", guildId="
invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter.smali
index ef3ea752f6..51908cdc35 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter.smali
@@ -478,7 +478,7 @@
move-result-object v0
- const v4, 0x7f120fe5
+ const v4, 0x7f120feb
new-array v3, v3, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions.smali
index a3e25c5311..3fedcb4a23 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions.smali
@@ -332,7 +332,7 @@
invoke-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar;
- const p1, 0x7f120da3
+ const p1, 0x7f120da7
invoke-virtual {p0, p1}, Lcom/discord/widgets/user/WidgetUserMentions;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfile.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfile.smali
index aae2bb62e4..e63186a750 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfile.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfile.smali
@@ -602,7 +602,7 @@
const/4 p1, 0x0
- const v0, 0x7f120654
+ const v0, 0x7f120653
invoke-direct {p0, p1, v0}, Lcom/discord/widgets/user/WidgetUserProfile;->addRelationship(Ljava/lang/Integer;I)V
@@ -636,7 +636,7 @@
.method public synthetic lambda$configureActionButtons$9$WidgetUserProfile(Landroid/view/View;)V
.locals 0
- const p1, 0x7f12064d
+ const p1, 0x7f12064c
invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->removeRelationship(I)V
@@ -659,14 +659,14 @@
goto :goto_0
:pswitch_0
- const p1, 0x7f1210d2
+ const p1, 0x7f1210d8
invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->removeRelationship(I)V
return-void
:pswitch_1
- const p1, 0x7f120644
+ const p1, 0x7f120643
invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->removeRelationship(I)V
@@ -678,14 +678,14 @@
return-void
:pswitch_3
- const p1, 0x7f12064d
+ const p1, 0x7f12064c
invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->removeRelationship(I)V
return-void
:pswitch_4
- const p1, 0x7f12064b
+ const p1, 0x7f12064a
invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->removeRelationship(I)V
@@ -698,7 +698,7 @@
move-result-object p1
- const p2, 0x7f1210d1
+ const p2, 0x7f1210d7
invoke-direct {p0, p1, p2}, Lcom/discord/widgets/user/WidgetUserProfile;->addRelationship(Ljava/lang/Integer;I)V
@@ -757,7 +757,7 @@
const v2, 0xffff
- const v3, 0x7f120439
+ const v3, 0x7f120438
invoke-interface {p1, v0, v1, v2, v3}, Landroid/view/Menu;->add(IIII)Landroid/view/MenuItem;
@@ -811,7 +811,7 @@
invoke-virtual {p1}, Landroidx/appcompat/app/AlertDialog;->dismiss()V
- const p1, 0x7f12064b
+ const p1, 0x7f12064a
invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->removeRelationship(I)V
@@ -938,7 +938,7 @@
invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserProfile;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar;
- const p1, 0x7f120d6b
+ const p1, 0x7f120d6f
invoke-virtual {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->setActionBarTitle(I)Lkotlin/Unit;
@@ -962,7 +962,7 @@
new-instance v3, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item;
- const v4, 0x7f1210d3
+ const v4, 0x7f1210d9
invoke-virtual {p0, v4}, Lcom/discord/widgets/user/WidgetUserProfile;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getBadgeClickListener$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getBadgeClickListener$1.smali
index d690f55d41..5bda5a1049 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getBadgeClickListener$1.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getBadgeClickListener$1.smali
@@ -65,7 +65,7 @@
iget-object p1, p0, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge$getBadgeClickListener$1;->$fragment:Lcom/discord/app/AppFragment;
- const v2, 0x7f120d4e
+ const v2, 0x7f120d52
invoke-virtual {p1, v2}, Lcom/discord/app/AppFragment;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader.smali
index 34e8af9e77..f74270a8be 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader.smali
@@ -776,7 +776,7 @@
new-instance v3, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
- const v6, 0x7f0802d2
+ const v6, 0x7f0802dc
move-object v5, v0
@@ -788,7 +788,7 @@
move-result v7
- const v5, 0x7f120f3b
+ const v5, 0x7f120f40
invoke-virtual {v0, v5}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String;
@@ -825,7 +825,7 @@
new-instance v3, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
- const v6, 0x7f0802cc
+ const v6, 0x7f0802d6
move-object v5, v0
@@ -874,7 +874,7 @@
new-instance v3, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
- const v6, 0x7f0802ca
+ const v6, 0x7f0802d4
move-object v5, v0
@@ -941,16 +941,16 @@
if-eqz v3, :cond_4
- const v3, 0x7f08025c
+ const v3, 0x7f080264
- const v9, 0x7f08025c
+ const v9, 0x7f080264
goto :goto_1
:cond_4
- const v3, 0x7f08025b
+ const v3, 0x7f080263
- const v9, 0x7f08025b
+ const v9, 0x7f080263
:goto_1
move-object v3, v0
@@ -1028,16 +1028,16 @@
if-eqz v3, :cond_7
- const v3, 0x7f08025e
+ const v3, 0x7f080266
- const v9, 0x7f08025e
+ const v9, 0x7f080266
goto :goto_3
:cond_7
- const v3, 0x7f08025d
+ const v3, 0x7f080265
- const v9, 0x7f08025d
+ const v9, 0x7f080265
:goto_3
move-object v3, v0
@@ -1113,16 +1113,16 @@
if-eqz v1, :cond_a
- const v1, 0x7f080260
+ const v1, 0x7f080268
- const v9, 0x7f080260
+ const v9, 0x7f080268
goto :goto_5
:cond_a
- const v1, 0x7f08025f
+ const v1, 0x7f080267
- const v9, 0x7f08025f
+ const v9, 0x7f080267
:goto_5
move-object v1, v0
@@ -1184,7 +1184,7 @@
new-instance v1, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
- const v9, 0x7f0802c9
+ const v9, 0x7f0802d3
move-object v3, v0
@@ -1235,7 +1235,7 @@
new-instance v1, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
- const v9, 0x7f0802cd
+ const v9, 0x7f0802d7
move-object v4, v0
@@ -1245,7 +1245,7 @@
move-result v10
- const v4, 0x7f12051a
+ const v4, 0x7f120519
invoke-virtual {v0, v4}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String;
@@ -1272,13 +1272,13 @@
move-result v1
- const v4, 0x7f120d32
+ const v4, 0x7f120d36
if-eqz v1, :cond_e
new-instance v1, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
- const v9, 0x7f0802cb
+ const v9, 0x7f0802d5
move-object v5, v0
@@ -1339,9 +1339,9 @@
if-gez v5, :cond_f
- const v1, 0x7f0802ce
+ const v1, 0x7f0802d8
- const v9, 0x7f0802ce
+ const v9, 0x7f0802d8
goto :goto_6
@@ -1358,9 +1358,9 @@
if-gez v5, :cond_10
- const v1, 0x7f0802cf
+ const v1, 0x7f0802d9
- const v9, 0x7f0802cf
+ const v9, 0x7f0802d9
goto :goto_6
@@ -1377,16 +1377,16 @@
if-gez v1, :cond_11
- const v1, 0x7f0802d0
+ const v1, 0x7f0802da
- const v9, 0x7f0802d0
+ const v9, 0x7f0802da
goto :goto_6
:cond_11
- const v1, 0x7f0802d1
+ const v1, 0x7f0802db
- const v9, 0x7f0802d1
+ const v9, 0x7f0802db
:goto_6
new-instance v1, Lcom/discord/widgets/user/WidgetUserProfileHeader$Model$Badge;
@@ -1403,7 +1403,7 @@
move-result-object v11
- const v3, 0x7f120d00
+ const v3, 0x7f120cfe
new-array v4, v7, [Ljava/lang/Object;
diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip.smali
index 240c386e19..f59b99e8ad 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileStrip.smali
@@ -464,12 +464,12 @@
if-eqz v0, :cond_3
- const v2, 0x7f0802ea
+ const v2, 0x7f0802f4
goto :goto_2
:cond_3
- const v2, 0x7f080257
+ const v2, 0x7f08025f
:goto_2
invoke-virtual {p1, v2}, Landroid/widget/ImageView;->setImageResource(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 d983ec29ea..2906cfc76f 100644
--- a/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali
+++ b/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali
@@ -453,9 +453,9 @@
move-result-object v2
- const v3, 0x7f0802f8
+ const v3, 0x7f080302
- const v4, 0x7f120f4a
+ const v4, 0x7f120f4f
const/4 v5, 0x0
@@ -483,9 +483,9 @@
move-result-object v1
- const v2, 0x7f0802f6
+ const v2, 0x7f080300
- const v3, 0x7f120f46
+ const v3, 0x7f120f4b
const/4 v4, 0x0
@@ -513,15 +513,15 @@
move-result-object p1
- const p2, 0x7f120f45
+ const p2, 0x7f120f4a
invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
move-result-object p2
- const v0, 0x7f0802f5
+ const v0, 0x7f0802ff
- const v1, 0x7f120f44
+ const v1, 0x7f120f49
invoke-direct {p0, p1, v0, v1, p2}, Lcom/discord/widgets/user/WidgetUserStatusSheet;->setupPresenceLayout(Landroid/view/ViewGroup;IILjava/lang/Integer;)V
@@ -541,15 +541,15 @@
move-result-object p1
- const p2, 0x7f120f48
+ const p2, 0x7f120f4d
invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer;
move-result-object p2
- const v0, 0x7f0802f7
+ const v0, 0x7f080301
- const v1, 0x7f120f47
+ const v1, 0x7f120f4c
invoke-direct {p0, p1, v0, v1, p2}, Lcom/discord/widgets/user/WidgetUserStatusSheet;->setupPresenceLayout(Landroid/view/ViewGroup;IILjava/lang/Integer;)V
diff --git a/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerify.smali b/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerify.smali
index 6d09bd955d..2f507eb24d 100644
--- a/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerify.smali
+++ b/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerify.smali
@@ -27,7 +27,7 @@
.method private getBodyText(Landroid/content/Context;)Ljava/lang/CharSequence;
.locals 1
- const v0, 0x7f121140
+ const v0, 0x7f121146
invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -59,7 +59,7 @@
aput-object v0, v1, v2
- const v0, 0x7f121148
+ const v0, 0x7f12114e
invoke-virtual {p0, v0, v1}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate.smali b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate.smali
index 811c6ceee6..31d904dd48 100644
--- a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate.smali
+++ b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate.smali
@@ -448,7 +448,7 @@
if-eqz p1, :cond_0
- const p1, 0x7f1203b3
+ const p1, 0x7f1203b2
invoke-virtual {p0, p1}, Lcom/discord/widgets/user/email/WidgetUserEmailUpdate;->setActionBarTitle(I)Lkotlin/Unit;
diff --git a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify.smali b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify.smali
index f1bdabb1ec..9c1663f398 100644
--- a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify.smali
+++ b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify.smali
@@ -62,7 +62,7 @@
move-result-object p1
- const v1, 0x7f120d09
+ const v1, 0x7f120d0d
invoke-static {p1, v1, v0}, Lcom/discord/app/g;->a(Landroid/content/Context;II)V
@@ -165,7 +165,7 @@
aput-object p1, v0, v1
- const p1, 0x7f121142
+ const p1, 0x7f121148
invoke-virtual {p0, p1, v0}, Lcom/discord/widgets/user/email/WidgetUserEmailVerify;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/user/search/ViewGlobalSearchItem.smali b/com.discord/smali/com/discord/widgets/user/search/ViewGlobalSearchItem.smali
index c947a0db72..1f6176a035 100644
--- a/com.discord/smali/com/discord/widgets/user/search/ViewGlobalSearchItem.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/ViewGlobalSearchItem.smali
@@ -1008,7 +1008,7 @@
move-result-object v0
- const v1, 0x7f120658
+ const v1, 0x7f120657
invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch.smali
index d1c4ce5ccc..ab43f6c2ae 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch.smali
@@ -1158,7 +1158,7 @@
new-array v2, v1, [Lkotlin/Pair;
- const v3, 0x7f121134
+ const v3, 0x7f12113a
invoke-virtual {p0, v3}, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->getString(I)Ljava/lang/String;
@@ -1174,7 +1174,7 @@
aput-object v3, v2, v4
- const v3, 0x7f120fd9
+ const v3, 0x7f120fdf
invoke-virtual {p0, v3}, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->getString(I)Ljava/lang/String;
@@ -1192,7 +1192,7 @@
const/4 v3, 0x2
- const v5, 0x7f120ec8
+ const v5, 0x7f120ecc
invoke-virtual {p0, v5}, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->getString(I)Ljava/lang/String;
@@ -1208,7 +1208,7 @@
sget-object v3, Lcom/discord/a/b;->uK:Lcom/discord/a/b$a;
- const v3, 0x7f120577
+ const v3, 0x7f120576
invoke-virtual {p0, v3}, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->getString(I)Ljava/lang/String;
@@ -1416,7 +1416,7 @@
move-result-object p1
- const v0, 0x7f120d83
+ const v0, 0x7f120d87
invoke-virtual {p1, v0}, Landroid/widget/EditText;->setHint(I)V
diff --git a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion.smali b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion.smali
index 09f3c7c1c6..043a4d28f4 100644
--- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion.smali
+++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearchModel$Companion.smali
@@ -1263,7 +1263,7 @@
new-instance v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
- const v6, 0x7f120f78
+ const v6, 0x7f120f7e
const/4 v7, 0x0
@@ -1298,7 +1298,7 @@
new-instance v12, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
- const v7, 0x7f120d80
+ const v7, 0x7f120d84
const/4 v8, 0x0
@@ -1326,7 +1326,7 @@
new-instance v11, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader;
- const v6, 0x7f120f78
+ const v6, 0x7f120f7e
const/4 v7, 0x0
diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali
index 6c2af93579..6fec03480d 100644
--- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali
+++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali
@@ -1118,7 +1118,7 @@
move-result-object v0
- const v1, 0x7f120dbc
+ const v1, 0x7f120dc0
invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -1282,16 +1282,16 @@
if-eqz v0, :cond_7
- const v0, 0x7f080288
+ const v0, 0x7f080290
- const v7, 0x7f080288
+ const v7, 0x7f080290
goto :goto_6
:cond_7
- const v0, 0x7f08028a
+ const v0, 0x7f080292
- const v7, 0x7f08028a
+ const v7, 0x7f080292
:goto_6
const/4 v8, 0x0
@@ -1316,12 +1316,12 @@
if-eqz v1, :cond_8
- const v1, 0x7f120ec5
+ const v1, 0x7f120ec9
goto :goto_7
:cond_8
- const v1, 0x7f120eb8
+ const v1, 0x7f120ebc
:goto_7
invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -1382,16 +1382,16 @@
if-eqz v0, :cond_a
- const v0, 0x7f08024e
+ const v0, 0x7f080256
- const v7, 0x7f08024e
+ const v7, 0x7f080256
goto :goto_9
:cond_a
- const v0, 0x7f080251
+ const v0, 0x7f080259
- const v7, 0x7f080251
+ const v7, 0x7f080259
:goto_9
const/4 v8, 0x0
@@ -1416,12 +1416,12 @@
if-eqz v1, :cond_b
- const v1, 0x7f120ec4
+ const v1, 0x7f120ec8
goto :goto_a
:cond_b
- const v1, 0x7f120eb3
+ const v1, 0x7f120eb7
:goto_a
invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V
@@ -1983,7 +1983,7 @@
if-eqz v16, :cond_a
- const v0, 0x7f120ecf
+ const v0, 0x7f120ed3
invoke-virtual {v8, v0}, Landroid/widget/TextView;->setText(I)V
@@ -2042,7 +2042,7 @@
const/4 v12, 0x2
- const v0, 0x7f120d6b
+ const v0, 0x7f120d6f
invoke-virtual {v8, v0}, Landroid/widget/TextView;->setText(I)V
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali
index 0d5b15df49..893202a1ea 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed$sendFriendRequest$1.smali
@@ -65,7 +65,7 @@
check-cast p1, Landroidx/fragment/app/Fragment;
- const v0, 0x7f120654
+ const v0, 0x7f120653
invoke-static {p1, v0}, Lcom/discord/app/g;->a(Landroidx/fragment/app/Fragment;I)V
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed.smali
index d471d74541..a820bc641f 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed.smali
@@ -416,7 +416,7 @@
move-result-object p1
- const v0, 0x7f120f3e
+ const v0, 0x7f120f43
invoke-virtual {p0, v0}, Lcom/discord/widgets/voice/call/WidgetCallFailed;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall.smali
index a4bdbd2ce3..bb8bc2210c 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall.smali
@@ -903,7 +903,7 @@
move-result-object p1
- const v0, 0x7f121185
+ const v0, 0x7f12118b
invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(I)V
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 baf0e8cff6..6820f3f80e 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCallControlsView.smali
@@ -313,12 +313,12 @@
if-eqz v1, :cond_0
- const v1, 0x7f080289
+ const v1, 0x7f080291
goto :goto_0
:cond_0
- const v1, 0x7f08028d
+ const v1, 0x7f080295
:goto_0
invoke-virtual {v0, v1}, Landroid/widget/ImageView;->setImageResource(I)V
@@ -381,12 +381,12 @@
if-eqz v0, :cond_2
- const v1, 0x7f08032a
+ const v1, 0x7f080335
goto :goto_2
:cond_2
- const v1, 0x7f080329
+ const v1, 0x7f080334
:goto_2
invoke-virtual {p1, v1}, 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 6cc0c716ba..a226c0b1ef 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali
@@ -458,12 +458,12 @@
if-eqz v8, :cond_6
- const v8, 0x7f121166
+ const v8, 0x7f12116c
goto :goto_3
:cond_6
- const v8, 0x7f121176
+ const v8, 0x7f12117c
:goto_3
invoke-virtual {v5, v8}, Landroid/widget/TextView;->setText(I)V
@@ -521,12 +521,12 @@
if-eqz v0, :cond_8
- const v0, 0x7f08032a
+ const v0, 0x7f080335
goto :goto_4
:cond_8
- const v0, 0x7f08028d
+ const v0, 0x7f080295
:goto_4
invoke-virtual {p1, v0}, Landroid/widget/ImageView;->setImageResource(I)V
@@ -541,12 +541,12 @@
if-eqz v0, :cond_9
- const v0, 0x7f120407
+ const v0, 0x7f120406
goto :goto_5
:cond_9
- const v0, 0x7f120408
+ const v0, 0x7f120407
:goto_5
invoke-virtual {p0, v0}, Lcom/discord/widgets/voice/call/WidgetVoiceCallIncoming;->getString(I)Ljava/lang/String;
diff --git a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali
index 81e1ab7872..11fec42b11 100644
--- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali
+++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali
@@ -940,7 +940,7 @@
.annotation build Landroidx/annotation/DrawableRes;
.end annotation
- const v0, 0x7f080332
+ const v0, 0x7f08033d
if-nez p1, :cond_0
@@ -976,17 +976,17 @@
return v0
:cond_2
- const p1, 0x7f080331
+ const p1, 0x7f08033c
return p1
:cond_3
- const p1, 0x7f08032f
+ const p1, 0x7f08033a
return p1
:cond_4
- const p1, 0x7f080330
+ const p1, 0x7f08033b
return p1
.end method
@@ -1024,7 +1024,7 @@
if-eqz v0, :cond_0
- const p1, 0x7f120423
+ const p1, 0x7f120422
return p1
@@ -1037,7 +1037,7 @@
if-eqz v0, :cond_1
- const p1, 0x7f120426
+ const p1, 0x7f120425
return p1
@@ -1050,7 +1050,7 @@
if-eqz v0, :cond_2
- const p1, 0x7f120421
+ const p1, 0x7f120420
return p1
@@ -1063,7 +1063,7 @@
if-eqz v0, :cond_3
- const p1, 0x7f120420
+ const p1, 0x7f12041f
return p1
@@ -1076,7 +1076,7 @@
if-eqz v0, :cond_4
- const p1, 0x7f120427
+ const p1, 0x7f120426
return p1
@@ -1089,14 +1089,14 @@
if-eqz v0, :cond_5
- const p1, 0x7f12042b
+ const p1, 0x7f12042a
return p1
:cond_5
instance-of v0, p1, Lcom/discord/rtcconnection/RtcConnection$State$d;
- const v1, 0x7f120424
+ const v1, 0x7f120423
if-nez v0, :cond_6
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$1.smali b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$1.smali
index 042078adae..bd5317a1e4 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$1.smali
+++ b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView$configureUI$1.smali
@@ -53,7 +53,7 @@
move-result-object p1
- const v0, 0x7f121136
+ const v0, 0x7f12113c
invoke-static {p1, v0}, Lcom/discord/app/g;->c(Landroid/content/Context;I)V
diff --git a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali
index aeb6cfa774..ae065fba12 100644
--- a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali
+++ b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali
@@ -834,7 +834,7 @@
if-eqz v3, :cond_1
- const v3, 0x7f12105b
+ const v3, 0x7f121061
goto :goto_1
@@ -892,12 +892,12 @@
if-eqz p1, :cond_2
- const p1, 0x7f121053
+ const p1, 0x7f121059
goto :goto_2
:cond_2
- const p1, 0x7f120499
+ const p1, 0x7f120498
:goto_2
invoke-virtual {v1, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String;
@@ -961,7 +961,7 @@
move-result-object v0
- const v4, 0x7f120408
+ const v4, 0x7f120407
invoke-virtual {v0, v4}, Landroid/widget/Button;->setText(I)V
@@ -984,7 +984,7 @@
move-result-object v0
- const v4, 0x7f121047
+ const v4, 0x7f12104d
invoke-direct {p0, v0, v4}, Lcom/discord/widgets/voice/fullscreen/VoiceControlsView;->disableWithToast(Landroid/widget/Button;I)V
diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali
index e869451d82..3c4acae25b 100644
--- a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali
+++ b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali
@@ -597,7 +597,7 @@
move-result-object v0
- const v4, 0x7f1205aa
+ const v4, 0x7f1205a9
invoke-virtual {p0, v4}, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->getString(I)Ljava/lang/String;
@@ -681,7 +681,7 @@
move-result-object v4
- const v5, 0x7f120592
+ const v5, 0x7f120591
new-array v1, v1, [Ljava/lang/Object;
@@ -928,7 +928,7 @@
aput-object p1, v0, v3
- const p1, 0x7f1204ad
+ const p1, 0x7f1204ac
invoke-virtual {p0, p1, v0}, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->getString(I[Ljava/lang/Object;)Ljava/lang/String;
diff --git a/com.discord/smali/com/google/android/gms/base/R$b.smali b/com.discord/smali/com/google/android/gms/base/R$b.smali
index e07e2000f9..fd6abea226 100644
--- a/com.discord/smali/com/google/android/gms/base/R$b.smali
+++ b/com.discord/smali/com/google/android/gms/base/R$b.smali
@@ -15,39 +15,39 @@
# static fields
-.field public static final common_google_play_services_enable_button:I = 0x7f1203e4
+.field public static final common_google_play_services_enable_button:I = 0x7f1203e3
-.field public static final common_google_play_services_enable_text:I = 0x7f1203e5
+.field public static final common_google_play_services_enable_text:I = 0x7f1203e4
-.field public static final common_google_play_services_enable_title:I = 0x7f1203e6
+.field public static final common_google_play_services_enable_title:I = 0x7f1203e5
-.field public static final common_google_play_services_install_button:I = 0x7f1203e7
+.field public static final common_google_play_services_install_button:I = 0x7f1203e6
-.field public static final common_google_play_services_install_text:I = 0x7f1203e8
+.field public static final common_google_play_services_install_text:I = 0x7f1203e7
-.field public static final common_google_play_services_install_title:I = 0x7f1203e9
+.field public static final common_google_play_services_install_title:I = 0x7f1203e8
-.field public static final common_google_play_services_notification_channel_name:I = 0x7f1203ea
+.field public static final common_google_play_services_notification_channel_name:I = 0x7f1203e9
-.field public static final common_google_play_services_notification_ticker:I = 0x7f1203eb
+.field public static final common_google_play_services_notification_ticker:I = 0x7f1203ea
-.field public static final common_google_play_services_unsupported_text:I = 0x7f1203ed
+.field public static final common_google_play_services_unsupported_text:I = 0x7f1203ec
-.field public static final common_google_play_services_update_button:I = 0x7f1203ee
+.field public static final common_google_play_services_update_button:I = 0x7f1203ed
-.field public static final common_google_play_services_update_text:I = 0x7f1203ef
+.field public static final common_google_play_services_update_text:I = 0x7f1203ee
-.field public static final common_google_play_services_update_title:I = 0x7f1203f0
+.field public static final common_google_play_services_update_title:I = 0x7f1203ef
-.field public static final common_google_play_services_updating_text:I = 0x7f1203f1
+.field public static final common_google_play_services_updating_text:I = 0x7f1203f0
-.field public static final common_google_play_services_wear_update_text:I = 0x7f1203f2
+.field public static final common_google_play_services_wear_update_text:I = 0x7f1203f1
-.field public static final common_open_on_phone:I = 0x7f1203f3
+.field public static final common_open_on_phone:I = 0x7f1203f2
-.field public static final common_signin_button_text:I = 0x7f1203f4
+.field public static final common_signin_button_text:I = 0x7f1203f3
-.field public static final common_signin_button_text_long:I = 0x7f1203f5
+.field public static final common_signin_button_text_long:I = 0x7f1203f4
# direct methods
diff --git a/com.discord/smali/com/google/android/gms/common/R$a.smali b/com.discord/smali/com/google/android/gms/common/R$a.smali
index 78c2792040..f378579fd4 100644
--- a/com.discord/smali/com/google/android/gms/common/R$a.smali
+++ b/com.discord/smali/com/google/android/gms/common/R$a.smali
@@ -15,7 +15,7 @@
# static fields
-.field public static final common_google_play_services_unknown_issue:I = 0x7f1203ec
+.field public static final common_google_play_services_unknown_issue:I = 0x7f1203eb
# direct methods
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 cad714cb6e..2d999bcc75 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
@@ -199,45 +199,45 @@
.field public static final design_snackbar_background:I = 0x7f0800ab
-.field public static final ic_mtrl_chip_checked_black:I = 0x7f08028f
+.field public static final ic_mtrl_chip_checked_black:I = 0x7f080297
-.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080290
+.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080298
-.field public static final ic_mtrl_chip_close_circle:I = 0x7f080291
+.field public static final ic_mtrl_chip_close_circle:I = 0x7f080299
-.field public static final mtrl_snackbar_background:I = 0x7f0803b6
+.field public static final mtrl_snackbar_background:I = 0x7f0803c1
-.field public static final mtrl_tabs_default_indicator:I = 0x7f0803b7
+.field public static final mtrl_tabs_default_indicator:I = 0x7f0803c2
-.field public static final navigation_empty_icon:I = 0x7f0803b8
+.field public static final navigation_empty_icon:I = 0x7f0803c3
-.field public static final notification_action_background:I = 0x7f0803b9
+.field public static final notification_action_background:I = 0x7f0803c4
-.field public static final notification_bg:I = 0x7f0803ba
+.field public static final notification_bg:I = 0x7f0803c5
-.field public static final notification_bg_low:I = 0x7f0803bb
+.field public static final notification_bg_low:I = 0x7f0803c6
-.field public static final notification_bg_low_normal:I = 0x7f0803bc
+.field public static final notification_bg_low_normal:I = 0x7f0803c7
-.field public static final notification_bg_low_pressed:I = 0x7f0803bd
+.field public static final notification_bg_low_pressed:I = 0x7f0803c8
-.field public static final notification_bg_normal:I = 0x7f0803be
+.field public static final notification_bg_normal:I = 0x7f0803c9
-.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
+.field public static final notification_bg_normal_pressed:I = 0x7f0803ca
-.field public static final notification_icon_background:I = 0x7f0803c0
+.field public static final notification_icon_background:I = 0x7f0803cb
-.field public static final notification_template_icon_bg:I = 0x7f0803c1
+.field public static final notification_template_icon_bg:I = 0x7f0803cc
-.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
+.field public static final notification_template_icon_low_bg:I = 0x7f0803cd
-.field public static final notification_tile_bg:I = 0x7f0803c3
+.field public static final notification_tile_bg:I = 0x7f0803ce
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf
-.field public static final tooltip_frame_dark:I = 0x7f0803c9
+.field public static final tooltip_frame_dark:I = 0x7f0803d4
-.field public static final tooltip_frame_light:I = 0x7f0803ca
+.field public static final tooltip_frame_light:I = 0x7f0803d5
# direct methods
diff --git a/com.discord/smali_classes2/com/google/android/material/R$string.smali b/com.discord/smali_classes2/com/google/android/material/R$string.smali
index 6ad4fbb608..dc3352dcd7 100644
--- a/com.discord/smali_classes2/com/google/android/material/R$string.smali
+++ b/com.discord/smali_classes2/com/google/android/material/R$string.smali
@@ -97,13 +97,13 @@
.field public static final bottom_sheet_behavior:I = 0x7f12032b
-.field public static final character_counter_content_description:I = 0x7f1203a7
+.field public static final character_counter_content_description:I = 0x7f1203a6
-.field public static final character_counter_pattern:I = 0x7f1203a8
+.field public static final character_counter_pattern:I = 0x7f1203a7
-.field public static final fab_transformation_scrim_behavior:I = 0x7f120568
+.field public static final fab_transformation_scrim_behavior:I = 0x7f120567
-.field public static final fab_transformation_sheet_behavior:I = 0x7f120569
+.field public static final fab_transformation_sheet_behavior:I = 0x7f120568
.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f12089a
@@ -119,9 +119,9 @@
.field public static final path_password_strike_through:I = 0x7f120c1a
-.field public static final search_menu_title:I = 0x7f120e87
+.field public static final search_menu_title:I = 0x7f120e8b
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f48
# 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 84441d6403..8e14a4aea2 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$d.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$d.smali
@@ -231,59 +231,59 @@
.field public static final ic_gif_24dp:I = 0x7f080243
-.field public static final ic_image_24dp:I = 0x7f080261
+.field public static final ic_image_24dp:I = 0x7f080269
-.field public static final ic_insert_emoticon_24dp:I = 0x7f080269
+.field public static final ic_insert_emoticon_24dp:I = 0x7f080271
-.field public static final ic_keyboard_24dp:I = 0x7f08026f
+.field public static final ic_keyboard_24dp:I = 0x7f080277
-.field public static final ic_launch_24dp:I = 0x7f080270
+.field public static final ic_launch_24dp:I = 0x7f080278
-.field public static final ic_movie_24dp:I = 0x7f08028e
+.field public static final ic_movie_24dp:I = 0x7f080296
-.field public static final ic_mtrl_chip_checked_black:I = 0x7f08028f
+.field public static final ic_mtrl_chip_checked_black:I = 0x7f080297
-.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080290
+.field public static final ic_mtrl_chip_checked_circle:I = 0x7f080298
-.field public static final ic_mtrl_chip_close_circle:I = 0x7f080291
+.field public static final ic_mtrl_chip_close_circle:I = 0x7f080299
-.field public static final ic_send_24dp:I = 0x7f0802e4
+.field public static final ic_send_24dp:I = 0x7f0802ee
-.field public static final ic_take_photo:I = 0x7f080300
+.field public static final ic_take_photo:I = 0x7f08030a
-.field public static final mtrl_snackbar_background:I = 0x7f0803b6
+.field public static final mtrl_snackbar_background:I = 0x7f0803c1
-.field public static final mtrl_tabs_default_indicator:I = 0x7f0803b7
+.field public static final mtrl_tabs_default_indicator:I = 0x7f0803c2
-.field public static final navigation_empty_icon:I = 0x7f0803b8
+.field public static final navigation_empty_icon:I = 0x7f0803c3
-.field public static final notification_action_background:I = 0x7f0803b9
+.field public static final notification_action_background:I = 0x7f0803c4
-.field public static final notification_bg:I = 0x7f0803ba
+.field public static final notification_bg:I = 0x7f0803c5
-.field public static final notification_bg_low:I = 0x7f0803bb
+.field public static final notification_bg_low:I = 0x7f0803c6
-.field public static final notification_bg_low_normal:I = 0x7f0803bc
+.field public static final notification_bg_low_normal:I = 0x7f0803c7
-.field public static final notification_bg_low_pressed:I = 0x7f0803bd
+.field public static final notification_bg_low_pressed:I = 0x7f0803c8
-.field public static final notification_bg_normal:I = 0x7f0803be
+.field public static final notification_bg_normal:I = 0x7f0803c9
-.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
+.field public static final notification_bg_normal_pressed:I = 0x7f0803ca
-.field public static final notification_icon_background:I = 0x7f0803c0
+.field public static final notification_icon_background:I = 0x7f0803cb
-.field public static final notification_template_icon_bg:I = 0x7f0803c1
+.field public static final notification_template_icon_bg:I = 0x7f0803cc
-.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
+.field public static final notification_template_icon_low_bg:I = 0x7f0803cd
-.field public static final notification_tile_bg:I = 0x7f0803c3
+.field public static final notification_tile_bg:I = 0x7f0803ce
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf
-.field public static final tooltip_frame_dark:I = 0x7f0803c9
+.field public static final tooltip_frame_dark:I = 0x7f0803d4
-.field public static final tooltip_frame_light:I = 0x7f0803ca
+.field public static final tooltip_frame_light:I = 0x7f0803d5
# direct methods
diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/R$g.smali b/com.discord/smali_classes2/com/lytefast/flexinput/R$g.smali
index 1cba66fe09..52413fc627 100644
--- a/com.discord/smali_classes2/com/lytefast/flexinput/R$g.smali
+++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$g.smali
@@ -117,27 +117,27 @@
.field public static final camera_unknown_error:I = 0x7f120357
-.field public static final character_counter_content_description:I = 0x7f1203a7
+.field public static final character_counter_content_description:I = 0x7f1203a6
-.field public static final character_counter_pattern:I = 0x7f1203a8
+.field public static final character_counter_pattern:I = 0x7f1203a7
-.field public static final choose_an_application:I = 0x7f1203b2
+.field public static final choose_an_application:I = 0x7f1203b1
-.field public static final clear_attachments:I = 0x7f1203bb
+.field public static final clear_attachments:I = 0x7f1203ba
-.field public static final emoji_keyboard_toggle:I = 0x7f12053b
+.field public static final emoji_keyboard_toggle:I = 0x7f12053a
-.field public static final fab_transformation_scrim_behavior:I = 0x7f120568
+.field public static final fab_transformation_scrim_behavior:I = 0x7f120567
-.field public static final fab_transformation_sheet_behavior:I = 0x7f120569
+.field public static final fab_transformation_sheet_behavior:I = 0x7f120568
-.field public static final files_permission_reason_msg:I = 0x7f120574
+.field public static final files_permission_reason_msg:I = 0x7f120573
-.field public static final flash_auto:I = 0x7f120579
+.field public static final flash_auto:I = 0x7f120578
-.field public static final flash_off:I = 0x7f12057a
+.field public static final flash_off:I = 0x7f120579
-.field public static final flash_on:I = 0x7f12057b
+.field public static final flash_on:I = 0x7f12057a
.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f12089a
@@ -153,17 +153,17 @@
.field public static final path_password_strike_through:I = 0x7f120c1a
-.field public static final request_permission_msg:I = 0x7f120dcc
+.field public static final request_permission_msg:I = 0x7f120dd0
-.field public static final search_menu_title:I = 0x7f120e87
+.field public static final search_menu_title:I = 0x7f120e8b
-.field public static final selection_shrink_scale:I = 0x7f120e9e
+.field public static final selection_shrink_scale:I = 0x7f120ea2
-.field public static final send_contents:I = 0x7f120ea9
+.field public static final send_contents:I = 0x7f120ead
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f48
-.field public static final storage_permission_denied_msg:I = 0x7f120f52
+.field public static final storage_permission_denied_msg:I = 0x7f120f57
# 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 b699ae05e2..b7c2973ebd 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 = 0x7f080064
-.field public static final notification_action_background:I = 0x7f0803b9
+.field public static final notification_action_background:I = 0x7f0803c4
-.field public static final notification_bg:I = 0x7f0803ba
+.field public static final notification_bg:I = 0x7f0803c5
-.field public static final notification_bg_low:I = 0x7f0803bb
+.field public static final notification_bg_low:I = 0x7f0803c6
-.field public static final notification_bg_low_normal:I = 0x7f0803bc
+.field public static final notification_bg_low_normal:I = 0x7f0803c7
-.field public static final notification_bg_low_pressed:I = 0x7f0803bd
+.field public static final notification_bg_low_pressed:I = 0x7f0803c8
-.field public static final notification_bg_normal:I = 0x7f0803be
+.field public static final notification_bg_normal:I = 0x7f0803c9
-.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
+.field public static final notification_bg_normal_pressed:I = 0x7f0803ca
-.field public static final notification_icon_background:I = 0x7f0803c0
+.field public static final notification_icon_background:I = 0x7f0803cb
-.field public static final notification_template_icon_bg:I = 0x7f0803c1
+.field public static final notification_template_icon_bg:I = 0x7f0803cc
-.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
+.field public static final notification_template_icon_low_bg:I = 0x7f0803cd
-.field public static final notification_tile_bg:I = 0x7f0803c3
+.field public static final notification_tile_bg:I = 0x7f0803ce
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf
-.field public static final tooltip_frame_dark:I = 0x7f0803c9
+.field public static final tooltip_frame_dark:I = 0x7f0803d4
-.field public static final tooltip_frame_light:I = 0x7f0803ca
+.field public static final tooltip_frame_light:I = 0x7f0803d5
-.field public static final ucrop_ic_angle:I = 0x7f0803cb
+.field public static final ucrop_ic_angle:I = 0x7f0803d6
-.field public static final ucrop_ic_crop:I = 0x7f0803cc
+.field public static final ucrop_ic_crop:I = 0x7f0803d7
-.field public static final ucrop_ic_cross:I = 0x7f0803cd
+.field public static final ucrop_ic_cross:I = 0x7f0803d8
-.field public static final ucrop_ic_done:I = 0x7f0803ce
+.field public static final ucrop_ic_done:I = 0x7f0803d9
-.field public static final ucrop_ic_next:I = 0x7f0803cf
+.field public static final ucrop_ic_next:I = 0x7f0803da
-.field public static final ucrop_ic_reset:I = 0x7f0803d0
+.field public static final ucrop_ic_reset:I = 0x7f0803db
-.field public static final ucrop_ic_rotate:I = 0x7f0803d1
+.field public static final ucrop_ic_rotate:I = 0x7f0803dc
-.field public static final ucrop_ic_scale:I = 0x7f0803d2
+.field public static final ucrop_ic_scale:I = 0x7f0803dd
-.field public static final ucrop_shadow_upside:I = 0x7f0803d3
+.field public static final ucrop_shadow_upside:I = 0x7f0803de
-.field public static final ucrop_vector_ic_crop:I = 0x7f0803d4
+.field public static final ucrop_vector_ic_crop:I = 0x7f0803df
-.field public static final ucrop_vector_loader:I = 0x7f0803d5
+.field public static final ucrop_vector_loader:I = 0x7f0803e0
-.field public static final ucrop_vector_loader_animated:I = 0x7f0803d6
+.field public static final ucrop_vector_loader_animated:I = 0x7f0803e1
# direct methods
diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$string.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$string.smali
index 36712f11ea..b72e9f01be 100644
--- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$string.smali
+++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$string.smali
@@ -93,19 +93,19 @@
.field public static final abc_toolbar_collapse_description:I = 0x7f12002a
-.field public static final search_menu_title:I = 0x7f120e87
+.field public static final search_menu_title:I = 0x7f120e8b
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f48
-.field public static final ucrop_error_input_data_is_absent:I = 0x7f121041
+.field public static final ucrop_error_input_data_is_absent:I = 0x7f121047
-.field public static final ucrop_label_edit_photo:I = 0x7f121042
+.field public static final ucrop_label_edit_photo:I = 0x7f121048
-.field public static final ucrop_label_original:I = 0x7f121043
+.field public static final ucrop_label_original:I = 0x7f121049
-.field public static final ucrop_menu_crop:I = 0x7f121044
+.field public static final ucrop_menu_crop:I = 0x7f12104a
-.field public static final ucrop_mutate_exception_hint:I = 0x7f121045
+.field public static final ucrop_mutate_exception_hint:I = 0x7f12104b
# 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 88d13e1847..7e70bc5e66 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 = 0x7f080064
-.field public static final notification_action_background:I = 0x7f0803b9
+.field public static final notification_action_background:I = 0x7f0803c4
-.field public static final notification_bg:I = 0x7f0803ba
+.field public static final notification_bg:I = 0x7f0803c5
-.field public static final notification_bg_low:I = 0x7f0803bb
+.field public static final notification_bg_low:I = 0x7f0803c6
-.field public static final notification_bg_low_normal:I = 0x7f0803bc
+.field public static final notification_bg_low_normal:I = 0x7f0803c7
-.field public static final notification_bg_low_pressed:I = 0x7f0803bd
+.field public static final notification_bg_low_pressed:I = 0x7f0803c8
-.field public static final notification_bg_normal:I = 0x7f0803be
+.field public static final notification_bg_normal:I = 0x7f0803c9
-.field public static final notification_bg_normal_pressed:I = 0x7f0803bf
+.field public static final notification_bg_normal_pressed:I = 0x7f0803ca
-.field public static final notification_icon_background:I = 0x7f0803c0
+.field public static final notification_icon_background:I = 0x7f0803cb
-.field public static final notification_template_icon_bg:I = 0x7f0803c1
+.field public static final notification_template_icon_bg:I = 0x7f0803cc
-.field public static final notification_template_icon_low_bg:I = 0x7f0803c2
+.field public static final notification_template_icon_low_bg:I = 0x7f0803cd
-.field public static final notification_tile_bg:I = 0x7f0803c3
+.field public static final notification_tile_bg:I = 0x7f0803ce
-.field public static final notify_panel_notification_icon_bg:I = 0x7f0803c4
+.field public static final notify_panel_notification_icon_bg:I = 0x7f0803cf
-.field public static final tooltip_frame_dark:I = 0x7f0803c9
+.field public static final tooltip_frame_dark:I = 0x7f0803d4
-.field public static final tooltip_frame_light:I = 0x7f0803ca
+.field public static final tooltip_frame_light:I = 0x7f0803d5
-.field public static final ucrop_ic_angle:I = 0x7f0803cb
+.field public static final ucrop_ic_angle:I = 0x7f0803d6
-.field public static final ucrop_ic_crop:I = 0x7f0803cc
+.field public static final ucrop_ic_crop:I = 0x7f0803d7
-.field public static final ucrop_ic_cross:I = 0x7f0803cd
+.field public static final ucrop_ic_cross:I = 0x7f0803d8
-.field public static final ucrop_ic_done:I = 0x7f0803ce
+.field public static final ucrop_ic_done:I = 0x7f0803d9
-.field public static final ucrop_ic_next:I = 0x7f0803cf
+.field public static final ucrop_ic_next:I = 0x7f0803da
-.field public static final ucrop_ic_reset:I = 0x7f0803d0
+.field public static final ucrop_ic_reset:I = 0x7f0803db
-.field public static final ucrop_ic_rotate:I = 0x7f0803d1
+.field public static final ucrop_ic_rotate:I = 0x7f0803dc
-.field public static final ucrop_ic_scale:I = 0x7f0803d2
+.field public static final ucrop_ic_scale:I = 0x7f0803dd
-.field public static final ucrop_shadow_upside:I = 0x7f0803d3
+.field public static final ucrop_shadow_upside:I = 0x7f0803de
-.field public static final ucrop_vector_ic_crop:I = 0x7f0803d4
+.field public static final ucrop_vector_ic_crop:I = 0x7f0803df
-.field public static final ucrop_vector_loader:I = 0x7f0803d5
+.field public static final ucrop_vector_loader:I = 0x7f0803e0
-.field public static final ucrop_vector_loader_animated:I = 0x7f0803d6
+.field public static final ucrop_vector_loader_animated:I = 0x7f0803e1
# direct methods
diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/R$g.smali b/com.discord/smali_classes2/com/yalantis/ucrop/R$g.smali
index 390f1f6d40..e4c249f1cd 100644
--- a/com.discord/smali_classes2/com/yalantis/ucrop/R$g.smali
+++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$g.smali
@@ -73,19 +73,19 @@
.field public static final abc_toolbar_collapse_description:I = 0x7f12002a
-.field public static final search_menu_title:I = 0x7f120e87
+.field public static final search_menu_title:I = 0x7f120e8b
-.field public static final status_bar_notification_info_overflow:I = 0x7f120f43
+.field public static final status_bar_notification_info_overflow:I = 0x7f120f48
-.field public static final ucrop_error_input_data_is_absent:I = 0x7f121041
+.field public static final ucrop_error_input_data_is_absent:I = 0x7f121047
-.field public static final ucrop_label_edit_photo:I = 0x7f121042
+.field public static final ucrop_label_edit_photo:I = 0x7f121048
-.field public static final ucrop_label_original:I = 0x7f121043
+.field public static final ucrop_label_original:I = 0x7f121049
-.field public static final ucrop_menu_crop:I = 0x7f121044
+.field public static final ucrop_menu_crop:I = 0x7f12104a
-.field public static final ucrop_mutate_exception_hint:I = 0x7f121045
+.field public static final ucrop_mutate_exception_hint:I = 0x7f12104b
# direct methods