diff --git a/com.discord/AndroidManifest.xml b/com.discord/AndroidManifest.xml index 44118a5543..bed3e1e08f 100644 --- a/com.discord/AndroidManifest.xml +++ b/com.discord/AndroidManifest.xml @@ -1,4 +1,4 @@ - + diff --git a/com.discord/apktool.yml b/com.discord/apktool.yml index 0a55fdb990..1ca7b99b8f 100644 --- a/com.discord/apktool.yml +++ b/com.discord/apktool.yml @@ -1,5 +1,5 @@ !!brut.androlib.meta.MetaInfo -apkFileName: com.discord-823.apk +apkFileName: com.discord-824.apk compressionType: false doNotCompress: - arsc @@ -350,5 +350,5 @@ usesFramework: tag: null version: 2.4.0-896569-SNAPSHOT versionInfo: - versionCode: '823' - versionName: 8.2.3 + versionCode: '824' + versionName: 8.2.4 diff --git a/com.discord/assets/crashlytics-build.properties b/com.discord/assets/crashlytics-build.properties index 382d2862bc..3fb451b67c 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! # -#Fri Jan 04 03:39:58 UTC 2019 -version_name=8.2.3 +#Fri Jan 04 23:35:11 UTC 2019 +version_name=8.2.4 package_name=com.discord -build_id=f55e48f0-fd63-49f4-809b-1116da7143ba -version_code=823 +build_id=8e3da791-4364-4ca6-89ec-2cc305acaf7d +version_code=824 app_name=com.discord diff --git a/com.discord/original/AndroidManifest.xml b/com.discord/original/AndroidManifest.xml index 52e7e3d830..2372b4b845 100644 Binary files a/com.discord/original/AndroidManifest.xml and b/com.discord/original/AndroidManifest.xml differ diff --git a/com.discord/res/values/attrs.xml b/com.discord/res/values/attrs.xml index 01d59e95da..7291fa0dd6 100644 --- a/com.discord/res/values/attrs.xml +++ b/com.discord/res/values/attrs.xml @@ -1237,6 +1237,8 @@ + + diff --git a/com.discord/res/values/public.xml b/com.discord/res/values/public.xml index d2c388a55b..4e1204e5c4 100644 --- a/com.discord/res/values/public.xml +++ b/com.discord/res/values/public.xml @@ -918,124 +918,126 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7137,3725 +7139,3726 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/com.discord/res/values/strings.xml b/com.discord/res/values/strings.xml index 357774e687..ecf3534246 100644 --- a/com.discord/res/values/strings.xml +++ b/com.discord/res/values/strings.xml @@ -317,6 +317,7 @@ Surfing/Wakeboarding Survival Survival Horror + Browsing %1$s Tower Defense Track & Field Train Simulator @@ -858,7 +859,7 @@ SIDE TO SIDE {progress} Unable to sync cloud saves OR Collapse Category - f55e48f0-fd63-49f4-809b-1116da7143ba + 8e3da791-4364-4ca6-89ec-2cc305acaf7d Coming Soon Granular notification control only works on desktop apps at the moment. For now use the iOS notification settings. COMING SOON! @@ -4062,5 +4063,5 @@ Want to know more about Discord?" "You're viewing older messages" Chinese, China Chinese, Taiwan - false + false diff --git a/com.discord/res/values/styles.xml b/com.discord/res/values/styles.xml index 2ef3e01bb3..def3304983 100644 --- a/com.discord/res/values/styles.xml +++ b/com.discord/res/values/styles.xml @@ -344,6 +344,8 @@ @color/white @drawable/drawable_bg_reaction_dark @drawable/drawable_reaction_text_color_dark + @color/primary_700 + @color/white_alpha_10 @color/white_alpha_70 @color/white_alpha_20 @drawable/ic_emoji_activity_dark @@ -689,6 +691,8 @@ @color/grey_channels @drawable/drawable_bg_reaction_light @drawable/drawable_reaction_text_color_light + @color/primary_200 + @color/black_alpha_10 @color/grey_3 @color/grey_1 @drawable/ic_emoji_activity_light diff --git a/com.discord/smali/androidx/appcompat/R$attr.smali b/com.discord/smali/androidx/appcompat/R$attr.smali index fe3fd076ca..6bc3c6995d 100644 --- a/com.discord/smali/androidx/appcompat/R$attr.smali +++ b/com.discord/smali/androidx/appcompat/R$attr.smali @@ -478,85 +478,85 @@ .field public static final theme:I = 0x7f04033b -.field public static final thickness:I = 0x7f040387 +.field public static final thickness:I = 0x7f040389 -.field public static final thumbTextPadding:I = 0x7f040388 +.field public static final thumbTextPadding:I = 0x7f04038a -.field public static final thumbTint:I = 0x7f040389 +.field public static final thumbTint:I = 0x7f04038b -.field public static final thumbTintMode:I = 0x7f04038a +.field public static final thumbTintMode:I = 0x7f04038c -.field public static final tickMark:I = 0x7f04038b +.field public static final tickMark:I = 0x7f04038d -.field public static final tickMarkTint:I = 0x7f04038c +.field public static final tickMarkTint:I = 0x7f04038e -.field public static final tickMarkTintMode:I = 0x7f04038d +.field public static final tickMarkTintMode:I = 0x7f04038f -.field public static final tint:I = 0x7f04038e +.field public static final tint:I = 0x7f040390 -.field public static final tintMode:I = 0x7f04038f +.field public static final tintMode:I = 0x7f040391 -.field public static final title:I = 0x7f040390 +.field public static final title:I = 0x7f040392 -.field public static final titleMargin:I = 0x7f040392 +.field public static final titleMargin:I = 0x7f040394 -.field public static final titleMarginBottom:I = 0x7f040393 +.field public static final titleMarginBottom:I = 0x7f040395 -.field public static final titleMarginEnd:I = 0x7f040394 +.field public static final titleMarginEnd:I = 0x7f040396 -.field public static final titleMarginStart:I = 0x7f040395 +.field public static final titleMarginStart:I = 0x7f040397 -.field public static final titleMarginTop:I = 0x7f040396 +.field public static final titleMarginTop:I = 0x7f040398 -.field public static final titleMargins:I = 0x7f040397 +.field public static final titleMargins:I = 0x7f040399 -.field public static final titleTextAppearance:I = 0x7f040398 +.field public static final titleTextAppearance:I = 0x7f04039a -.field public static final titleTextColor:I = 0x7f040399 +.field public static final titleTextColor:I = 0x7f04039b -.field public static final titleTextStyle:I = 0x7f04039a +.field public static final titleTextStyle:I = 0x7f04039c -.field public static final toolbarNavigationButtonStyle:I = 0x7f04039c +.field public static final toolbarNavigationButtonStyle:I = 0x7f04039e -.field public static final toolbarStyle:I = 0x7f04039d +.field public static final toolbarStyle:I = 0x7f04039f -.field public static final tooltipForegroundColor:I = 0x7f04039e +.field public static final tooltipForegroundColor:I = 0x7f0403a0 -.field public static final tooltipFrameBackground:I = 0x7f04039f +.field public static final tooltipFrameBackground:I = 0x7f0403a1 -.field public static final tooltipText:I = 0x7f0403a0 +.field public static final tooltipText:I = 0x7f0403a2 -.field public static final track:I = 0x7f0403a1 +.field public static final track:I = 0x7f0403a3 -.field public static final trackTint:I = 0x7f0403a2 +.field public static final trackTint:I = 0x7f0403a4 -.field public static final trackTintMode:I = 0x7f0403a3 +.field public static final trackTintMode:I = 0x7f0403a5 -.field public static final ttcIndex:I = 0x7f0403a4 +.field public static final ttcIndex:I = 0x7f0403a6 -.field public static final viewInflaterClass:I = 0x7f0403bd +.field public static final viewInflaterClass:I = 0x7f0403bf -.field public static final voiceIcon:I = 0x7f0403be +.field public static final voiceIcon:I = 0x7f0403c0 -.field public static final windowActionBar:I = 0x7f0403c0 +.field public static final windowActionBar:I = 0x7f0403c2 -.field public static final windowActionBarOverlay:I = 0x7f0403c1 +.field public static final windowActionBarOverlay:I = 0x7f0403c3 -.field public static final windowActionModeOverlay:I = 0x7f0403c2 +.field public static final windowActionModeOverlay:I = 0x7f0403c4 -.field public static final windowFixedHeightMajor:I = 0x7f0403c3 +.field public static final windowFixedHeightMajor:I = 0x7f0403c5 -.field public static final windowFixedHeightMinor:I = 0x7f0403c4 +.field public static final windowFixedHeightMinor:I = 0x7f0403c6 -.field public static final windowFixedWidthMajor:I = 0x7f0403c5 +.field public static final windowFixedWidthMajor:I = 0x7f0403c7 -.field public static final windowFixedWidthMinor:I = 0x7f0403c6 +.field public static final windowFixedWidthMinor:I = 0x7f0403c8 -.field public static final windowMinWidthMajor:I = 0x7f0403c7 +.field public static final windowMinWidthMajor:I = 0x7f0403c9 -.field public static final windowMinWidthMinor:I = 0x7f0403c8 +.field public static final windowMinWidthMinor:I = 0x7f0403ca -.field public static final windowNoTitle:I = 0x7f0403c9 +.field public static final windowNoTitle:I = 0x7f0403cb # direct methods diff --git a/com.discord/smali/androidx/appcompat/R$string.smali b/com.discord/smali/androidx/appcompat/R$string.smali index 735a0eaf04..293fb72f1b 100644 --- a/com.discord/smali/androidx/appcompat/R$string.smali +++ b/com.discord/smali/androidx/appcompat/R$string.smali @@ -92,9 +92,9 @@ .field public static final abc_toolbar_collapse_description:I = 0x7f12002a -.field public static final search_menu_title:I = 0x7f120cbe +.field public static final search_menu_title:I = 0x7f120cbf -.field public static final status_bar_notification_info_overflow:I = 0x7f120d6d +.field public static final status_bar_notification_info_overflow:I = 0x7f120d6e # direct methods diff --git a/com.discord/smali/androidx/appcompat/R$styleable.smali b/com.discord/smali/androidx/appcompat/R$styleable.smali index d175941f75..40a6163459 100644 --- a/com.discord/smali/androidx/appcompat/R$styleable.smali +++ b/com.discord/smali/androidx/appcompat/R$styleable.smali @@ -1278,8 +1278,8 @@ 0x7f0402a3 0x7f0402fb 0x7f0402fe - 0x7f040390 - 0x7f04039a + 0x7f040392 + 0x7f04039c .end array-data :array_1 @@ -1289,7 +1289,7 @@ 0x7f04009a 0x7f04013e 0x7f0402fe - 0x7f04039a + 0x7f04039c .end array-data :array_2 @@ -1338,16 +1338,16 @@ .array-data 4 0x1010119 0x7f0402ed - 0x7f04038e - 0x7f04038f + 0x7f040390 + 0x7f040391 .end array-data :array_8 .array-data 4 0x1010142 - 0x7f04038b - 0x7f04038c 0x7f04038d + 0x7f04038e + 0x7f04038f .end array-data :array_9 @@ -1484,13 +1484,11 @@ 0x7f040333 0x7f040336 0x7f040337 - 0x7f04039c - 0x7f04039d 0x7f04039e 0x7f04039f - 0x7f0403bd - 0x7f0403c0 - 0x7f0403c1 + 0x7f0403a0 + 0x7f0403a1 + 0x7f0403bf 0x7f0403c2 0x7f0403c3 0x7f0403c4 @@ -1499,6 +1497,8 @@ 0x7f0403c7 0x7f0403c8 0x7f0403c9 + 0x7f0403ca + 0x7f0403cb .end array-data :array_c @@ -1541,7 +1541,7 @@ 0x7f0400f9 0x7f040138 0x7f0402e9 - 0x7f040387 + 0x7f040389 .end array-data :array_11 @@ -1565,7 +1565,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data :array_13 @@ -1651,7 +1651,7 @@ 0x7f0401ad 0x7f04024f 0x7f0402db - 0x7f0403a0 + 0x7f0403a2 .end array-data :array_1a @@ -1698,7 +1698,7 @@ 0x7f0402d4 0x7f0402fa 0x7f0402ff - 0x7f0403be + 0x7f0403c0 .end array-data :array_1e @@ -1730,12 +1730,12 @@ 0x7f040300 0x7f040301 0x7f040303 - 0x7f040388 - 0x7f040389 0x7f04038a - 0x7f0403a1 - 0x7f0403a2 + 0x7f04038b + 0x7f04038c 0x7f0403a3 + 0x7f0403a4 + 0x7f0403a5 .end array-data :array_21 @@ -1777,15 +1777,15 @@ 0x7f0402fb 0x7f0402fc 0x7f0402fd - 0x7f040390 0x7f040392 - 0x7f040393 0x7f040394 0x7f040395 0x7f040396 0x7f040397 0x7f040398 0x7f040399 + 0x7f04039a + 0x7f04039b .end array-data :array_23 diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$attr.smali b/com.discord/smali/androidx/asynclayoutinflater/R$attr.smali index a440fb425d..c5113699a0 100644 --- a/com.discord/smali/androidx/asynclayoutinflater/R$attr.smali +++ b/com.discord/smali/androidx/asynclayoutinflater/R$attr.smali @@ -36,7 +36,7 @@ .field public static final fontWeight:I = 0x7f040136 -.field public static final ttcIndex:I = 0x7f0403a4 +.field public static final ttcIndex:I = 0x7f0403a6 # direct methods diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$string.smali b/com.discord/smali/androidx/asynclayoutinflater/R$string.smali index c0848f9d78..7b9bc387f2 100644 --- a/com.discord/smali/androidx/asynclayoutinflater/R$string.smali +++ b/com.discord/smali/androidx/asynclayoutinflater/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d6d +.field public static final status_bar_notification_info_overflow:I = 0x7f120d6e # direct methods diff --git a/com.discord/smali/androidx/asynclayoutinflater/R$styleable.smali b/com.discord/smali/androidx/asynclayoutinflater/R$styleable.smali index bba5820c06..1d9376a733 100644 --- a/com.discord/smali/androidx/asynclayoutinflater/R$styleable.smali +++ b/com.discord/smali/androidx/asynclayoutinflater/R$styleable.smali @@ -167,7 +167,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data :array_3 diff --git a/com.discord/smali/androidx/browser/R$attr.smali b/com.discord/smali/androidx/browser/R$attr.smali index f18aab1479..1214a11d8a 100644 --- a/com.discord/smali/androidx/browser/R$attr.smali +++ b/com.discord/smali/androidx/browser/R$attr.smali @@ -54,7 +54,7 @@ .field public static final statusBarBackground:I = 0x7f0402f4 -.field public static final ttcIndex:I = 0x7f0403a4 +.field public static final ttcIndex:I = 0x7f0403a6 # direct methods diff --git a/com.discord/smali/androidx/browser/R$string.smali b/com.discord/smali/androidx/browser/R$string.smali index f5a615d5ea..be15022102 100644 --- a/com.discord/smali/androidx/browser/R$string.smali +++ b/com.discord/smali/androidx/browser/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d6d +.field public static final status_bar_notification_info_overflow:I = 0x7f120d6e # direct methods diff --git a/com.discord/smali/androidx/browser/R$styleable.smali b/com.discord/smali/androidx/browser/R$styleable.smali index 63bef92cd9..a075873bf7 100644 --- a/com.discord/smali/androidx/browser/R$styleable.smali +++ b/com.discord/smali/androidx/browser/R$styleable.smali @@ -218,7 +218,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data :array_5 diff --git a/com.discord/smali/androidx/coordinatorlayout/R$attr.smali b/com.discord/smali/androidx/coordinatorlayout/R$attr.smali index 1d1dfc969d..34d52b522b 100644 --- a/com.discord/smali/androidx/coordinatorlayout/R$attr.smali +++ b/com.discord/smali/androidx/coordinatorlayout/R$attr.smali @@ -54,7 +54,7 @@ .field public static final statusBarBackground:I = 0x7f0402f4 -.field public static final ttcIndex:I = 0x7f0403a4 +.field public static final ttcIndex:I = 0x7f0403a6 # direct methods diff --git a/com.discord/smali/androidx/coordinatorlayout/R$string.smali b/com.discord/smali/androidx/coordinatorlayout/R$string.smali index a585f87bbb..fe64ee0484 100644 --- a/com.discord/smali/androidx/coordinatorlayout/R$string.smali +++ b/com.discord/smali/androidx/coordinatorlayout/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d6d +.field public static final status_bar_notification_info_overflow:I = 0x7f120d6e # direct methods diff --git a/com.discord/smali/androidx/coordinatorlayout/R$styleable.smali b/com.discord/smali/androidx/coordinatorlayout/R$styleable.smali index 8696bb20ad..d58970ae29 100644 --- a/com.discord/smali/androidx/coordinatorlayout/R$styleable.smali +++ b/com.discord/smali/androidx/coordinatorlayout/R$styleable.smali @@ -218,7 +218,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data :array_5 diff --git a/com.discord/smali/androidx/core/R$attr.smali b/com.discord/smali/androidx/core/R$attr.smali index 8b8d591571..052d186295 100644 --- a/com.discord/smali/androidx/core/R$attr.smali +++ b/com.discord/smali/androidx/core/R$attr.smali @@ -36,7 +36,7 @@ .field public static final fontWeight:I = 0x7f040136 -.field public static final ttcIndex:I = 0x7f0403a4 +.field public static final ttcIndex:I = 0x7f0403a6 # direct methods diff --git a/com.discord/smali/androidx/core/R$string.smali b/com.discord/smali/androidx/core/R$string.smali index 1da6ae5f84..1fb09ccf72 100644 --- a/com.discord/smali/androidx/core/R$string.smali +++ b/com.discord/smali/androidx/core/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d6d +.field public static final status_bar_notification_info_overflow:I = 0x7f120d6e # direct methods diff --git a/com.discord/smali/androidx/core/R$styleable.smali b/com.discord/smali/androidx/core/R$styleable.smali index 9e5bdaa53c..98cdb845a5 100644 --- a/com.discord/smali/androidx/core/R$styleable.smali +++ b/com.discord/smali/androidx/core/R$styleable.smali @@ -167,7 +167,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data :array_3 diff --git a/com.discord/smali/androidx/customview/R$attr.smali b/com.discord/smali/androidx/customview/R$attr.smali index 1ba5f318f0..0aad781350 100644 --- a/com.discord/smali/androidx/customview/R$attr.smali +++ b/com.discord/smali/androidx/customview/R$attr.smali @@ -36,7 +36,7 @@ .field public static final fontWeight:I = 0x7f040136 -.field public static final ttcIndex:I = 0x7f0403a4 +.field public static final ttcIndex:I = 0x7f0403a6 # direct methods diff --git a/com.discord/smali/androidx/customview/R$string.smali b/com.discord/smali/androidx/customview/R$string.smali index 9f1d947920..9fe0614cfe 100644 --- a/com.discord/smali/androidx/customview/R$string.smali +++ b/com.discord/smali/androidx/customview/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d6d +.field public static final status_bar_notification_info_overflow:I = 0x7f120d6e # direct methods diff --git a/com.discord/smali/androidx/customview/R$styleable.smali b/com.discord/smali/androidx/customview/R$styleable.smali index 84bd1a4549..e49a450a2f 100644 --- a/com.discord/smali/androidx/customview/R$styleable.smali +++ b/com.discord/smali/androidx/customview/R$styleable.smali @@ -167,7 +167,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data :array_3 diff --git a/com.discord/smali/androidx/drawerlayout/R$attr.smali b/com.discord/smali/androidx/drawerlayout/R$attr.smali index 110f370dcb..a3ba3fe8ef 100644 --- a/com.discord/smali/androidx/drawerlayout/R$attr.smali +++ b/com.discord/smali/androidx/drawerlayout/R$attr.smali @@ -36,7 +36,7 @@ .field public static final fontWeight:I = 0x7f040136 -.field public static final ttcIndex:I = 0x7f0403a4 +.field public static final ttcIndex:I = 0x7f0403a6 # direct methods diff --git a/com.discord/smali/androidx/drawerlayout/R$string.smali b/com.discord/smali/androidx/drawerlayout/R$string.smali index efecab0976..dca36f5f87 100644 --- a/com.discord/smali/androidx/drawerlayout/R$string.smali +++ b/com.discord/smali/androidx/drawerlayout/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d6d +.field public static final status_bar_notification_info_overflow:I = 0x7f120d6e # direct methods diff --git a/com.discord/smali/androidx/drawerlayout/R$styleable.smali b/com.discord/smali/androidx/drawerlayout/R$styleable.smali index 46dd753190..5f0b176466 100644 --- a/com.discord/smali/androidx/drawerlayout/R$styleable.smali +++ b/com.discord/smali/androidx/drawerlayout/R$styleable.smali @@ -167,7 +167,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data :array_3 diff --git a/com.discord/smali/androidx/fragment/R$attr.smali b/com.discord/smali/androidx/fragment/R$attr.smali index 4490809e4b..93b8391cc7 100644 --- a/com.discord/smali/androidx/fragment/R$attr.smali +++ b/com.discord/smali/androidx/fragment/R$attr.smali @@ -54,7 +54,7 @@ .field public static final statusBarBackground:I = 0x7f0402f4 -.field public static final ttcIndex:I = 0x7f0403a4 +.field public static final ttcIndex:I = 0x7f0403a6 # direct methods diff --git a/com.discord/smali/androidx/fragment/R$string.smali b/com.discord/smali/androidx/fragment/R$string.smali index 780ce7c97c..37eaa108e6 100644 --- a/com.discord/smali/androidx/fragment/R$string.smali +++ b/com.discord/smali/androidx/fragment/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d6d +.field public static final status_bar_notification_info_overflow:I = 0x7f120d6e # direct methods diff --git a/com.discord/smali/androidx/fragment/R$styleable.smali b/com.discord/smali/androidx/fragment/R$styleable.smali index 480f13c43a..87c6a281c6 100644 --- a/com.discord/smali/androidx/fragment/R$styleable.smali +++ b/com.discord/smali/androidx/fragment/R$styleable.smali @@ -218,7 +218,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data :array_5 diff --git a/com.discord/smali/androidx/legacy/coreui/R$attr.smali b/com.discord/smali/androidx/legacy/coreui/R$attr.smali index d3f6b75208..c1fb8d5518 100644 --- a/com.discord/smali/androidx/legacy/coreui/R$attr.smali +++ b/com.discord/smali/androidx/legacy/coreui/R$attr.smali @@ -54,7 +54,7 @@ .field public static final statusBarBackground:I = 0x7f0402f4 -.field public static final ttcIndex:I = 0x7f0403a4 +.field public static final ttcIndex:I = 0x7f0403a6 # 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 35b2efa393..f7881cc066 100644 --- a/com.discord/smali/androidx/legacy/coreui/R$string.smali +++ b/com.discord/smali/androidx/legacy/coreui/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d6d +.field public static final status_bar_notification_info_overflow:I = 0x7f120d6e # direct methods diff --git a/com.discord/smali/androidx/legacy/coreui/R$styleable.smali b/com.discord/smali/androidx/legacy/coreui/R$styleable.smali index 7a2b3a3aaa..e29344350a 100644 --- a/com.discord/smali/androidx/legacy/coreui/R$styleable.smali +++ b/com.discord/smali/androidx/legacy/coreui/R$styleable.smali @@ -218,7 +218,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data :array_5 diff --git a/com.discord/smali/androidx/legacy/coreutils/R$attr.smali b/com.discord/smali/androidx/legacy/coreutils/R$attr.smali index 30027d1ef2..0f77af7809 100644 --- a/com.discord/smali/androidx/legacy/coreutils/R$attr.smali +++ b/com.discord/smali/androidx/legacy/coreutils/R$attr.smali @@ -36,7 +36,7 @@ .field public static final fontWeight:I = 0x7f040136 -.field public static final ttcIndex:I = 0x7f0403a4 +.field public static final ttcIndex:I = 0x7f0403a6 # 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 4cf173fc44..5db8677417 100644 --- a/com.discord/smali/androidx/legacy/coreutils/R$string.smali +++ b/com.discord/smali/androidx/legacy/coreutils/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d6d +.field public static final status_bar_notification_info_overflow:I = 0x7f120d6e # direct methods diff --git a/com.discord/smali/androidx/legacy/coreutils/R$styleable.smali b/com.discord/smali/androidx/legacy/coreutils/R$styleable.smali index 35ba07740e..2ca0b2950f 100644 --- a/com.discord/smali/androidx/legacy/coreutils/R$styleable.smali +++ b/com.discord/smali/androidx/legacy/coreutils/R$styleable.smali @@ -167,7 +167,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data :array_3 diff --git a/com.discord/smali/androidx/legacy/v13/R$attr.smali b/com.discord/smali/androidx/legacy/v13/R$attr.smali index 097954744f..3e4c3bc9e8 100644 --- a/com.discord/smali/androidx/legacy/v13/R$attr.smali +++ b/com.discord/smali/androidx/legacy/v13/R$attr.smali @@ -54,7 +54,7 @@ .field public static final statusBarBackground:I = 0x7f0402f4 -.field public static final ttcIndex:I = 0x7f0403a4 +.field public static final ttcIndex:I = 0x7f0403a6 # 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 86180a4588..b3e5fe4d3e 100644 --- a/com.discord/smali/androidx/legacy/v13/R$string.smali +++ b/com.discord/smali/androidx/legacy/v13/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d6d +.field public static final status_bar_notification_info_overflow:I = 0x7f120d6e # direct methods diff --git a/com.discord/smali/androidx/legacy/v13/R$styleable.smali b/com.discord/smali/androidx/legacy/v13/R$styleable.smali index b2ae102872..9dbfb9a495 100644 --- a/com.discord/smali/androidx/legacy/v13/R$styleable.smali +++ b/com.discord/smali/androidx/legacy/v13/R$styleable.smali @@ -218,7 +218,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data :array_5 diff --git a/com.discord/smali/androidx/legacy/v4/R$attr.smali b/com.discord/smali/androidx/legacy/v4/R$attr.smali index 88bd748c6a..62201d87e3 100644 --- a/com.discord/smali/androidx/legacy/v4/R$attr.smali +++ b/com.discord/smali/androidx/legacy/v4/R$attr.smali @@ -54,7 +54,7 @@ .field public static final statusBarBackground:I = 0x7f0402f4 -.field public static final ttcIndex:I = 0x7f0403a4 +.field public static final ttcIndex:I = 0x7f0403a6 # 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 5b32bdecfa..955a82177a 100644 --- a/com.discord/smali/androidx/legacy/v4/R$string.smali +++ b/com.discord/smali/androidx/legacy/v4/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d6d +.field public static final status_bar_notification_info_overflow:I = 0x7f120d6e # direct methods diff --git a/com.discord/smali/androidx/legacy/v4/R$styleable.smali b/com.discord/smali/androidx/legacy/v4/R$styleable.smali index 753a126982..3566615c9a 100644 --- a/com.discord/smali/androidx/legacy/v4/R$styleable.smali +++ b/com.discord/smali/androidx/legacy/v4/R$styleable.smali @@ -218,7 +218,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data :array_5 diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$attr.smali b/com.discord/smali/androidx/lifecycle/extensions/R$attr.smali index 7209cbfc82..cad06d49c4 100644 --- a/com.discord/smali/androidx/lifecycle/extensions/R$attr.smali +++ b/com.discord/smali/androidx/lifecycle/extensions/R$attr.smali @@ -54,7 +54,7 @@ .field public static final statusBarBackground:I = 0x7f0402f4 -.field public static final ttcIndex:I = 0x7f0403a4 +.field public static final ttcIndex:I = 0x7f0403a6 # 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 c567becfc5..0df26ddc0e 100644 --- a/com.discord/smali/androidx/lifecycle/extensions/R$string.smali +++ b/com.discord/smali/androidx/lifecycle/extensions/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d6d +.field public static final status_bar_notification_info_overflow:I = 0x7f120d6e # direct methods diff --git a/com.discord/smali/androidx/lifecycle/extensions/R$styleable.smali b/com.discord/smali/androidx/lifecycle/extensions/R$styleable.smali index 8132b34328..5518d8728a 100644 --- a/com.discord/smali/androidx/lifecycle/extensions/R$styleable.smali +++ b/com.discord/smali/androidx/lifecycle/extensions/R$styleable.smali @@ -218,7 +218,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data :array_5 diff --git a/com.discord/smali/androidx/loader/R$attr.smali b/com.discord/smali/androidx/loader/R$attr.smali index 43cd8bcdcf..63c8436009 100644 --- a/com.discord/smali/androidx/loader/R$attr.smali +++ b/com.discord/smali/androidx/loader/R$attr.smali @@ -36,7 +36,7 @@ .field public static final fontWeight:I = 0x7f040136 -.field public static final ttcIndex:I = 0x7f0403a4 +.field public static final ttcIndex:I = 0x7f0403a6 # direct methods diff --git a/com.discord/smali/androidx/loader/R$string.smali b/com.discord/smali/androidx/loader/R$string.smali index 773be0c8f3..cdbba4d4bf 100644 --- a/com.discord/smali/androidx/loader/R$string.smali +++ b/com.discord/smali/androidx/loader/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d6d +.field public static final status_bar_notification_info_overflow:I = 0x7f120d6e # direct methods diff --git a/com.discord/smali/androidx/loader/R$styleable.smali b/com.discord/smali/androidx/loader/R$styleable.smali index 94693b78e5..416c581140 100644 --- a/com.discord/smali/androidx/loader/R$styleable.smali +++ b/com.discord/smali/androidx/loader/R$styleable.smali @@ -167,7 +167,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data :array_3 diff --git a/com.discord/smali/androidx/media/R$attr.smali b/com.discord/smali/androidx/media/R$attr.smali index 718c8589ed..740da2c3ca 100644 --- a/com.discord/smali/androidx/media/R$attr.smali +++ b/com.discord/smali/androidx/media/R$attr.smali @@ -36,7 +36,7 @@ .field public static final fontWeight:I = 0x7f040136 -.field public static final ttcIndex:I = 0x7f0403a4 +.field public static final ttcIndex:I = 0x7f0403a6 # direct methods diff --git a/com.discord/smali/androidx/media/R$string.smali b/com.discord/smali/androidx/media/R$string.smali index 90decf006c..d9a5f4dcd5 100644 --- a/com.discord/smali/androidx/media/R$string.smali +++ b/com.discord/smali/androidx/media/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d6d +.field public static final status_bar_notification_info_overflow:I = 0x7f120d6e # direct methods diff --git a/com.discord/smali/androidx/media/R$styleable.smali b/com.discord/smali/androidx/media/R$styleable.smali index 511a5eb6b1..c116e9d4ca 100644 --- a/com.discord/smali/androidx/media/R$styleable.smali +++ b/com.discord/smali/androidx/media/R$styleable.smali @@ -167,7 +167,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data :array_3 diff --git a/com.discord/smali/androidx/recyclerview/R$attr.smali b/com.discord/smali/androidx/recyclerview/R$attr.smali index 16d84ee06c..ecdbb9561a 100644 --- a/com.discord/smali/androidx/recyclerview/R$attr.smali +++ b/com.discord/smali/androidx/recyclerview/R$attr.smali @@ -72,7 +72,7 @@ .field public static final statusBarBackground:I = 0x7f0402f4 -.field public static final ttcIndex:I = 0x7f0403a4 +.field public static final ttcIndex:I = 0x7f0403a6 # direct methods diff --git a/com.discord/smali/androidx/recyclerview/R$string.smali b/com.discord/smali/androidx/recyclerview/R$string.smali index 1d10c1425c..5fb51dc1a4 100644 --- a/com.discord/smali/androidx/recyclerview/R$string.smali +++ b/com.discord/smali/androidx/recyclerview/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d6d +.field public static final status_bar_notification_info_overflow:I = 0x7f120d6e # direct methods diff --git a/com.discord/smali/androidx/recyclerview/R$styleable.smali b/com.discord/smali/androidx/recyclerview/R$styleable.smali index acf129b60d..2f84806a57 100644 --- a/com.discord/smali/androidx/recyclerview/R$styleable.smali +++ b/com.discord/smali/androidx/recyclerview/R$styleable.smali @@ -252,7 +252,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data :array_5 diff --git a/com.discord/smali/androidx/room/R$attr.smali b/com.discord/smali/androidx/room/R$attr.smali index 0a1e27e514..6230dbfca6 100644 --- a/com.discord/smali/androidx/room/R$attr.smali +++ b/com.discord/smali/androidx/room/R$attr.smali @@ -36,7 +36,7 @@ .field public static final fontWeight:I = 0x7f040136 -.field public static final ttcIndex:I = 0x7f0403a4 +.field public static final ttcIndex:I = 0x7f0403a6 # direct methods diff --git a/com.discord/smali/androidx/room/R$string.smali b/com.discord/smali/androidx/room/R$string.smali index 26ac5a5afb..0f5e00ffa0 100644 --- a/com.discord/smali/androidx/room/R$string.smali +++ b/com.discord/smali/androidx/room/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d6d +.field public static final status_bar_notification_info_overflow:I = 0x7f120d6e # direct methods diff --git a/com.discord/smali/androidx/room/R$styleable.smali b/com.discord/smali/androidx/room/R$styleable.smali index 4d7f2312bb..bd023fe082 100644 --- a/com.discord/smali/androidx/room/R$styleable.smali +++ b/com.discord/smali/androidx/room/R$styleable.smali @@ -167,7 +167,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data :array_3 diff --git a/com.discord/smali/androidx/slidingpanelayout/R$attr.smali b/com.discord/smali/androidx/slidingpanelayout/R$attr.smali index 2fd284e4b7..657d385650 100644 --- a/com.discord/smali/androidx/slidingpanelayout/R$attr.smali +++ b/com.discord/smali/androidx/slidingpanelayout/R$attr.smali @@ -36,7 +36,7 @@ .field public static final fontWeight:I = 0x7f040136 -.field public static final ttcIndex:I = 0x7f0403a4 +.field public static final ttcIndex:I = 0x7f0403a6 # direct methods diff --git a/com.discord/smali/androidx/slidingpanelayout/R$string.smali b/com.discord/smali/androidx/slidingpanelayout/R$string.smali index 89e2c9fd00..ff8015261c 100644 --- a/com.discord/smali/androidx/slidingpanelayout/R$string.smali +++ b/com.discord/smali/androidx/slidingpanelayout/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d6d +.field public static final status_bar_notification_info_overflow:I = 0x7f120d6e # direct methods diff --git a/com.discord/smali/androidx/slidingpanelayout/R$styleable.smali b/com.discord/smali/androidx/slidingpanelayout/R$styleable.smali index be9e1a8942..205221edcf 100644 --- a/com.discord/smali/androidx/slidingpanelayout/R$styleable.smali +++ b/com.discord/smali/androidx/slidingpanelayout/R$styleable.smali @@ -167,7 +167,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data :array_3 diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$attr.smali b/com.discord/smali/androidx/swiperefreshlayout/R$attr.smali index 5954861f47..c91e93f102 100644 --- a/com.discord/smali/androidx/swiperefreshlayout/R$attr.smali +++ b/com.discord/smali/androidx/swiperefreshlayout/R$attr.smali @@ -36,7 +36,7 @@ .field public static final fontWeight:I = 0x7f040136 -.field public static final ttcIndex:I = 0x7f0403a4 +.field public static final ttcIndex:I = 0x7f0403a6 # direct methods diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$string.smali b/com.discord/smali/androidx/swiperefreshlayout/R$string.smali index 8138b1e1e1..1af0852937 100644 --- a/com.discord/smali/androidx/swiperefreshlayout/R$string.smali +++ b/com.discord/smali/androidx/swiperefreshlayout/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d6d +.field public static final status_bar_notification_info_overflow:I = 0x7f120d6e # direct methods diff --git a/com.discord/smali/androidx/swiperefreshlayout/R$styleable.smali b/com.discord/smali/androidx/swiperefreshlayout/R$styleable.smali index fae11ac7bf..9511ad2d21 100644 --- a/com.discord/smali/androidx/swiperefreshlayout/R$styleable.smali +++ b/com.discord/smali/androidx/swiperefreshlayout/R$styleable.smali @@ -167,7 +167,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data :array_3 diff --git a/com.discord/smali/androidx/transition/R$attr.smali b/com.discord/smali/androidx/transition/R$attr.smali index bd89eed47e..274f3ae101 100644 --- a/com.discord/smali/androidx/transition/R$attr.smali +++ b/com.discord/smali/androidx/transition/R$attr.smali @@ -36,7 +36,7 @@ .field public static final fontWeight:I = 0x7f040136 -.field public static final ttcIndex:I = 0x7f0403a4 +.field public static final ttcIndex:I = 0x7f0403a6 # direct methods diff --git a/com.discord/smali/androidx/transition/R$string.smali b/com.discord/smali/androidx/transition/R$string.smali index 0f6e1f7c9b..ae189243e7 100644 --- a/com.discord/smali/androidx/transition/R$string.smali +++ b/com.discord/smali/androidx/transition/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d6d +.field public static final status_bar_notification_info_overflow:I = 0x7f120d6e # direct methods diff --git a/com.discord/smali/androidx/transition/R$styleable.smali b/com.discord/smali/androidx/transition/R$styleable.smali index 7d4272f8b5..116ab11daa 100644 --- a/com.discord/smali/androidx/transition/R$styleable.smali +++ b/com.discord/smali/androidx/transition/R$styleable.smali @@ -167,7 +167,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data :array_3 diff --git a/com.discord/smali/androidx/vectordrawable/R$attr.smali b/com.discord/smali/androidx/vectordrawable/R$attr.smali index 1b599694f1..193c62d1ba 100644 --- a/com.discord/smali/androidx/vectordrawable/R$attr.smali +++ b/com.discord/smali/androidx/vectordrawable/R$attr.smali @@ -54,7 +54,7 @@ .field public static final statusBarBackground:I = 0x7f0402f4 -.field public static final ttcIndex:I = 0x7f0403a4 +.field public static final ttcIndex:I = 0x7f0403a6 # direct methods diff --git a/com.discord/smali/androidx/vectordrawable/R$string.smali b/com.discord/smali/androidx/vectordrawable/R$string.smali index 07544845dd..bb8c3fdbaa 100644 --- a/com.discord/smali/androidx/vectordrawable/R$string.smali +++ b/com.discord/smali/androidx/vectordrawable/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d6d +.field public static final status_bar_notification_info_overflow:I = 0x7f120d6e # direct methods diff --git a/com.discord/smali/androidx/vectordrawable/R$styleable.smali b/com.discord/smali/androidx/vectordrawable/R$styleable.smali index a39e833c47..b45530a9ad 100644 --- a/com.discord/smali/androidx/vectordrawable/R$styleable.smali +++ b/com.discord/smali/androidx/vectordrawable/R$styleable.smali @@ -218,7 +218,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data :array_5 diff --git a/com.discord/smali/androidx/viewpager/R$attr.smali b/com.discord/smali/androidx/viewpager/R$attr.smali index 0325da7332..02f8f3f4d1 100644 --- a/com.discord/smali/androidx/viewpager/R$attr.smali +++ b/com.discord/smali/androidx/viewpager/R$attr.smali @@ -36,7 +36,7 @@ .field public static final fontWeight:I = 0x7f040136 -.field public static final ttcIndex:I = 0x7f0403a4 +.field public static final ttcIndex:I = 0x7f0403a6 # direct methods diff --git a/com.discord/smali/androidx/viewpager/R$string.smali b/com.discord/smali/androidx/viewpager/R$string.smali index a506366319..ad356964ba 100644 --- a/com.discord/smali/androidx/viewpager/R$string.smali +++ b/com.discord/smali/androidx/viewpager/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d6d +.field public static final status_bar_notification_info_overflow:I = 0x7f120d6e # direct methods diff --git a/com.discord/smali/androidx/viewpager/R$styleable.smali b/com.discord/smali/androidx/viewpager/R$styleable.smali index 6896d751bb..798cb36e87 100644 --- a/com.discord/smali/androidx/viewpager/R$styleable.smali +++ b/com.discord/smali/androidx/viewpager/R$styleable.smali @@ -167,7 +167,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data :array_3 diff --git a/com.discord/smali/androidx/work/R$string.smali b/com.discord/smali/androidx/work/R$string.smali index c3cd94175d..5e0cf94554 100644 --- a/com.discord/smali/androidx/work/R$string.smali +++ b/com.discord/smali/androidx/work/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d6d +.field public static final status_bar_notification_info_overflow:I = 0x7f120d6e # direct methods diff --git a/com.discord/smali/androidx/work/R$styleable.smali b/com.discord/smali/androidx/work/R$styleable.smali index 3f0b8425e2..28279fe59a 100644 --- a/com.discord/smali/androidx/work/R$styleable.smali +++ b/com.discord/smali/androidx/work/R$styleable.smali @@ -94,7 +94,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data .end method diff --git a/com.discord/smali/androidx/work/ktx/R$string.smali b/com.discord/smali/androidx/work/ktx/R$string.smali index 58a1d39d95..ede0ac2cfa 100644 --- a/com.discord/smali/androidx/work/ktx/R$string.smali +++ b/com.discord/smali/androidx/work/ktx/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d6d +.field public static final status_bar_notification_info_overflow:I = 0x7f120d6e # direct methods diff --git a/com.discord/smali/androidx/work/ktx/R$styleable.smali b/com.discord/smali/androidx/work/ktx/R$styleable.smali index 71f9bd5546..cada0f6653 100644 --- a/com.discord/smali/androidx/work/ktx/R$styleable.smali +++ b/com.discord/smali/androidx/work/ktx/R$styleable.smali @@ -94,7 +94,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data .end method diff --git a/com.discord/smali/butterknife/R$attr.smali b/com.discord/smali/butterknife/R$attr.smali index a98230d580..888196877b 100644 --- a/com.discord/smali/butterknife/R$attr.smali +++ b/com.discord/smali/butterknife/R$attr.smali @@ -36,7 +36,7 @@ .field public static final fontWeight:I = 0x7f040136 -.field public static final ttcIndex:I = 0x7f0403a4 +.field public static final ttcIndex:I = 0x7f0403a6 # direct methods diff --git a/com.discord/smali/butterknife/R$string.smali b/com.discord/smali/butterknife/R$string.smali index 878c1c8ffa..fc0db6ba01 100644 --- a/com.discord/smali/butterknife/R$string.smali +++ b/com.discord/smali/butterknife/R$string.smali @@ -14,7 +14,7 @@ # static fields -.field public static final status_bar_notification_info_overflow:I = 0x7f120d6d +.field public static final status_bar_notification_info_overflow:I = 0x7f120d6e # direct methods diff --git a/com.discord/smali/butterknife/R$styleable.smali b/com.discord/smali/butterknife/R$styleable.smali index 4444754433..6c77c90f8b 100644 --- a/com.discord/smali/butterknife/R$styleable.smali +++ b/com.discord/smali/butterknife/R$styleable.smali @@ -167,7 +167,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data :array_3 diff --git a/com.discord/smali/com/airbnb/lottie/R$a.smali b/com.discord/smali/com/airbnb/lottie/R$a.smali index 6ae6dee2fe..a9f320b2dd 100644 --- a/com.discord/smali/com/airbnb/lottie/R$a.smali +++ b/com.discord/smali/com/airbnb/lottie/R$a.smali @@ -1312,8 +1312,8 @@ 0x7f0402a3 0x7f0402fb 0x7f0402fe - 0x7f040390 - 0x7f04039a + 0x7f040392 + 0x7f04039c .end array-data :array_1 @@ -1323,7 +1323,7 @@ 0x7f04009a 0x7f04013e 0x7f0402fe - 0x7f04039a + 0x7f04039c .end array-data :array_2 @@ -1372,16 +1372,16 @@ .array-data 4 0x1010119 0x7f0402ed - 0x7f04038e - 0x7f04038f + 0x7f040390 + 0x7f040391 .end array-data :array_8 .array-data 4 0x1010142 - 0x7f04038b - 0x7f04038c 0x7f04038d + 0x7f04038e + 0x7f04038f .end array-data :array_9 @@ -1518,13 +1518,11 @@ 0x7f040333 0x7f040336 0x7f040337 - 0x7f04039c - 0x7f04039d 0x7f04039e 0x7f04039f - 0x7f0403bd - 0x7f0403c0 - 0x7f0403c1 + 0x7f0403a0 + 0x7f0403a1 + 0x7f0403bf 0x7f0403c2 0x7f0403c3 0x7f0403c4 @@ -1533,6 +1531,8 @@ 0x7f0403c7 0x7f0403c8 0x7f0403c9 + 0x7f0403ca + 0x7f0403cb .end array-data :array_c @@ -1575,7 +1575,7 @@ 0x7f0400f9 0x7f040138 0x7f0402e9 - 0x7f040387 + 0x7f040389 .end array-data :array_11 @@ -1599,7 +1599,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data :array_13 @@ -1701,7 +1701,7 @@ 0x7f0401ad 0x7f04024f 0x7f0402db - 0x7f0403a0 + 0x7f0403a2 .end array-data :array_1b @@ -1748,7 +1748,7 @@ 0x7f0402d4 0x7f0402fa 0x7f0402ff - 0x7f0403be + 0x7f0403c0 .end array-data :array_1f @@ -1780,12 +1780,12 @@ 0x7f040300 0x7f040301 0x7f040303 - 0x7f040388 - 0x7f040389 0x7f04038a - 0x7f0403a1 - 0x7f0403a2 + 0x7f04038b + 0x7f04038c 0x7f0403a3 + 0x7f0403a4 + 0x7f0403a5 .end array-data :array_22 @@ -1827,15 +1827,15 @@ 0x7f0402fb 0x7f0402fc 0x7f0402fd - 0x7f040390 0x7f040392 - 0x7f040393 0x7f040394 0x7f040395 0x7f040396 0x7f040397 0x7f040398 0x7f040399 + 0x7f04039a + 0x7f04039b .end array-data :array_24 diff --git a/com.discord/smali/com/discord/BuildConfig.smali b/com.discord/smali/com/discord/BuildConfig.smali index 6ff8a2f0b2..acb5bfe5fb 100644 --- a/com.discord/smali/com/discord/BuildConfig.smali +++ b/com.discord/smali/com/discord/BuildConfig.smali @@ -29,11 +29,11 @@ .field public static final LOCAL_VOICE:Ljava/lang/String; = "" -.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/823" +.field public static final USER_AGENT:Ljava/lang/String; = "Discord-Android/824" -.field public static final VERSION_CODE:I = 0x337 +.field public static final VERSION_CODE:I = 0x338 -.field public static final VERSION_NAME:Ljava/lang/String; = "8.2.3" +.field public static final VERSION_NAME:Ljava/lang/String; = "8.2.4" # direct methods diff --git a/com.discord/smali/com/discord/R$a.smali b/com.discord/smali/com/discord/R$a.smali index 01b2370a11..e9d6c1e860 100644 --- a/com.discord/smali/com/discord/R$a.smali +++ b/com.discord/smali/com/discord/R$a.smali @@ -2923,7 +2923,7 @@ new-array v0, v1, [I - const v1, 0x7f0403bf + const v1, 0x7f0403c1 aput v1, v0, v3 @@ -2980,8 +2980,8 @@ 0x7f0402a3 0x7f0402fb 0x7f0402fe - 0x7f040390 - 0x7f04039a + 0x7f040392 + 0x7f04039c .end array-data :array_1 @@ -2991,7 +2991,7 @@ 0x7f04009a 0x7f04013e 0x7f0402fe - 0x7f04039a + 0x7f04039c .end array-data :array_2 @@ -3064,16 +3064,16 @@ .array-data 4 0x1010119 0x7f0402ed - 0x7f04038e - 0x7f04038f + 0x7f040390 + 0x7f040391 .end array-data :array_b .array-data 4 0x1010142 - 0x7f04038b - 0x7f04038c 0x7f04038d + 0x7f04038e + 0x7f04038f .end array-data :array_c @@ -3210,13 +3210,11 @@ 0x7f040333 0x7f040336 0x7f040337 - 0x7f04039c - 0x7f04039d 0x7f04039e 0x7f04039f - 0x7f0403bd - 0x7f0403c0 - 0x7f0403c1 + 0x7f0403a0 + 0x7f0403a1 + 0x7f0403bf 0x7f0403c2 0x7f0403c3 0x7f0403c4 @@ -3225,14 +3223,16 @@ 0x7f0403c7 0x7f0403c8 0x7f0403c9 + 0x7f0403ca + 0x7f0403cb .end array-data :array_f .array-data 4 0x101014f - 0x7f0403a5 - 0x7f0403a6 0x7f0403a7 + 0x7f0403a8 + 0x7f0403a9 .end array-data :array_10 @@ -3407,9 +3407,9 @@ 0x7f0402d0 0x7f0402d2 0x7f0402f5 - 0x7f040390 - 0x7f040391 - 0x7f04039b + 0x7f040392 + 0x7f040393 + 0x7f04039d .end array-data :array_1b @@ -3618,7 +3618,7 @@ 0x7f0400f9 0x7f040138 0x7f0402e9 - 0x7f040387 + 0x7f040389 .end array-data :array_25 @@ -3671,7 +3671,7 @@ 0x7f040267 0x7f0402b2 0x7f0402e0 - 0x7f0403b8 + 0x7f0403ba .end array-data :array_29 @@ -3703,7 +3703,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data :array_2c @@ -3743,7 +3743,7 @@ 0x7f0402be 0x7f0402bf 0x7f0402c0 - 0x7f0403bc + 0x7f0403be .end array-data :array_2e @@ -3914,7 +3914,7 @@ 0x7f0401ad 0x7f04024f 0x7f0402db - 0x7f0403a0 + 0x7f0403a2 .end array-data :array_3a @@ -3992,7 +3992,7 @@ 0x7f0402d4 0x7f0402fa 0x7f0402ff - 0x7f0403be + 0x7f0403c0 .end array-data :array_40 @@ -4034,7 +4034,7 @@ 0x7f0402be 0x7f0402bf 0x7f0402c0 - 0x7f0403bc + 0x7f0403be .end array-data :array_42 @@ -4097,12 +4097,12 @@ 0x7f040300 0x7f040301 0x7f040303 - 0x7f040388 - 0x7f040389 0x7f04038a - 0x7f0403a1 - 0x7f0403a2 + 0x7f04038b + 0x7f04038c 0x7f0403a3 + 0x7f0403a4 + 0x7f0403a5 .end array-data :array_48 @@ -4225,21 +4225,21 @@ 0x7f0402fb 0x7f0402fc 0x7f0402fd - 0x7f040390 0x7f040392 - 0x7f040393 0x7f040394 0x7f040395 0x7f040396 0x7f040397 0x7f040398 0x7f040399 + 0x7f04039a + 0x7f04039b .end array-data :array_4f .array-data 4 - 0x7f0403ba - 0x7f0403bb + 0x7f0403bc + 0x7f0403bd .end array-data :array_50 @@ -4268,20 +4268,18 @@ :array_53 .array-data 4 0x7f040042 - 0x7f0403b9 + 0x7f0403bb .end array-data :array_54 .array-data 4 - 0x7f0403a8 - 0x7f0403a9 0x7f0403aa + 0x7f0403ab + 0x7f0403ac .end array-data :array_55 .array-data 4 - 0x7f0403ab - 0x7f0403ac 0x7f0403ad 0x7f0403ae 0x7f0403af @@ -4293,6 +4291,8 @@ 0x7f0403b5 0x7f0403b6 0x7f0403b7 + 0x7f0403b8 + 0x7f0403b9 .end array-data .end method diff --git a/com.discord/smali/com/discord/a/b.smali b/com.discord/smali/com/discord/a/b.smali index db4d763092..cf18d35269 100644 --- a/com.discord/smali/com/discord/a/b.smali +++ b/com.discord/smali/com/discord/a/b.smali @@ -226,7 +226,7 @@ move-result-object p1 - const v0, 0x7f12067e + const v0, 0x7f12067f invoke-virtual {p0, v0}, Lcom/discord/a/b;->getString(I)Ljava/lang/String; @@ -240,7 +240,7 @@ move-result-object p1 - const v0, 0x7f120662 + const v0, 0x7f120663 invoke-virtual {p0, v0}, Lcom/discord/a/b;->getString(I)Ljava/lang/String; @@ -260,7 +260,7 @@ if-eqz v0, :cond_0 - const v1, 0x7f120676 + const v1, 0x7f120677 invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence; @@ -302,7 +302,7 @@ move-result-object v0 - const v1, 0x7f12067e + const v1, 0x7f12067f invoke-virtual {p0, v1}, Lcom/discord/a/b;->getString(I)Ljava/lang/String; @@ -316,7 +316,7 @@ move-result-object v0 - const v1, 0x7f120672 + const v1, 0x7f120673 invoke-virtual {p0, v1}, Lcom/discord/a/b;->getString(I)Ljava/lang/String; @@ -358,7 +358,7 @@ if-eqz v1, :cond_0 - const v2, 0x7f120c16 + const v2, 0x7f120c17 invoke-virtual {v1, v2}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence; @@ -386,7 +386,7 @@ move-result-object p1 - const v0, 0x7f120665 + const v0, 0x7f120666 invoke-virtual {p0, v0}, Lcom/discord/a/b;->getString(I)Ljava/lang/String; @@ -406,7 +406,7 @@ if-eqz v0, :cond_2 - const v1, 0x7f120676 + const v1, 0x7f120677 invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence; @@ -613,7 +613,7 @@ return-object p1 :pswitch_2 - const v2, 0x7f120682 + const v2, 0x7f120683 new-array v3, v3, [Ljava/lang/Object; @@ -641,7 +641,7 @@ return-object p1 :pswitch_3 - const v2, 0x7f120681 + const v2, 0x7f120682 new-array v3, v3, [Ljava/lang/Object; @@ -703,7 +703,7 @@ if-eqz v2, :cond_0 - const v2, 0x7f120680 + const v2, 0x7f120681 new-array v5, v3, [Ljava/lang/Object; @@ -716,7 +716,7 @@ goto :goto_0 :cond_0 - const v2, 0x7f12067f + const v2, 0x7f120680 invoke-virtual {p0, v2}, Lcom/discord/a/b;->getString(I)Ljava/lang/String; @@ -733,7 +733,7 @@ if-eqz v5, :cond_1 - const p1, 0x7f12066d + const p1, 0x7f12066e new-array v0, v3, [Ljava/lang/Object; @@ -753,7 +753,7 @@ if-eqz p1, :cond_2 - const p1, 0x7f12066c + const p1, 0x7f12066d new-array v0, v3, [Ljava/lang/Object; @@ -762,7 +762,7 @@ goto :goto_1 :cond_2 - const p1, 0x7f12066b + const p1, 0x7f12066c new-array v1, v3, [Ljava/lang/Object; @@ -803,7 +803,7 @@ if-eqz v0, :cond_3 - const v1, 0x7f12067a + const v1, 0x7f12067b invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence; @@ -841,7 +841,7 @@ move-result-object p1 - const v0, 0x7f12067e + const v0, 0x7f12067f invoke-virtual {p0, v0}, Lcom/discord/a/b;->getString(I)Ljava/lang/String; @@ -855,7 +855,7 @@ move-result-object p1 - const v0, 0x7f12065f + const v0, 0x7f120660 invoke-virtual {p0, v0}, Lcom/discord/a/b;->getString(I)Ljava/lang/String; @@ -877,7 +877,7 @@ if-eqz v0, :cond_0 - const v1, 0x7f120676 + const v1, 0x7f120677 invoke-virtual {v0, v1}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence; @@ -933,7 +933,7 @@ if-eqz v1, :cond_0 - const v1, 0x7f12067d + const v1, 0x7f12067e new-array v4, v2, [Ljava/lang/Object; @@ -946,7 +946,7 @@ goto :goto_0 :cond_0 - const v1, 0x7f12067c + const v1, 0x7f12067d invoke-virtual {p0, v1}, Lcom/discord/a/b;->getString(I)Ljava/lang/String; @@ -963,7 +963,7 @@ if-eqz v4, :cond_1 - const v4, 0x7f120661 + const v4, 0x7f120662 const/4 v5, 0x2 @@ -984,7 +984,7 @@ goto :goto_1 :cond_1 - const v4, 0x7f120660 + const v4, 0x7f120661 new-array v2, v2, [Ljava/lang/Object; @@ -1025,7 +1025,7 @@ if-eqz v1, :cond_2 - const v2, 0x7f120674 + const v2, 0x7f120675 invoke-virtual {v1, v2}, Landroid/content/Context;->getText(I)Ljava/lang/CharSequence; @@ -1195,7 +1195,7 @@ if-eqz v1, :cond_0 - const v1, 0x7f12067d + const v1, 0x7f12067e new-array v4, v3, [Ljava/lang/Object; @@ -1208,7 +1208,7 @@ goto :goto_0 :cond_0 - const v1, 0x7f12067c + const v1, 0x7f12067d invoke-virtual {p0, v1}, Lcom/discord/a/b;->getString(I)Ljava/lang/String; @@ -1225,7 +1225,7 @@ if-eqz v4, :cond_1 - const v4, 0x7f120661 + const v4, 0x7f120662 const/4 v5, 0x2 @@ -1246,7 +1246,7 @@ goto :goto_1 :cond_1 - const p1, 0x7f120660 + const p1, 0x7f120661 new-array v3, v3, [Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/app/AppActivity.smali b/com.discord/smali/com/discord/app/AppActivity.smali index 6564da7e73..5cacd2726f 100644 --- a/com.discord/smali/com/discord/app/AppActivity.smali +++ b/com.discord/smali/com/discord/app/AppActivity.smali @@ -469,7 +469,7 @@ const/4 v1, 0x1 - const v2, 0x7f04036f + const v2, 0x7f040371 invoke-virtual {v0, v2, v1}, Lcom/discord/app/AppActivity$j;->b(IZ)Landroid/util/TypedValue; diff --git a/com.discord/smali/com/discord/app/AppFragment$b.smali b/com.discord/smali/com/discord/app/AppFragment$b.smali index 03064d2c1a..c931d165fe 100644 --- a/com.discord/smali/com/discord/app/AppFragment$b.smali +++ b/com.discord/smali/com/discord/app/AppFragment$b.smali @@ -83,7 +83,7 @@ iget-object v2, p0, Lcom/discord/app/AppFragment$b;->this$0:Lcom/discord/app/AppFragment; - const v3, 0x7f120448 + const v3, 0x7f120449 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 631114cc04..6ee332e273 100644 --- a/com.discord/smali/com/discord/app/AppFragment$c.smali +++ b/com.discord/smali/com/discord/app/AppFragment$c.smali @@ -71,7 +71,7 @@ aput-object p1, v2, v3 - const p1, 0x7f120ea1 + const p1, 0x7f120ea2 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/AppPermissions.smali b/com.discord/smali/com/discord/app/AppPermissions.smali index a73bcd6e82..1a504252a3 100644 --- a/com.discord/smali/com/discord/app/AppPermissions.smali +++ b/com.discord/smali/com/discord/app/AppPermissions.smali @@ -295,7 +295,7 @@ check-cast v2, Ljava/util/Collection; - invoke-static {v2}, Lkotlin/a/l;->i(Ljava/util/Collection;)[I + invoke-static {v2}, Lkotlin/a/l;->j(Ljava/util/Collection;)[I move-result-object v1 @@ -414,7 +414,7 @@ if-ne p1, v2, :cond_0 - const p1, 0x7f120b0f + const p1, 0x7f120b10 invoke-virtual {v0, p1}, Lcom/discord/app/AppPermissions$b;->u(I)Lkotlin/jvm/functions/Function0; @@ -427,7 +427,7 @@ if-ne p1, v2, :cond_1 - const p1, 0x7f120b0d + const p1, 0x7f120b0e invoke-virtual {v0, p1}, Lcom/discord/app/AppPermissions$b;->u(I)Lkotlin/jvm/functions/Function0; @@ -440,7 +440,7 @@ if-ne p1, v2, :cond_2 - const p1, 0x7f120b0e + const p1, 0x7f120b0f invoke-virtual {v0, p1}, Lcom/discord/app/AppPermissions$b;->u(I)Lkotlin/jvm/functions/Function0; diff --git a/com.discord/smali/com/discord/app/f.smali b/com.discord/smali/com/discord/app/f.smali index dd79b2693a..44d3af1d8a 100644 --- a/com.discord/smali/com/discord/app/f.smali +++ b/com.discord/smali/com/discord/app/f.smali @@ -251,7 +251,7 @@ .method public static synthetic c(Landroid/content/Context;Ljava/lang/CharSequence;)V .locals 1 - const v0, 0x7f1203a8 + const v0, 0x7f1203a9 invoke-static {p0, p1, v0}, Lcom/discord/app/f;->b(Landroid/content/Context;Ljava/lang/CharSequence;I)V @@ -275,7 +275,7 @@ .method public static final d(Landroid/content/Context;Ljava/lang/CharSequence;)V .locals 1 - const v0, 0x7f1203a8 + const v0, 0x7f1203a9 invoke-static {p0, p1, v0}, Lcom/discord/app/f;->b(Landroid/content/Context;Ljava/lang/CharSequence;I)V diff --git a/com.discord/smali/com/discord/chipsview/R$e.smali b/com.discord/smali/com/discord/chipsview/R$e.smali index ab0fbc62cb..07efb46fb9 100644 --- a/com.discord/smali/com/discord/chipsview/R$e.smali +++ b/com.discord/smali/com/discord/chipsview/R$e.smali @@ -1248,8 +1248,8 @@ 0x7f0402a3 0x7f0402fb 0x7f0402fe - 0x7f040390 - 0x7f04039a + 0x7f040392 + 0x7f04039c .end array-data :array_1 @@ -1259,7 +1259,7 @@ 0x7f04009a 0x7f04013e 0x7f0402fe - 0x7f04039a + 0x7f04039c .end array-data :array_2 @@ -1284,16 +1284,16 @@ .array-data 4 0x1010119 0x7f0402ed - 0x7f04038e - 0x7f04038f + 0x7f040390 + 0x7f040391 .end array-data :array_5 .array-data 4 0x1010142 - 0x7f04038b - 0x7f04038c 0x7f04038d + 0x7f04038e + 0x7f04038f .end array-data :array_6 @@ -1430,13 +1430,11 @@ 0x7f040333 0x7f040336 0x7f040337 - 0x7f04039c - 0x7f04039d 0x7f04039e 0x7f04039f - 0x7f0403bd - 0x7f0403c0 - 0x7f0403c1 + 0x7f0403a0 + 0x7f0403a1 + 0x7f0403bf 0x7f0403c2 0x7f0403c3 0x7f0403c4 @@ -1445,6 +1443,8 @@ 0x7f0403c7 0x7f0403c8 0x7f0403c9 + 0x7f0403ca + 0x7f0403cb .end array-data :array_9 @@ -1495,7 +1495,7 @@ 0x7f0400f9 0x7f040138 0x7f0402e9 - 0x7f040387 + 0x7f040389 .end array-data :array_d @@ -1528,7 +1528,7 @@ 0x7f0402be 0x7f0402bf 0x7f0402c0 - 0x7f0403bc + 0x7f0403be .end array-data :array_e @@ -1592,7 +1592,7 @@ 0x7f0401ad 0x7f04024f 0x7f0402db - 0x7f0403a0 + 0x7f0403a2 .end array-data :array_13 @@ -1633,7 +1633,7 @@ 0x7f0402d4 0x7f0402fa 0x7f0402ff - 0x7f0403be + 0x7f0403c0 .end array-data :array_16 @@ -1668,7 +1668,7 @@ 0x7f0402be 0x7f0402bf 0x7f0402c0 - 0x7f0403bc + 0x7f0403be .end array-data :array_17 @@ -1690,12 +1690,12 @@ 0x7f040300 0x7f040301 0x7f040303 - 0x7f040388 - 0x7f040389 0x7f04038a - 0x7f0403a1 - 0x7f0403a2 + 0x7f04038b + 0x7f04038c 0x7f0403a3 + 0x7f0403a4 + 0x7f0403a5 .end array-data :array_19 @@ -1737,15 +1737,15 @@ 0x7f0402fb 0x7f0402fc 0x7f0402fd - 0x7f040390 0x7f040392 - 0x7f040393 0x7f040394 0x7f040395 0x7f040396 0x7f040397 0x7f040398 0x7f040399 + 0x7f04039a + 0x7f04039b .end array-data :array_1b diff --git a/com.discord/smali/com/discord/gateway/GatewaySocket$presenceUpdate$1.smali b/com.discord/smali/com/discord/gateway/GatewaySocket$presenceUpdate$1.smali index 88af16691d..bbf5c9d769 100644 --- a/com.discord/smali/com/discord/gateway/GatewaySocket$presenceUpdate$1.smali +++ b/com.discord/smali/com/discord/gateway/GatewaySocket$presenceUpdate$1.smali @@ -71,7 +71,7 @@ .end method .method public final invoke()V - .locals 12 + .locals 8 sget-object v0, Lcom/discord/gateway/GatewaySocket;->Companion:Lcom/discord/gateway/GatewaySocket$Companion; @@ -127,43 +127,53 @@ invoke-static/range {v0 .. v5}, Lcom/discord/gateway/GatewaySocket$Companion;->log$default(Lcom/discord/gateway/GatewaySocket$Companion;Lcom/discord/utilities/logging/Logger;Ljava/lang/String;ZILjava/lang/Object;)V - iget-object v6, p0, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;->this$0:Lcom/discord/gateway/GatewaySocket; + iget-object v0, p0, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;->$activity:Lcom/discord/models/domain/ModelPresence$Activity; - new-instance v7, Lcom/discord/gateway/io/Outgoing; + if-eqz v0, :cond_1 - const/4 v0, 0x3 + invoke-static {v0}, Lkotlin/a/l;->by(Ljava/lang/Object;)Ljava/util/List; - new-instance v1, Lcom/discord/gateway/io/OutgoingPayload$PresenceUpdate; + move-result-object v0 - iget-object v2, p0, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;->$status:Ljava/lang/Integer; + if-nez v0, :cond_2 - invoke-static {v2}, Lcom/discord/models/domain/ModelPresence;->getStatusString(Ljava/lang/Integer;)Ljava/lang/String; + :cond_1 + sget-object v0, Lkotlin/a/x;->bPC:Lkotlin/a/x; - move-result-object v2 + check-cast v0, Ljava/util/List; - iget-object v3, p0, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;->$since:Ljava/lang/Long; + :cond_2 + iget-object v1, p0, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;->this$0:Lcom/discord/gateway/GatewaySocket; - iget-object v4, p0, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;->$activity:Lcom/discord/models/domain/ModelPresence$Activity; + new-instance v2, Lcom/discord/gateway/io/Outgoing; - invoke-static {v4}, Lkotlin/a/l;->by(Ljava/lang/Object;)Ljava/util/List; + const/4 v3, 0x3 - move-result-object v4 + new-instance v4, Lcom/discord/gateway/io/OutgoingPayload$PresenceUpdate; - iget-object v5, p0, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;->$afk:Ljava/lang/Boolean; + iget-object v5, p0, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;->$status:Ljava/lang/Integer; - invoke-direct {v1, v2, v3, v4, v5}, Lcom/discord/gateway/io/OutgoingPayload$PresenceUpdate;->(Ljava/lang/String;Ljava/lang/Long;Ljava/util/List;Ljava/lang/Boolean;)V + invoke-static {v5}, Lcom/discord/models/domain/ModelPresence;->getStatusString(Ljava/lang/Integer;)Ljava/lang/String; - invoke-direct {v7, v0, v1}, Lcom/discord/gateway/io/Outgoing;->(ILjava/lang/Object;)V + move-result-object v5 - const/4 v8, 0x0 + iget-object v6, p0, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;->$since:Ljava/lang/Long; - const/4 v9, 0x0 + iget-object v7, p0, Lcom/discord/gateway/GatewaySocket$presenceUpdate$1;->$afk:Ljava/lang/Boolean; - const/4 v10, 0x6 + invoke-direct {v4, v5, v6, v0, v7}, Lcom/discord/gateway/io/OutgoingPayload$PresenceUpdate;->(Ljava/lang/String;Ljava/lang/Long;Ljava/util/List;Ljava/lang/Boolean;)V - const/4 v11, 0x0 + invoke-direct {v2, v3, v4}, Lcom/discord/gateway/io/Outgoing;->(ILjava/lang/Object;)V - invoke-static/range {v6 .. v11}, Lcom/discord/gateway/GatewaySocket;->send$default(Lcom/discord/gateway/GatewaySocket;Lcom/discord/gateway/io/Outgoing;ZLcom/google/gson/Gson;ILjava/lang/Object;)V + const/4 v3, 0x0 + + const/4 v4, 0x0 + + const/4 v5, 0x6 + + const/4 v6, 0x0 + + invoke-static/range {v1 .. v6}, Lcom/discord/gateway/GatewaySocket;->send$default(Lcom/discord/gateway/GatewaySocket;Lcom/discord/gateway/io/Outgoing;ZLcom/google/gson/Gson;ILjava/lang/Object;)V return-void .end method diff --git a/com.discord/smali/com/discord/gateway/R$attr.smali b/com.discord/smali/com/discord/gateway/R$attr.smali index 43ec4b4d73..be049b8a50 100644 --- a/com.discord/smali/com/discord/gateway/R$attr.smali +++ b/com.discord/smali/com/discord/gateway/R$attr.smali @@ -1000,93 +1000,93 @@ .field public static final theme:I = 0x7f04033b -.field public static final thickness:I = 0x7f040387 +.field public static final thickness:I = 0x7f040389 -.field public static final thumbTextPadding:I = 0x7f040388 +.field public static final thumbTextPadding:I = 0x7f04038a -.field public static final thumbTint:I = 0x7f040389 +.field public static final thumbTint:I = 0x7f04038b -.field public static final thumbTintMode:I = 0x7f04038a +.field public static final thumbTintMode:I = 0x7f04038c -.field public static final tickMark:I = 0x7f04038b +.field public static final tickMark:I = 0x7f04038d -.field public static final tickMarkTint:I = 0x7f04038c +.field public static final tickMarkTint:I = 0x7f04038e -.field public static final tickMarkTintMode:I = 0x7f04038d +.field public static final tickMarkTintMode:I = 0x7f04038f -.field public static final tint:I = 0x7f04038e +.field public static final tint:I = 0x7f040390 -.field public static final tintMode:I = 0x7f04038f +.field public static final tintMode:I = 0x7f040391 -.field public static final title:I = 0x7f040390 +.field public static final title:I = 0x7f040392 -.field public static final titleEnabled:I = 0x7f040391 +.field public static final titleEnabled:I = 0x7f040393 -.field public static final titleMargin:I = 0x7f040392 +.field public static final titleMargin:I = 0x7f040394 -.field public static final titleMarginBottom:I = 0x7f040393 +.field public static final titleMarginBottom:I = 0x7f040395 -.field public static final titleMarginEnd:I = 0x7f040394 +.field public static final titleMarginEnd:I = 0x7f040396 -.field public static final titleMarginStart:I = 0x7f040395 +.field public static final titleMarginStart:I = 0x7f040397 -.field public static final titleMarginTop:I = 0x7f040396 +.field public static final titleMarginTop:I = 0x7f040398 -.field public static final titleMargins:I = 0x7f040397 +.field public static final titleMargins:I = 0x7f040399 -.field public static final titleTextAppearance:I = 0x7f040398 +.field public static final titleTextAppearance:I = 0x7f04039a -.field public static final titleTextColor:I = 0x7f040399 +.field public static final titleTextColor:I = 0x7f04039b -.field public static final titleTextStyle:I = 0x7f04039a +.field public static final titleTextStyle:I = 0x7f04039c -.field public static final toolbarId:I = 0x7f04039b +.field public static final toolbarId:I = 0x7f04039d -.field public static final toolbarNavigationButtonStyle:I = 0x7f04039c +.field public static final toolbarNavigationButtonStyle:I = 0x7f04039e -.field public static final toolbarStyle:I = 0x7f04039d +.field public static final toolbarStyle:I = 0x7f04039f -.field public static final tooltipForegroundColor:I = 0x7f04039e +.field public static final tooltipForegroundColor:I = 0x7f0403a0 -.field public static final tooltipFrameBackground:I = 0x7f04039f +.field public static final tooltipFrameBackground:I = 0x7f0403a1 -.field public static final tooltipText:I = 0x7f0403a0 +.field public static final tooltipText:I = 0x7f0403a2 -.field public static final track:I = 0x7f0403a1 +.field public static final track:I = 0x7f0403a3 -.field public static final trackTint:I = 0x7f0403a2 +.field public static final trackTint:I = 0x7f0403a4 -.field public static final trackTintMode:I = 0x7f0403a3 +.field public static final trackTintMode:I = 0x7f0403a5 -.field public static final ttcIndex:I = 0x7f0403a4 +.field public static final ttcIndex:I = 0x7f0403a6 -.field public static final useCompatPadding:I = 0x7f0403b8 +.field public static final useCompatPadding:I = 0x7f0403ba -.field public static final viewAspectRatio:I = 0x7f0403bc +.field public static final viewAspectRatio:I = 0x7f0403be -.field public static final viewInflaterClass:I = 0x7f0403bd +.field public static final viewInflaterClass:I = 0x7f0403bf -.field public static final voiceIcon:I = 0x7f0403be +.field public static final voiceIcon:I = 0x7f0403c0 -.field public static final windowActionBar:I = 0x7f0403c0 +.field public static final windowActionBar:I = 0x7f0403c2 -.field public static final windowActionBarOverlay:I = 0x7f0403c1 +.field public static final windowActionBarOverlay:I = 0x7f0403c3 -.field public static final windowActionModeOverlay:I = 0x7f0403c2 +.field public static final windowActionModeOverlay:I = 0x7f0403c4 -.field public static final windowFixedHeightMajor:I = 0x7f0403c3 +.field public static final windowFixedHeightMajor:I = 0x7f0403c5 -.field public static final windowFixedHeightMinor:I = 0x7f0403c4 +.field public static final windowFixedHeightMinor:I = 0x7f0403c6 -.field public static final windowFixedWidthMajor:I = 0x7f0403c5 +.field public static final windowFixedWidthMajor:I = 0x7f0403c7 -.field public static final windowFixedWidthMinor:I = 0x7f0403c6 +.field public static final windowFixedWidthMinor:I = 0x7f0403c8 -.field public static final windowMinWidthMajor:I = 0x7f0403c7 +.field public static final windowMinWidthMajor:I = 0x7f0403c9 -.field public static final windowMinWidthMinor:I = 0x7f0403c8 +.field public static final windowMinWidthMinor:I = 0x7f0403ca -.field public static final windowNoTitle:I = 0x7f0403c9 +.field public static final windowNoTitle:I = 0x7f0403cb # 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 4d3404482a..256a68c92e 100644 --- a/com.discord/smali/com/discord/gateway/R$string.smali +++ b/com.discord/smali/com/discord/gateway/R$string.smali @@ -96,69 +96,69 @@ .field public static final appbar_scrolling_view_behavior:I = 0x7f12009a -.field public static final bottom_sheet_behavior:I = 0x7f1202a7 +.field public static final bottom_sheet_behavior:I = 0x7f1202a8 -.field public static final character_counter_content_description:I = 0x7f12031f +.field public static final character_counter_content_description:I = 0x7f120320 -.field public static final character_counter_pattern:I = 0x7f120320 +.field public static final character_counter_pattern:I = 0x7f120321 -.field public static final common_google_play_services_enable_button:I = 0x7f12035a +.field public static final common_google_play_services_enable_button:I = 0x7f12035b -.field public static final common_google_play_services_enable_text:I = 0x7f12035b +.field public static final common_google_play_services_enable_text:I = 0x7f12035c -.field public static final common_google_play_services_enable_title:I = 0x7f12035c +.field public static final common_google_play_services_enable_title:I = 0x7f12035d -.field public static final common_google_play_services_install_button:I = 0x7f12035d +.field public static final common_google_play_services_install_button:I = 0x7f12035e -.field public static final common_google_play_services_install_text:I = 0x7f12035e +.field public static final common_google_play_services_install_text:I = 0x7f12035f -.field public static final common_google_play_services_install_title:I = 0x7f12035f +.field public static final common_google_play_services_install_title:I = 0x7f120360 -.field public static final common_google_play_services_notification_channel_name:I = 0x7f120360 +.field public static final common_google_play_services_notification_channel_name:I = 0x7f120361 -.field public static final common_google_play_services_notification_ticker:I = 0x7f120361 +.field public static final common_google_play_services_notification_ticker:I = 0x7f120362 -.field public static final common_google_play_services_unknown_issue:I = 0x7f120362 +.field public static final common_google_play_services_unknown_issue:I = 0x7f120363 -.field public static final common_google_play_services_unsupported_text:I = 0x7f120363 +.field public static final common_google_play_services_unsupported_text:I = 0x7f120364 -.field public static final common_google_play_services_update_button:I = 0x7f120364 +.field public static final common_google_play_services_update_button:I = 0x7f120365 -.field public static final common_google_play_services_update_text:I = 0x7f120365 +.field public static final common_google_play_services_update_text:I = 0x7f120366 -.field public static final common_google_play_services_update_title:I = 0x7f120366 +.field public static final common_google_play_services_update_title:I = 0x7f120367 -.field public static final common_google_play_services_updating_text:I = 0x7f120367 +.field public static final common_google_play_services_updating_text:I = 0x7f120368 -.field public static final common_google_play_services_wear_update_text:I = 0x7f120368 +.field public static final common_google_play_services_wear_update_text:I = 0x7f120369 -.field public static final common_open_on_phone:I = 0x7f120369 +.field public static final common_open_on_phone:I = 0x7f12036a -.field public static final common_signin_button_text:I = 0x7f12036a +.field public static final common_signin_button_text:I = 0x7f12036b -.field public static final common_signin_button_text_long:I = 0x7f12036b +.field public static final common_signin_button_text_long:I = 0x7f12036c -.field public static final fab_transformation_scrim_behavior:I = 0x7f1204c7 +.field public static final fab_transformation_scrim_behavior:I = 0x7f1204c8 -.field public static final fab_transformation_sheet_behavior:I = 0x7f1204c8 +.field public static final fab_transformation_sheet_behavior:I = 0x7f1204c9 -.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120791 +.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120792 -.field public static final mtrl_chip_close_icon_content_description:I = 0x7f1209ab +.field public static final mtrl_chip_close_icon_content_description:I = 0x7f1209ac -.field public static final password_toggle_content_description:I = 0x7f120ad6 +.field public static final password_toggle_content_description:I = 0x7f120ad7 -.field public static final path_password_eye:I = 0x7f120ad9 +.field public static final path_password_eye:I = 0x7f120ada -.field public static final path_password_eye_mask_strike_through:I = 0x7f120ada +.field public static final path_password_eye_mask_strike_through:I = 0x7f120adb -.field public static final path_password_eye_mask_visible:I = 0x7f120adb +.field public static final path_password_eye_mask_visible:I = 0x7f120adc -.field public static final path_password_strike_through:I = 0x7f120adc +.field public static final path_password_strike_through:I = 0x7f120add -.field public static final search_menu_title:I = 0x7f120cbe +.field public static final search_menu_title:I = 0x7f120cbf -.field public static final status_bar_notification_info_overflow:I = 0x7f120d6d +.field public static final status_bar_notification_info_overflow:I = 0x7f120d6e # direct methods diff --git a/com.discord/smali/com/discord/gateway/R$styleable.smali b/com.discord/smali/com/discord/gateway/R$styleable.smali index f2d45fc14f..8400575543 100644 --- a/com.discord/smali/com/discord/gateway/R$styleable.smali +++ b/com.discord/smali/com/discord/gateway/R$styleable.smali @@ -2306,8 +2306,8 @@ 0x7f0402a3 0x7f0402fb 0x7f0402fe - 0x7f040390 - 0x7f04039a + 0x7f040392 + 0x7f04039c .end array-data :array_1 @@ -2317,7 +2317,7 @@ 0x7f04009a 0x7f04013e 0x7f0402fe - 0x7f04039a + 0x7f04039c .end array-data :array_2 @@ -2390,16 +2390,16 @@ .array-data 4 0x1010119 0x7f0402ed - 0x7f04038e - 0x7f04038f + 0x7f040390 + 0x7f040391 .end array-data :array_b .array-data 4 0x1010142 - 0x7f04038b - 0x7f04038c 0x7f04038d + 0x7f04038e + 0x7f04038f .end array-data :array_c @@ -2536,13 +2536,11 @@ 0x7f040333 0x7f040336 0x7f040337 - 0x7f04039c - 0x7f04039d 0x7f04039e 0x7f04039f - 0x7f0403bd - 0x7f0403c0 - 0x7f0403c1 + 0x7f0403a0 + 0x7f0403a1 + 0x7f0403bf 0x7f0403c2 0x7f0403c3 0x7f0403c4 @@ -2551,6 +2549,8 @@ 0x7f0403c7 0x7f0403c8 0x7f0403c9 + 0x7f0403ca + 0x7f0403cb .end array-data :array_f @@ -2665,9 +2665,9 @@ 0x7f0402d0 0x7f0402d2 0x7f0402f5 - 0x7f040390 - 0x7f040391 - 0x7f04039b + 0x7f040392 + 0x7f040393 + 0x7f04039d .end array-data :array_16 @@ -2722,7 +2722,7 @@ 0x7f0400f9 0x7f040138 0x7f0402e9 - 0x7f040387 + 0x7f040389 .end array-data :array_1d @@ -2768,7 +2768,7 @@ 0x7f040267 0x7f0402b2 0x7f0402e0 - 0x7f0403b8 + 0x7f0403ba .end array-data :array_20 @@ -2800,7 +2800,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data :array_23 @@ -2840,7 +2840,7 @@ 0x7f0402be 0x7f0402bf 0x7f0402c0 - 0x7f0403bc + 0x7f0403be .end array-data :array_25 @@ -2995,7 +2995,7 @@ 0x7f0401ad 0x7f04024f 0x7f0402db - 0x7f0403a0 + 0x7f0403a2 .end array-data :array_30 @@ -3073,7 +3073,7 @@ 0x7f0402d4 0x7f0402fa 0x7f0402ff - 0x7f0403be + 0x7f0403c0 .end array-data :array_36 @@ -3115,7 +3115,7 @@ 0x7f0402be 0x7f0402bf 0x7f0402c0 - 0x7f0403bc + 0x7f0403be .end array-data :array_38 @@ -3160,12 +3160,12 @@ 0x7f040300 0x7f040301 0x7f040303 - 0x7f040388 - 0x7f040389 0x7f04038a - 0x7f0403a1 - 0x7f0403a2 + 0x7f04038b + 0x7f04038c 0x7f0403a3 + 0x7f0403a4 + 0x7f0403a5 .end array-data :array_3d @@ -3282,15 +3282,15 @@ 0x7f0402fb 0x7f0402fc 0x7f0402fd - 0x7f040390 0x7f040392 - 0x7f040393 0x7f040394 0x7f040395 0x7f040396 0x7f040397 0x7f040398 0x7f040399 + 0x7f04039a + 0x7f04039b .end array-data :array_43 diff --git a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$PresenceUpdate.smali b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$PresenceUpdate.smali index 8a59b97d4e..271ee8145e 100644 --- a/com.discord/smali/com/discord/gateway/io/OutgoingPayload$PresenceUpdate.smali +++ b/com.discord/smali/com/discord/gateway/io/OutgoingPayload$PresenceUpdate.smali @@ -48,6 +48,10 @@ } .end annotation + const-string v0, "activities" + + invoke-static {p3, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V + const/4 v0, 0x0 invoke-direct {p0, v0}, Lcom/discord/gateway/io/OutgoingPayload;->(Lkotlin/jvm/internal/DefaultConstructorMarker;)V @@ -83,7 +87,9 @@ if-eqz p6, :cond_1 - const/4 p3, 0x0 + sget-object p3, Lkotlin/a/x;->bPC:Lkotlin/a/x; + + check-cast p3, Ljava/util/List; :cond_1 and-int/lit8 p5, p5, 0x8 diff --git a/com.discord/smali/com/discord/restapi/R$attr.smali b/com.discord/smali/com/discord/restapi/R$attr.smali index 7b549deb8b..bf2bf549b6 100644 --- a/com.discord/smali/com/discord/restapi/R$attr.smali +++ b/com.discord/smali/com/discord/restapi/R$attr.smali @@ -1000,93 +1000,93 @@ .field public static final theme:I = 0x7f04033b -.field public static final thickness:I = 0x7f040387 +.field public static final thickness:I = 0x7f040389 -.field public static final thumbTextPadding:I = 0x7f040388 +.field public static final thumbTextPadding:I = 0x7f04038a -.field public static final thumbTint:I = 0x7f040389 +.field public static final thumbTint:I = 0x7f04038b -.field public static final thumbTintMode:I = 0x7f04038a +.field public static final thumbTintMode:I = 0x7f04038c -.field public static final tickMark:I = 0x7f04038b +.field public static final tickMark:I = 0x7f04038d -.field public static final tickMarkTint:I = 0x7f04038c +.field public static final tickMarkTint:I = 0x7f04038e -.field public static final tickMarkTintMode:I = 0x7f04038d +.field public static final tickMarkTintMode:I = 0x7f04038f -.field public static final tint:I = 0x7f04038e +.field public static final tint:I = 0x7f040390 -.field public static final tintMode:I = 0x7f04038f +.field public static final tintMode:I = 0x7f040391 -.field public static final title:I = 0x7f040390 +.field public static final title:I = 0x7f040392 -.field public static final titleEnabled:I = 0x7f040391 +.field public static final titleEnabled:I = 0x7f040393 -.field public static final titleMargin:I = 0x7f040392 +.field public static final titleMargin:I = 0x7f040394 -.field public static final titleMarginBottom:I = 0x7f040393 +.field public static final titleMarginBottom:I = 0x7f040395 -.field public static final titleMarginEnd:I = 0x7f040394 +.field public static final titleMarginEnd:I = 0x7f040396 -.field public static final titleMarginStart:I = 0x7f040395 +.field public static final titleMarginStart:I = 0x7f040397 -.field public static final titleMarginTop:I = 0x7f040396 +.field public static final titleMarginTop:I = 0x7f040398 -.field public static final titleMargins:I = 0x7f040397 +.field public static final titleMargins:I = 0x7f040399 -.field public static final titleTextAppearance:I = 0x7f040398 +.field public static final titleTextAppearance:I = 0x7f04039a -.field public static final titleTextColor:I = 0x7f040399 +.field public static final titleTextColor:I = 0x7f04039b -.field public static final titleTextStyle:I = 0x7f04039a +.field public static final titleTextStyle:I = 0x7f04039c -.field public static final toolbarId:I = 0x7f04039b +.field public static final toolbarId:I = 0x7f04039d -.field public static final toolbarNavigationButtonStyle:I = 0x7f04039c +.field public static final toolbarNavigationButtonStyle:I = 0x7f04039e -.field public static final toolbarStyle:I = 0x7f04039d +.field public static final toolbarStyle:I = 0x7f04039f -.field public static final tooltipForegroundColor:I = 0x7f04039e +.field public static final tooltipForegroundColor:I = 0x7f0403a0 -.field public static final tooltipFrameBackground:I = 0x7f04039f +.field public static final tooltipFrameBackground:I = 0x7f0403a1 -.field public static final tooltipText:I = 0x7f0403a0 +.field public static final tooltipText:I = 0x7f0403a2 -.field public static final track:I = 0x7f0403a1 +.field public static final track:I = 0x7f0403a3 -.field public static final trackTint:I = 0x7f0403a2 +.field public static final trackTint:I = 0x7f0403a4 -.field public static final trackTintMode:I = 0x7f0403a3 +.field public static final trackTintMode:I = 0x7f0403a5 -.field public static final ttcIndex:I = 0x7f0403a4 +.field public static final ttcIndex:I = 0x7f0403a6 -.field public static final useCompatPadding:I = 0x7f0403b8 +.field public static final useCompatPadding:I = 0x7f0403ba -.field public static final viewAspectRatio:I = 0x7f0403bc +.field public static final viewAspectRatio:I = 0x7f0403be -.field public static final viewInflaterClass:I = 0x7f0403bd +.field public static final viewInflaterClass:I = 0x7f0403bf -.field public static final voiceIcon:I = 0x7f0403be +.field public static final voiceIcon:I = 0x7f0403c0 -.field public static final windowActionBar:I = 0x7f0403c0 +.field public static final windowActionBar:I = 0x7f0403c2 -.field public static final windowActionBarOverlay:I = 0x7f0403c1 +.field public static final windowActionBarOverlay:I = 0x7f0403c3 -.field public static final windowActionModeOverlay:I = 0x7f0403c2 +.field public static final windowActionModeOverlay:I = 0x7f0403c4 -.field public static final windowFixedHeightMajor:I = 0x7f0403c3 +.field public static final windowFixedHeightMajor:I = 0x7f0403c5 -.field public static final windowFixedHeightMinor:I = 0x7f0403c4 +.field public static final windowFixedHeightMinor:I = 0x7f0403c6 -.field public static final windowFixedWidthMajor:I = 0x7f0403c5 +.field public static final windowFixedWidthMajor:I = 0x7f0403c7 -.field public static final windowFixedWidthMinor:I = 0x7f0403c6 +.field public static final windowFixedWidthMinor:I = 0x7f0403c8 -.field public static final windowMinWidthMajor:I = 0x7f0403c7 +.field public static final windowMinWidthMajor:I = 0x7f0403c9 -.field public static final windowMinWidthMinor:I = 0x7f0403c8 +.field public static final windowMinWidthMinor:I = 0x7f0403ca -.field public static final windowNoTitle:I = 0x7f0403c9 +.field public static final windowNoTitle:I = 0x7f0403cb # 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 cba37cb9cb..6deacab505 100644 --- a/com.discord/smali/com/discord/restapi/R$string.smali +++ b/com.discord/smali/com/discord/restapi/R$string.smali @@ -94,69 +94,69 @@ .field public static final appbar_scrolling_view_behavior:I = 0x7f12009a -.field public static final bottom_sheet_behavior:I = 0x7f1202a7 +.field public static final bottom_sheet_behavior:I = 0x7f1202a8 -.field public static final character_counter_content_description:I = 0x7f12031f +.field public static final character_counter_content_description:I = 0x7f120320 -.field public static final character_counter_pattern:I = 0x7f120320 +.field public static final character_counter_pattern:I = 0x7f120321 -.field public static final common_google_play_services_enable_button:I = 0x7f12035a +.field public static final common_google_play_services_enable_button:I = 0x7f12035b -.field public static final common_google_play_services_enable_text:I = 0x7f12035b +.field public static final common_google_play_services_enable_text:I = 0x7f12035c -.field public static final common_google_play_services_enable_title:I = 0x7f12035c +.field public static final common_google_play_services_enable_title:I = 0x7f12035d -.field public static final common_google_play_services_install_button:I = 0x7f12035d +.field public static final common_google_play_services_install_button:I = 0x7f12035e -.field public static final common_google_play_services_install_text:I = 0x7f12035e +.field public static final common_google_play_services_install_text:I = 0x7f12035f -.field public static final common_google_play_services_install_title:I = 0x7f12035f +.field public static final common_google_play_services_install_title:I = 0x7f120360 -.field public static final common_google_play_services_notification_channel_name:I = 0x7f120360 +.field public static final common_google_play_services_notification_channel_name:I = 0x7f120361 -.field public static final common_google_play_services_notification_ticker:I = 0x7f120361 +.field public static final common_google_play_services_notification_ticker:I = 0x7f120362 -.field public static final common_google_play_services_unknown_issue:I = 0x7f120362 +.field public static final common_google_play_services_unknown_issue:I = 0x7f120363 -.field public static final common_google_play_services_unsupported_text:I = 0x7f120363 +.field public static final common_google_play_services_unsupported_text:I = 0x7f120364 -.field public static final common_google_play_services_update_button:I = 0x7f120364 +.field public static final common_google_play_services_update_button:I = 0x7f120365 -.field public static final common_google_play_services_update_text:I = 0x7f120365 +.field public static final common_google_play_services_update_text:I = 0x7f120366 -.field public static final common_google_play_services_update_title:I = 0x7f120366 +.field public static final common_google_play_services_update_title:I = 0x7f120367 -.field public static final common_google_play_services_updating_text:I = 0x7f120367 +.field public static final common_google_play_services_updating_text:I = 0x7f120368 -.field public static final common_google_play_services_wear_update_text:I = 0x7f120368 +.field public static final common_google_play_services_wear_update_text:I = 0x7f120369 -.field public static final common_open_on_phone:I = 0x7f120369 +.field public static final common_open_on_phone:I = 0x7f12036a -.field public static final common_signin_button_text:I = 0x7f12036a +.field public static final common_signin_button_text:I = 0x7f12036b -.field public static final common_signin_button_text_long:I = 0x7f12036b +.field public static final common_signin_button_text_long:I = 0x7f12036c -.field public static final fab_transformation_scrim_behavior:I = 0x7f1204c7 +.field public static final fab_transformation_scrim_behavior:I = 0x7f1204c8 -.field public static final fab_transformation_sheet_behavior:I = 0x7f1204c8 +.field public static final fab_transformation_sheet_behavior:I = 0x7f1204c9 -.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120791 +.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120792 -.field public static final mtrl_chip_close_icon_content_description:I = 0x7f1209ab +.field public static final mtrl_chip_close_icon_content_description:I = 0x7f1209ac -.field public static final password_toggle_content_description:I = 0x7f120ad6 +.field public static final password_toggle_content_description:I = 0x7f120ad7 -.field public static final path_password_eye:I = 0x7f120ad9 +.field public static final path_password_eye:I = 0x7f120ada -.field public static final path_password_eye_mask_strike_through:I = 0x7f120ada +.field public static final path_password_eye_mask_strike_through:I = 0x7f120adb -.field public static final path_password_eye_mask_visible:I = 0x7f120adb +.field public static final path_password_eye_mask_visible:I = 0x7f120adc -.field public static final path_password_strike_through:I = 0x7f120adc +.field public static final path_password_strike_through:I = 0x7f120add -.field public static final search_menu_title:I = 0x7f120cbe +.field public static final search_menu_title:I = 0x7f120cbf -.field public static final status_bar_notification_info_overflow:I = 0x7f120d6d +.field public static final status_bar_notification_info_overflow:I = 0x7f120d6e # direct methods diff --git a/com.discord/smali/com/discord/restapi/R$styleable.smali b/com.discord/smali/com/discord/restapi/R$styleable.smali index 29b20eea48..4f8cf3b59f 100644 --- a/com.discord/smali/com/discord/restapi/R$styleable.smali +++ b/com.discord/smali/com/discord/restapi/R$styleable.smali @@ -2306,8 +2306,8 @@ 0x7f0402a3 0x7f0402fb 0x7f0402fe - 0x7f040390 - 0x7f04039a + 0x7f040392 + 0x7f04039c .end array-data :array_1 @@ -2317,7 +2317,7 @@ 0x7f04009a 0x7f04013e 0x7f0402fe - 0x7f04039a + 0x7f04039c .end array-data :array_2 @@ -2390,16 +2390,16 @@ .array-data 4 0x1010119 0x7f0402ed - 0x7f04038e - 0x7f04038f + 0x7f040390 + 0x7f040391 .end array-data :array_b .array-data 4 0x1010142 - 0x7f04038b - 0x7f04038c 0x7f04038d + 0x7f04038e + 0x7f04038f .end array-data :array_c @@ -2536,13 +2536,11 @@ 0x7f040333 0x7f040336 0x7f040337 - 0x7f04039c - 0x7f04039d 0x7f04039e 0x7f04039f - 0x7f0403bd - 0x7f0403c0 - 0x7f0403c1 + 0x7f0403a0 + 0x7f0403a1 + 0x7f0403bf 0x7f0403c2 0x7f0403c3 0x7f0403c4 @@ -2551,6 +2549,8 @@ 0x7f0403c7 0x7f0403c8 0x7f0403c9 + 0x7f0403ca + 0x7f0403cb .end array-data :array_f @@ -2665,9 +2665,9 @@ 0x7f0402d0 0x7f0402d2 0x7f0402f5 - 0x7f040390 - 0x7f040391 - 0x7f04039b + 0x7f040392 + 0x7f040393 + 0x7f04039d .end array-data :array_16 @@ -2722,7 +2722,7 @@ 0x7f0400f9 0x7f040138 0x7f0402e9 - 0x7f040387 + 0x7f040389 .end array-data :array_1d @@ -2768,7 +2768,7 @@ 0x7f040267 0x7f0402b2 0x7f0402e0 - 0x7f0403b8 + 0x7f0403ba .end array-data :array_20 @@ -2800,7 +2800,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data :array_23 @@ -2840,7 +2840,7 @@ 0x7f0402be 0x7f0402bf 0x7f0402c0 - 0x7f0403bc + 0x7f0403be .end array-data :array_25 @@ -2995,7 +2995,7 @@ 0x7f0401ad 0x7f04024f 0x7f0402db - 0x7f0403a0 + 0x7f0403a2 .end array-data :array_30 @@ -3073,7 +3073,7 @@ 0x7f0402d4 0x7f0402fa 0x7f0402ff - 0x7f0403be + 0x7f0403c0 .end array-data :array_36 @@ -3115,7 +3115,7 @@ 0x7f0402be 0x7f0402bf 0x7f0402c0 - 0x7f0403bc + 0x7f0403be .end array-data :array_38 @@ -3160,12 +3160,12 @@ 0x7f040300 0x7f040301 0x7f040303 - 0x7f040388 - 0x7f040389 0x7f04038a - 0x7f0403a1 - 0x7f0403a2 + 0x7f04038b + 0x7f04038c 0x7f0403a3 + 0x7f0403a4 + 0x7f0403a5 .end array-data :array_3d @@ -3282,15 +3282,15 @@ 0x7f0402fb 0x7f0402fc 0x7f0402fd - 0x7f040390 0x7f040392 - 0x7f040393 0x7f040394 0x7f040395 0x7f040396 0x7f040397 0x7f040398 0x7f040399 + 0x7f04039a + 0x7f04039b .end array-data :array_43 diff --git a/com.discord/smali/com/discord/rtcconnection/RtcConnection.smali b/com.discord/smali/com/discord/rtcconnection/RtcConnection.smali index 90db929cef..00ba351bc4 100644 --- a/com.discord/smali/com/discord/rtcconnection/RtcConnection.smali +++ b/com.discord/smali/com/discord/rtcconnection/RtcConnection.smali @@ -1288,7 +1288,7 @@ check-cast p2, Ljava/util/Collection; - invoke-static {p2}, Lkotlin/a/l;->i(Ljava/util/Collection;)[I + invoke-static {p2}, Lkotlin/a/l;->j(Ljava/util/Collection;)[I move-result-object p2 diff --git a/com.discord/smali/com/discord/stores/StoreAuditLog$getPermissionUserIds$1.smali b/com.discord/smali/com/discord/stores/StoreAuditLog$getPermissionUserIds$1.smali index 102280d7e3..dfc58323c2 100644 --- a/com.discord/smali/com/discord/stores/StoreAuditLog$getPermissionUserIds$1.smali +++ b/com.discord/smali/com/discord/stores/StoreAuditLog$getPermissionUserIds$1.smali @@ -100,7 +100,7 @@ invoke-static {p3, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - invoke-static {p3}, Lkotlin/a/ab;->r(Ljava/util/Map;)Lkotlin/sequences/Sequence; + invoke-static {p3}, Lkotlin/a/ab;->t(Ljava/util/Map;)Lkotlin/sequences/Sequence; move-result-object p3 diff --git a/com.discord/smali/com/discord/stores/StoreAuditLog.smali b/com.discord/smali/com/discord/stores/StoreAuditLog.smali index 35c69defcb..b6453c417e 100644 --- a/com.discord/smali/com/discord/stores/StoreAuditLog.smali +++ b/com.discord/smali/com/discord/stores/StoreAuditLog.smali @@ -992,7 +992,7 @@ check-cast v0, Ljava/util/Collection; - invoke-static {v0}, Lkotlin/a/l;->j(Ljava/util/Collection;)Ljava/util/List; + invoke-static {v0}, Lkotlin/a/l;->k(Ljava/util/Collection;)Ljava/util/List; move-result-object v13 diff --git a/com.discord/smali/com/discord/stores/StoreChangeLog.smali b/com.discord/smali/com/discord/stores/StoreChangeLog.smali index ad442795ad..eadf4442f0 100644 --- a/com.discord/smali/com/discord/stores/StoreChangeLog.smali +++ b/com.discord/smali/com/discord/stores/StoreChangeLog.smali @@ -222,7 +222,7 @@ goto :goto_2 :cond_2 - const p2, 0x7f1202f9 + const p2, 0x7f1202fa invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -322,7 +322,7 @@ invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V - const v0, 0x7f1202f9 + const v0, 0x7f1202fa invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$makeGroup$textResolver$1.smali b/com.discord/smali/com/discord/stores/StoreChannelMembersLazy$makeGroup$textResolver$1.smali index 7c9c1361ee..5cf228ca64 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 @@ -100,12 +100,12 @@ goto :goto_1 :pswitch_1 - const v0, 0x7f120d73 + const v0, 0x7f120d74 goto :goto_0 :pswitch_2 - const v0, 0x7f120d74 + const v0, 0x7f120d75 :goto_0 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/stores/StoreChannels.smali b/com.discord/smali/com/discord/stores/StoreChannels.smali index 6dd107b567..00ac418f80 100644 --- a/com.discord/smali/com/discord/stores/StoreChannels.smali +++ b/com.discord/smali/com/discord/stores/StoreChannels.smali @@ -522,12 +522,12 @@ if-eqz p1, :cond_0 - const p1, 0x7f1202e5 + const p1, 0x7f1202e6 goto :goto_0 :cond_0 - const p1, 0x7f120309 + const p1, 0x7f12030a :goto_0 invoke-static {p0, p1}, Lcom/discord/app/f;->d(Landroid/content/Context;I)V diff --git a/com.discord/smali/com/discord/stores/StoreChannelsSelected.smali b/com.discord/smali/com/discord/stores/StoreChannelsSelected.smali index 83123b8151..e1f80ca1cf 100644 --- a/com.discord/smali/com/discord/stores/StoreChannelsSelected.smali +++ b/com.discord/smali/com/discord/stores/StoreChannelsSelected.smali @@ -261,7 +261,7 @@ .end method .method private final computeSelectedChannelId()V - .locals 8 + .locals 10 iget-object v0, p0, Lcom/discord/stores/StoreChannelsSelected;->stream:Lcom/discord/stores/StoreStream; @@ -281,27 +281,35 @@ move-result-object v0 - invoke-static {}, Lcom/discord/app/g;->dz()Lrx/Observable$Transformer; + const-string v1, "stream\n .guildSel\u2026 }\n }" - move-result-object v1 + invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$Transformer;)Lrx/Observable; + invoke-static {v0}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->computationBuffered(Lrx/Observable;)Lrx/Observable; move-result-object v0 - sget-object v1, Lcom/discord/app/g;->tT:Lcom/discord/app/g; + invoke-virtual {v0}, Lrx/Observable;->KC()Lrx/Observable; - new-instance v1, Lcom/discord/stores/StoreChannelsSelected$computeSelectedChannelId$2; + move-result-object v1 - invoke-direct {v1, p0}, Lcom/discord/stores/StoreChannelsSelected$computeSelectedChannelId$2;->(Lcom/discord/stores/StoreChannelsSelected;)V + const-string v0, "stream\n .guildSel\u2026 .distinctUntilChanged()" - move-object v2, v1 - - check-cast v2, Lkotlin/jvm/functions/Function1; + invoke-static {v1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V invoke-virtual {p0}, Ljava/lang/Object;->getClass()Ljava/lang/Class; - move-result-object v3 + move-result-object v2 + + new-instance v0, Lcom/discord/stores/StoreChannelsSelected$computeSelectedChannelId$2; + + invoke-direct {v0, p0}, Lcom/discord/stores/StoreChannelsSelected$computeSelectedChannelId$2;->(Lcom/discord/stores/StoreChannelsSelected;)V + + move-object v7, v0 + + check-cast v7, Lkotlin/jvm/functions/Function1; + + const/4 v3, 0x0 const/4 v4, 0x0 @@ -309,13 +317,11 @@ const/4 v6, 0x0 - const/16 v7, 0x3c + const/16 v8, 0x1e - invoke-static/range {v2 .. v7}, Lcom/discord/app/g;->a(Lkotlin/jvm/functions/Function1;Ljava/lang/Class;Lrx/functions/Action1;Lkotlin/jvm/functions/Function1;Landroid/content/Context;I)Lrx/Observable$Transformer; + const/4 v9, 0x0 - move-result-object v1 - - invoke-virtual {v0, v1}, Lrx/Observable;->a(Lrx/Observable$Transformer;)Lrx/Observable; + invoke-static/range {v1 .. v9}, Lcom/discord/utilities/rx/ObservableExtensionsKt;->appSubscribe$default(Lrx/Observable;Ljava/lang/Class;Landroid/content/Context;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function1;Lkotlin/jvm/functions/Function0;Lkotlin/jvm/functions/Function1;ILjava/lang/Object;)V return-void .end method diff --git a/com.discord/smali/com/discord/stores/StoreClientVersion.smali b/com.discord/smali/com/discord/stores/StoreClientVersion.smali index 87de1c3b44..9f82844de2 100644 --- a/com.discord/smali/com/discord/stores/StoreClientVersion.smali +++ b/com.discord/smali/com/discord/stores/StoreClientVersion.smali @@ -27,7 +27,7 @@ invoke-direct {p0}, Lcom/discord/stores/Store;->()V - const/16 v0, 0x337 + const/16 v0, 0x338 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 1471f5a936..2d7f94411d 100644 --- a/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali +++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$NotificationData.smali @@ -69,42 +69,42 @@ throw p1 :pswitch_0 - const p1, 0x7f12039c - - goto :goto_0 - - :pswitch_1 - const p1, 0x7f120398 - - goto :goto_0 - - :pswitch_2 const p1, 0x7f12039d goto :goto_0 - :pswitch_3 - const p1, 0x7f12039e - - goto :goto_0 - - :pswitch_4 + :pswitch_1 const p1, 0x7f120399 goto :goto_0 - :pswitch_5 - const p1, 0x7f120396 + :pswitch_2 + const p1, 0x7f12039e goto :goto_0 - :pswitch_6 + :pswitch_3 + const p1, 0x7f12039f + + goto :goto_0 + + :pswitch_4 + const p1, 0x7f12039a + + goto :goto_0 + + :pswitch_5 const p1, 0x7f120397 goto :goto_0 + :pswitch_6 + const p1, 0x7f120398 + + goto :goto_0 + :pswitch_7 - const p1, 0x7f12039a + const p1, 0x7f12039b :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 a886b2f453..85e5bd843d 100644 --- a/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali +++ b/com.discord/smali/com/discord/stores/StoreMediaNotification$init$3.smali @@ -70,7 +70,7 @@ iget-object p1, p0, Lcom/discord/stores/StoreMediaNotification$init$3;->$context:Landroid/content/Context; - const v0, 0x7f120f36 + const v0, 0x7f120f37 invoke-static {p1, v0}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V diff --git a/com.discord/smali/com/discord/stores/StoreMessageState$State.smali b/com.discord/smali/com/discord/stores/StoreMessageState$State.smali new file mode 100644 index 0000000000..3d3e59d15b --- /dev/null +++ b/com.discord/smali/com/discord/stores/StoreMessageState$State.smali @@ -0,0 +1,230 @@ +.class public final Lcom/discord/stores/StoreMessageState$State; +.super Ljava/lang/Object; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingClass; + value = Lcom/discord/stores/StoreMessageState; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x19 + name = "State" +.end annotation + + +# instance fields +.field private final visibleSpoilerNodeIndices:Ljava/util/Set; + .annotation system Ldalvik/annotation/Signature; + value = { + "Ljava/util/Set<", + "Ljava/lang/Integer;", + ">;" + } + .end annotation +.end field + + +# direct methods +.method public constructor ()V + .locals 2 + + const/4 v0, 0x0 + + const/4 v1, 0x1 + + invoke-direct {p0, v0, v1, v0}, Lcom/discord/stores/StoreMessageState$State;->(Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + + return-void +.end method + +.method public constructor (Ljava/util/Set;)V + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Ljava/util/Set<", + "Ljava/lang/Integer;", + ">;)V" + } + .end annotation + + const-string v0, "visibleSpoilerNodeIndices" + + invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-direct {p0}, Ljava/lang/Object;->()V + + iput-object p1, p0, Lcom/discord/stores/StoreMessageState$State;->visibleSpoilerNodeIndices:Ljava/util/Set; + + return-void +.end method + +.method public synthetic constructor (Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + .locals 0 + + and-int/lit8 p2, p2, 0x1 + + if-eqz p2, :cond_0 + + sget-object p1, Lkotlin/a/z;->bPE:Lkotlin/a/z; + + check-cast p1, Ljava/util/Set; + + :cond_0 + invoke-direct {p0, p1}, Lcom/discord/stores/StoreMessageState$State;->(Ljava/util/Set;)V + + return-void +.end method + +.method public static synthetic copy$default(Lcom/discord/stores/StoreMessageState$State;Ljava/util/Set;ILjava/lang/Object;)Lcom/discord/stores/StoreMessageState$State; + .locals 0 + + and-int/lit8 p2, p2, 0x1 + + if-eqz p2, :cond_0 + + iget-object p1, p0, Lcom/discord/stores/StoreMessageState$State;->visibleSpoilerNodeIndices:Ljava/util/Set; + + :cond_0 + invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessageState$State;->copy(Ljava/util/Set;)Lcom/discord/stores/StoreMessageState$State; + + move-result-object p0 + + return-object p0 +.end method + + +# virtual methods +.method public final component1()Ljava/util/Set; + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Ljava/util/Set<", + "Ljava/lang/Integer;", + ">;" + } + .end annotation + + iget-object v0, p0, Lcom/discord/stores/StoreMessageState$State;->visibleSpoilerNodeIndices:Ljava/util/Set; + + return-object v0 +.end method + +.method public final copy(Ljava/util/Set;)Lcom/discord/stores/StoreMessageState$State; + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Ljava/util/Set<", + "Ljava/lang/Integer;", + ">;)", + "Lcom/discord/stores/StoreMessageState$State;" + } + .end annotation + + const-string v0, "visibleSpoilerNodeIndices" + + invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V + + new-instance v0, Lcom/discord/stores/StoreMessageState$State; + + invoke-direct {v0, p1}, Lcom/discord/stores/StoreMessageState$State;->(Ljava/util/Set;)V + + return-object v0 +.end method + +.method public final equals(Ljava/lang/Object;)Z + .locals 1 + + if-eq p0, p1, :cond_1 + + instance-of v0, p1, Lcom/discord/stores/StoreMessageState$State; + + if-eqz v0, :cond_0 + + check-cast p1, Lcom/discord/stores/StoreMessageState$State; + + iget-object v0, p0, Lcom/discord/stores/StoreMessageState$State;->visibleSpoilerNodeIndices:Ljava/util/Set; + + iget-object p1, p1, Lcom/discord/stores/StoreMessageState$State;->visibleSpoilerNodeIndices:Ljava/util/Set; + + invoke-static {v0, p1}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z + + move-result p1 + + if-eqz p1, :cond_0 + + goto :goto_0 + + :cond_0 + const/4 p1, 0x0 + + return p1 + + :cond_1 + :goto_0 + const/4 p1, 0x1 + + return p1 +.end method + +.method public final getVisibleSpoilerNodeIndices()Ljava/util/Set; + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Ljava/util/Set<", + "Ljava/lang/Integer;", + ">;" + } + .end annotation + + iget-object v0, p0, Lcom/discord/stores/StoreMessageState$State;->visibleSpoilerNodeIndices:Ljava/util/Set; + + return-object v0 +.end method + +.method public final hashCode()I + .locals 1 + + iget-object v0, p0, Lcom/discord/stores/StoreMessageState$State;->visibleSpoilerNodeIndices:Ljava/util/Set; + + if-eqz v0, :cond_0 + + invoke-virtual {v0}, Ljava/lang/Object;->hashCode()I + + move-result v0 + + return v0 + + :cond_0 + const/4 v0, 0x0 + + return v0 +.end method + +.method public final toString()Ljava/lang/String; + .locals 2 + + new-instance v0, Ljava/lang/StringBuilder; + + const-string v1, "State(visibleSpoilerNodeIndices=" + + invoke-direct {v0, v1}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V + + iget-object v1, p0, Lcom/discord/stores/StoreMessageState$State;->visibleSpoilerNodeIndices:Ljava/util/Set; + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + + const-string v1, ")" + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v0}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + + move-result-object v0 + + return-object v0 +.end method diff --git a/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoiler$1$1.smali b/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoiler$1$1.smali new file mode 100644 index 0000000000..7dd8c09cf9 --- /dev/null +++ b/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoiler$1$1.smali @@ -0,0 +1,88 @@ +.class final Lcom/discord/stores/StoreMessageState$revealSpoiler$1$1; +.super Lkotlin/jvm/internal/k; + +# interfaces +.implements Lkotlin/jvm/functions/Function1; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/stores/StoreMessageState$revealSpoiler$1;->call()V +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x18 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "Lkotlin/jvm/internal/k;", + "Lkotlin/jvm/functions/Function1<", + "Lcom/discord/stores/StoreMessageState$State;", + "Lcom/discord/stores/StoreMessageState$State;", + ">;" + } +.end annotation + + +# instance fields +.field final synthetic this$0:Lcom/discord/stores/StoreMessageState$revealSpoiler$1; + + +# direct methods +.method constructor (Lcom/discord/stores/StoreMessageState$revealSpoiler$1;)V + .locals 0 + + iput-object p1, p0, Lcom/discord/stores/StoreMessageState$revealSpoiler$1$1;->this$0:Lcom/discord/stores/StoreMessageState$revealSpoiler$1; + + const/4 p1, 0x1 + + invoke-direct {p0, p1}, Lkotlin/jvm/internal/k;->(I)V + + return-void +.end method + + +# virtual methods +.method public final invoke(Lcom/discord/stores/StoreMessageState$State;)Lcom/discord/stores/StoreMessageState$State; + .locals 2 + + const-string v0, "currentState" + + invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {p1}, Lcom/discord/stores/StoreMessageState$State;->getVisibleSpoilerNodeIndices()Ljava/util/Set; + + move-result-object v0 + + iget-object v1, p0, Lcom/discord/stores/StoreMessageState$revealSpoiler$1$1;->this$0:Lcom/discord/stores/StoreMessageState$revealSpoiler$1; + + iget v1, v1, Lcom/discord/stores/StoreMessageState$revealSpoiler$1;->$spoilerIndex:I + + invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + + move-result-object v1 + + invoke-static {v0, v1}, Lkotlin/a/ai;->b(Ljava/util/Set;Ljava/lang/Object;)Ljava/util/Set; + + move-result-object v0 + + invoke-virtual {p1, v0}, Lcom/discord/stores/StoreMessageState$State;->copy(Ljava/util/Set;)Lcom/discord/stores/StoreMessageState$State; + + move-result-object p1 + + return-object p1 +.end method + +.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object; + .locals 0 + + check-cast p1, Lcom/discord/stores/StoreMessageState$State; + + invoke-virtual {p0, p1}, Lcom/discord/stores/StoreMessageState$revealSpoiler$1$1;->invoke(Lcom/discord/stores/StoreMessageState$State;)Lcom/discord/stores/StoreMessageState$State; + + move-result-object p1 + + return-object p1 +.end method diff --git a/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoiler$1.smali b/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoiler$1.smali new file mode 100644 index 0000000000..d607918a81 --- /dev/null +++ b/com.discord/smali/com/discord/stores/StoreMessageState$revealSpoiler$1.smali @@ -0,0 +1,60 @@ +.class final Lcom/discord/stores/StoreMessageState$revealSpoiler$1; +.super Ljava/lang/Object; + +# interfaces +.implements Lrx/functions/Action0; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/stores/StoreMessageState;->revealSpoiler(JI)V +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x18 + name = null +.end annotation + + +# instance fields +.field final synthetic $messageId:J + +.field final synthetic $spoilerIndex:I + +.field final synthetic this$0:Lcom/discord/stores/StoreMessageState; + + +# direct methods +.method constructor (Lcom/discord/stores/StoreMessageState;JI)V + .locals 0 + + iput-object p1, p0, Lcom/discord/stores/StoreMessageState$revealSpoiler$1;->this$0:Lcom/discord/stores/StoreMessageState; + + iput-wide p2, p0, Lcom/discord/stores/StoreMessageState$revealSpoiler$1;->$messageId:J + + iput p4, p0, Lcom/discord/stores/StoreMessageState$revealSpoiler$1;->$spoilerIndex:I + + invoke-direct {p0}, Ljava/lang/Object;->()V + + return-void +.end method + + +# virtual methods +.method public final call()V + .locals 4 + + iget-object v0, p0, Lcom/discord/stores/StoreMessageState$revealSpoiler$1;->this$0:Lcom/discord/stores/StoreMessageState; + + iget-wide v1, p0, Lcom/discord/stores/StoreMessageState$revealSpoiler$1;->$messageId:J + + new-instance v3, Lcom/discord/stores/StoreMessageState$revealSpoiler$1$1; + + invoke-direct {v3, p0}, Lcom/discord/stores/StoreMessageState$revealSpoiler$1$1;->(Lcom/discord/stores/StoreMessageState$revealSpoiler$1;)V + + check-cast v3, Lkotlin/jvm/functions/Function1; + + invoke-static {v0, v1, v2, v3}, Lcom/discord/stores/StoreMessageState;->access$updateState(Lcom/discord/stores/StoreMessageState;JLkotlin/jvm/functions/Function1;)V + + return-void +.end method diff --git a/com.discord/smali/com/discord/stores/StoreMessageState.smali b/com.discord/smali/com/discord/stores/StoreMessageState.smali new file mode 100644 index 0000000000..5c3ba3a7f2 --- /dev/null +++ b/com.discord/smali/com/discord/stores/StoreMessageState.smali @@ -0,0 +1,449 @@ +.class public final Lcom/discord/stores/StoreMessageState; +.super Ljava/lang/Object; + + +# annotations +.annotation system Ldalvik/annotation/MemberClasses; + value = { + Lcom/discord/stores/StoreMessageState$State; + } +.end annotation + + +# instance fields +.field private final messageStateSubject:Lrx/subjects/BehaviorSubject; + .annotation system Ldalvik/annotation/Signature; + value = { + "Lrx/subjects/BehaviorSubject<", + "Ljava/util/Map<", + "Ljava/lang/Long;", + "Lcom/discord/stores/StoreMessageState$State;", + ">;>;" + } + .end annotation +.end field + +.field private final stream:Lcom/discord/stores/StoreStream; + + +# direct methods +.method public constructor (Lcom/discord/stores/StoreStream;)V + .locals 1 + + const-string v0, "stream" + + invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-direct {p0}, Ljava/lang/Object;->()V + + iput-object p1, p0, Lcom/discord/stores/StoreMessageState;->stream:Lcom/discord/stores/StoreStream; + + invoke-static {}, Lkotlin/a/ab;->emptyMap()Ljava/util/Map; + + move-result-object p1 + + invoke-static {p1}, Lrx/subjects/BehaviorSubject;->cl(Ljava/lang/Object;)Lrx/subjects/BehaviorSubject; + + move-result-object p1 + + const-string v0, "BehaviorSubject.create(emptyMap())" + + invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + iput-object p1, p0, Lcom/discord/stores/StoreMessageState;->messageStateSubject:Lrx/subjects/BehaviorSubject; + + return-void +.end method + +.method public static final synthetic access$updateState(Lcom/discord/stores/StoreMessageState;JLkotlin/jvm/functions/Function1;)V + .locals 0 + + invoke-direct {p0, p1, p2, p3}, Lcom/discord/stores/StoreMessageState;->updateState(JLkotlin/jvm/functions/Function1;)V + + return-void +.end method + +.method private final resetState(Ljava/util/List;)V + .locals 6 + .annotation runtime Lcom/discord/stores/StoreThread; + .end annotation + + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Ljava/util/List<", + "Ljava/lang/Long;", + ">;)V" + } + .end annotation + + iget-object v0, p0, Lcom/discord/stores/StoreMessageState;->messageStateSubject:Lrx/subjects/BehaviorSubject; + + invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->getValue()Ljava/lang/Object; + + move-result-object v0 + + check-cast v0, Ljava/util/Map; + + check-cast p1, Ljava/lang/Iterable; + + new-instance v1, Ljava/util/ArrayList; + + invoke-direct {v1}, Ljava/util/ArrayList;->()V + + check-cast v1, Ljava/util/Collection; + + invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; + + move-result-object p1 + + :cond_0 + :goto_0 + invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z + + move-result v2 + + if-eqz v2, :cond_1 + + invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object; + + move-result-object v2 + + move-object v3, v2 + + check-cast v3, Ljava/lang/Number; + + invoke-virtual {v3}, Ljava/lang/Number;->longValue()J + + move-result-wide v3 + + const-string v5, "messageStateMap" + + invoke-static {v0, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v3 + + invoke-interface {v0, v3}, Ljava/util/Map;->containsKey(Ljava/lang/Object;)Z + + move-result v3 + + if-eqz v3, :cond_0 + + invoke-interface {v1, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z + + goto :goto_0 + + :cond_1 + check-cast v1, Ljava/util/List; + + invoke-interface {v1}, Ljava/util/List;->isEmpty()Z + + move-result p1 + + if-eqz p1, :cond_2 + + return-void + + :cond_2 + iget-object p1, p0, Lcom/discord/stores/StoreMessageState;->messageStateSubject:Lrx/subjects/BehaviorSubject; + + const-string v2, "messageStateMap" + + invoke-static {v0, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + check-cast v1, Ljava/lang/Iterable; + + const-string v2, "receiver$0" + + invoke-static {v0, v2}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V + + const-string v2, "keys" + + invoke-static {v1, v2}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-static {v0}, Lkotlin/a/ab;->s(Ljava/util/Map;)Ljava/util/Map; + + move-result-object v0 + + invoke-interface {v0}, Ljava/util/Map;->keySet()Ljava/util/Set; + + move-result-object v2 + + check-cast v2, Ljava/util/Collection; + + const-string v3, "receiver$0" + + invoke-static {v2, v3}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V + + const-string v3, "elements" + + invoke-static {v1, v3}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V + + move-object v3, v2 + + check-cast v3, Ljava/lang/Iterable; + + invoke-static {v1, v3}, Lkotlin/a/l;->a(Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/Collection; + + move-result-object v1 + + invoke-static {v2}, Lkotlin/jvm/internal/w;->bB(Ljava/lang/Object;)Ljava/util/Collection; + + move-result-object v2 + + invoke-interface {v2, v1}, Ljava/util/Collection;->removeAll(Ljava/util/Collection;)Z + + const-string v1, "receiver$0" + + invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-interface {v0}, Ljava/util/Map;->size()I + + move-result v1 + + packed-switch v1, :pswitch_data_0 + + goto :goto_1 + + :pswitch_0 + invoke-static {v0}, Lkotlin/a/ab;->r(Ljava/util/Map;)Ljava/util/Map; + + move-result-object v0 + + goto :goto_1 + + :pswitch_1 + invoke-static {}, Lkotlin/a/ab;->emptyMap()Ljava/util/Map; + + move-result-object v0 + + :goto_1 + invoke-virtual {p1, v0}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V + + return-void + + nop + + :pswitch_data_0 + .packed-switch 0x0 + :pswitch_1 + :pswitch_0 + .end packed-switch +.end method + +.method private final updateState(JLkotlin/jvm/functions/Function1;)V + .locals 4 + .annotation runtime Lcom/discord/stores/StoreThread; + .end annotation + + .annotation system Ldalvik/annotation/Signature; + value = { + "(J", + "Lkotlin/jvm/functions/Function1<", + "-", + "Lcom/discord/stores/StoreMessageState$State;", + "Lcom/discord/stores/StoreMessageState$State;", + ">;)V" + } + .end annotation + + iget-object v0, p0, Lcom/discord/stores/StoreMessageState;->messageStateSubject:Lrx/subjects/BehaviorSubject; + + invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->getValue()Ljava/lang/Object; + + move-result-object v0 + + check-cast v0, Ljava/util/Map; + + invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v1 + + invoke-interface {v0, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + + move-result-object v1 + + check-cast v1, Lcom/discord/stores/StoreMessageState$State; + + if-nez v1, :cond_0 + + new-instance v1, Lcom/discord/stores/StoreMessageState$State; + + const/4 v2, 0x1 + + const/4 v3, 0x0 + + invoke-direct {v1, v3, v2, v3}, Lcom/discord/stores/StoreMessageState$State;->(Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + + :cond_0 + invoke-interface {p3, v1}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object; + + move-result-object p3 + + check-cast p3, Lcom/discord/stores/StoreMessageState$State; + + iget-object v1, p0, Lcom/discord/stores/StoreMessageState;->messageStateSubject:Lrx/subjects/BehaviorSubject; + + const-string v2, "messageStateMap" + + invoke-static {v0, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-static {p1, p2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object p1 + + invoke-static {p1, p3}, Lkotlin/q;->w(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair; + + move-result-object p1 + + invoke-static {v0, p1}, Lkotlin/a/ab;->a(Ljava/util/Map;Lkotlin/Pair;)Ljava/util/Map; + + move-result-object p1 + + invoke-virtual {v1, p1}, Lrx/subjects/BehaviorSubject;->onNext(Ljava/lang/Object;)V + + return-void +.end method + + +# virtual methods +.method public final getMessageState()Lrx/Observable; + .locals 2 + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Lrx/Observable<", + "Ljava/util/Map<", + "Ljava/lang/Long;", + "Lcom/discord/stores/StoreMessageState$State;", + ">;>;" + } + .end annotation + + iget-object v0, p0, Lcom/discord/stores/StoreMessageState;->messageStateSubject:Lrx/subjects/BehaviorSubject; + + invoke-virtual {v0}, Lrx/subjects/BehaviorSubject;->KC()Lrx/Observable; + + move-result-object v0 + + const-string v1, "messageStateSubject.distinctUntilChanged()" + + invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + return-object v0 +.end method + +.method public final handleMessageDelete(Lcom/discord/models/domain/ModelMessageDelete;)V + .locals 1 + .annotation runtime Lcom/discord/stores/StoreThread; + .end annotation + + const-string v0, "messageDelete" + + invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessageDelete;->getMessageIds()Ljava/util/List; + + move-result-object p1 + + const-string v0, "messageDelete.messageIds" + + invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-direct {p0, p1}, Lcom/discord/stores/StoreMessageState;->resetState(Ljava/util/List;)V + + return-void +.end method + +.method public final handleMessageUpdate(Ljava/util/List;)V + .locals 3 + .annotation runtime Lcom/discord/stores/StoreThread; + .end annotation + + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Ljava/util/List<", + "+", + "Lcom/discord/models/domain/ModelMessage;", + ">;)V" + } + .end annotation + + const-string v0, "messagesList" + + invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V + + check-cast p1, Ljava/lang/Iterable; + + new-instance v0, Ljava/util/ArrayList; + + const/16 v1, 0xa + + invoke-static {p1, v1}, Lkotlin/a/l;->a(Ljava/lang/Iterable;I)I + + move-result v1 + + invoke-direct {v0, v1}, Ljava/util/ArrayList;->(I)V + + check-cast v0, Ljava/util/Collection; + + invoke-interface {p1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; + + move-result-object p1 + + :goto_0 + invoke-interface {p1}, Ljava/util/Iterator;->hasNext()Z + + move-result v1 + + if-eqz v1, :cond_0 + + invoke-interface {p1}, Ljava/util/Iterator;->next()Ljava/lang/Object; + + move-result-object v1 + + check-cast v1, Lcom/discord/models/domain/ModelMessage; + + invoke-virtual {v1}, Lcom/discord/models/domain/ModelMessage;->getId()J + + move-result-wide v1 + + invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v1 + + invoke-interface {v0, v1}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z + + goto :goto_0 + + :cond_0 + check-cast v0, Ljava/util/List; + + invoke-direct {p0, v0}, Lcom/discord/stores/StoreMessageState;->resetState(Ljava/util/List;)V + + return-void +.end method + +.method public final revealSpoiler(JI)V + .locals 2 + + if-gez p3, :cond_0 + + return-void + + :cond_0 + iget-object v0, p0, Lcom/discord/stores/StoreMessageState;->stream:Lcom/discord/stores/StoreStream; + + new-instance v1, Lcom/discord/stores/StoreMessageState$revealSpoiler$1; + + invoke-direct {v1, p0, p1, p2, p3}, Lcom/discord/stores/StoreMessageState$revealSpoiler$1;->(Lcom/discord/stores/StoreMessageState;JI)V + + check-cast v1, Lrx/functions/Action0; + + invoke-virtual {v0, v1}, Lcom/discord/stores/StoreStream;->schedule(Lrx/functions/Action0;)V + + return-void +.end method diff --git a/com.discord/smali/com/discord/stores/StoreMessageStateKt.smali b/com.discord/smali/com/discord/stores/StoreMessageStateKt.smali new file mode 100644 index 0000000000..29a397a98b --- /dev/null +++ b/com.discord/smali/com/discord/stores/StoreMessageStateKt.smali @@ -0,0 +1,2 @@ +.class public final Lcom/discord/stores/StoreMessageStateKt; +.super Ljava/lang/Object; 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 43111cc3e8..1b984ba481 100644 --- a/com.discord/smali/com/discord/stores/StoreNavigation$init$6.smali +++ b/com.discord/smali/com/discord/stores/StoreNavigation$init$6.smali @@ -84,9 +84,9 @@ const-string v1, "UNCLAIMED_USER" - const v2, 0x7f12032a + const v2, 0x7f12032b - const v3, 0x7f120a3d + const v3, 0x7f120a3e const v4, 0x7f080279 diff --git a/com.discord/smali/com/discord/stores/StoreNavigation.smali b/com.discord/smali/com/discord/stores/StoreNavigation.smali index 1968e61553..e2afa701a3 100644 --- a/com.discord/smali/com/discord/stores/StoreNavigation.smali +++ b/com.discord/smali/com/discord/stores/StoreNavigation.smali @@ -166,9 +166,9 @@ check-cast v9, Lkotlin/jvm/functions/Function1; - const v2, 0x7f120391 + const v2, 0x7f120392 - const v3, 0x7f120395 + const v3, 0x7f120396 const v4, 0x7f0802ed diff --git a/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$2.smali b/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$2.smali index 1ef4a54a83..f623ba1cde 100644 --- a/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$2.smali +++ b/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$2.smali @@ -61,27 +61,27 @@ .method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .locals 0 - check-cast p1, Lcom/discord/utilities/fcm/NotificationClient$Settings; + check-cast p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; check-cast p2, Ljava/lang/Boolean; - invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreNotifications$configureNotificationClient$2;->call(Lcom/discord/utilities/fcm/NotificationClient$Settings;Ljava/lang/Boolean;)Lkotlin/Pair; + invoke-virtual {p0, p1, p2}, Lcom/discord/stores/StoreNotifications$configureNotificationClient$2;->call(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;Ljava/lang/Boolean;)Lkotlin/Pair; move-result-object p1 return-object p1 .end method -.method public final call(Lcom/discord/utilities/fcm/NotificationClient$Settings;Ljava/lang/Boolean;)Lkotlin/Pair; +.method public final call(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;Ljava/lang/Boolean;)Lkotlin/Pair; .locals 0 .annotation system Ldalvik/annotation/Signature; value = { "(", - "Lcom/discord/utilities/fcm/NotificationClient$Settings;", + "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;", "Ljava/lang/Boolean;", ")", "Lkotlin/Pair<", - "Lcom/discord/utilities/fcm/NotificationClient$Settings;", + "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;", "Ljava/lang/Boolean;", ">;" } diff --git a/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$3.smali b/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$3.smali index 6c329ead17..d796e7f9fe 100644 --- a/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$3.smali +++ b/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$3.smali @@ -21,7 +21,7 @@ "Lkotlin/jvm/functions/Function1<", "Lkotlin/Pair<", "+", - "Lcom/discord/utilities/fcm/NotificationClient$Settings;", + "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;", "+", "Ljava/lang/Boolean;", ">;", @@ -78,7 +78,7 @@ value = { "(", "Lkotlin/Pair<", - "Lcom/discord/utilities/fcm/NotificationClient$Settings;", + "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;", "Ljava/lang/Boolean;", ">;)V" } @@ -86,7 +86,7 @@ iget-object v0, p1, Lkotlin/Pair;->first:Ljava/lang/Object; - check-cast v0, Lcom/discord/utilities/fcm/NotificationClient$Settings; + check-cast v0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; iget-object p1, p1, Lkotlin/Pair;->second:Ljava/lang/Object; @@ -106,7 +106,7 @@ move-result p1 - invoke-virtual {v1, v0, p1}, Lcom/discord/utilities/fcm/NotificationClient;->updateSettings$app_productionExternalRelease(Lcom/discord/utilities/fcm/NotificationClient$Settings;Z)V + invoke-virtual {v1, v0, p1}, Lcom/discord/utilities/fcm/NotificationClient;->updateSettings$app_productionExternalRelease(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;Z)V return-void .end method diff --git a/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$completedSettings$2.smali b/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$completedSettings$2.smali index 104fdcc310..5a030441fa 100644 --- a/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$completedSettings$2.smali +++ b/com.discord/smali/com/discord/stores/StoreNotifications$configureNotificationClient$completedSettings$2.smali @@ -62,18 +62,18 @@ # virtual methods -.method public final call(Lcom/discord/utilities/fcm/NotificationClient$Settings;Ljava/lang/String;Ljava/lang/String;Ljava/util/HashSet;)Lcom/discord/utilities/fcm/NotificationClient$Settings; +.method public final call(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;Ljava/lang/String;Ljava/lang/String;Ljava/util/HashSet;)Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; .locals 14 .annotation system Ldalvik/annotation/Signature; value = { "(", - "Lcom/discord/utilities/fcm/NotificationClient$Settings;", + "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;", "Ljava/lang/String;", "Ljava/lang/String;", "Ljava/util/HashSet<", "Ljava/lang/Long;", ">;)", - "Lcom/discord/utilities/fcm/NotificationClient$Settings;" + "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;" } .end annotation @@ -113,7 +113,7 @@ move-object/from16 v9, p2 - invoke-static/range {v2 .. v13}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->copy$default(Lcom/discord/utilities/fcm/NotificationClient$Settings;ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;ILjava/lang/Object;)Lcom/discord/utilities/fcm/NotificationClient$Settings; + invoke-static/range {v2 .. v13}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->copy$default(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;ILjava/lang/Object;)Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; move-result-object v0 @@ -123,7 +123,7 @@ .method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; .locals 0 - check-cast p1, Lcom/discord/utilities/fcm/NotificationClient$Settings; + check-cast p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; check-cast p2, Ljava/lang/String; @@ -131,7 +131,7 @@ check-cast p4, Ljava/util/HashSet; - invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/stores/StoreNotifications$configureNotificationClient$completedSettings$2;->call(Lcom/discord/utilities/fcm/NotificationClient$Settings;Ljava/lang/String;Ljava/lang/String;Ljava/util/HashSet;)Lcom/discord/utilities/fcm/NotificationClient$Settings; + invoke-virtual {p0, p1, p2, p3, p4}, Lcom/discord/stores/StoreNotifications$configureNotificationClient$completedSettings$2;->call(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;Ljava/lang/String;Ljava/lang/String;Ljava/util/HashSet;)Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; move-result-object p1 diff --git a/com.discord/smali/com/discord/stores/StoreNotifications$setEnabled$1.smali b/com.discord/smali/com/discord/stores/StoreNotifications$setEnabled$1.smali index 2e24d8578e..61632bd0c7 100644 --- a/com.discord/smali/com/discord/stores/StoreNotifications$setEnabled$1.smali +++ b/com.discord/smali/com/discord/stores/StoreNotifications$setEnabled$1.smali @@ -19,8 +19,8 @@ value = { "Lkotlin/jvm/internal/k;", "Lkotlin/jvm/functions/Function1<", - "Lcom/discord/utilities/fcm/NotificationClient$Settings;", - "Lcom/discord/utilities/fcm/NotificationClient$Settings;", + "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;", + "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;", ">;" } .end annotation @@ -45,7 +45,7 @@ # virtual methods -.method public final invoke(Lcom/discord/utilities/fcm/NotificationClient$Settings;)Lcom/discord/utilities/fcm/NotificationClient$Settings; +.method public final invoke(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; .locals 13 const-string v0, "it" @@ -76,7 +76,7 @@ move-object v1, p1 - invoke-static/range {v1 .. v12}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->copy$default(Lcom/discord/utilities/fcm/NotificationClient$Settings;ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;ILjava/lang/Object;)Lcom/discord/utilities/fcm/NotificationClient$Settings; + invoke-static/range {v1 .. v12}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->copy$default(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;ILjava/lang/Object;)Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; move-result-object p1 @@ -86,9 +86,9 @@ .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object; .locals 0 - check-cast p1, Lcom/discord/utilities/fcm/NotificationClient$Settings; + check-cast p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; - invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNotifications$setEnabled$1;->invoke(Lcom/discord/utilities/fcm/NotificationClient$Settings;)Lcom/discord/utilities/fcm/NotificationClient$Settings; + invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNotifications$setEnabled$1;->invoke(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; move-result-object p1 diff --git a/com.discord/smali/com/discord/stores/StoreNotifications$setEnabledInApp$oldValue$1.smali b/com.discord/smali/com/discord/stores/StoreNotifications$setEnabledInApp$oldValue$1.smali index 818f02e0fb..e1d369f758 100644 --- a/com.discord/smali/com/discord/stores/StoreNotifications$setEnabledInApp$oldValue$1.smali +++ b/com.discord/smali/com/discord/stores/StoreNotifications$setEnabledInApp$oldValue$1.smali @@ -19,8 +19,8 @@ value = { "Lkotlin/jvm/internal/k;", "Lkotlin/jvm/functions/Function1<", - "Lcom/discord/utilities/fcm/NotificationClient$Settings;", - "Lcom/discord/utilities/fcm/NotificationClient$Settings;", + "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;", + "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;", ">;" } .end annotation @@ -45,7 +45,7 @@ # virtual methods -.method public final invoke(Lcom/discord/utilities/fcm/NotificationClient$Settings;)Lcom/discord/utilities/fcm/NotificationClient$Settings; +.method public final invoke(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; .locals 13 const-string v0, "it" @@ -76,7 +76,7 @@ move-object v1, p1 - invoke-static/range {v1 .. v12}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->copy$default(Lcom/discord/utilities/fcm/NotificationClient$Settings;ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;ILjava/lang/Object;)Lcom/discord/utilities/fcm/NotificationClient$Settings; + invoke-static/range {v1 .. v12}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->copy$default(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;ILjava/lang/Object;)Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; move-result-object p1 @@ -86,9 +86,9 @@ .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object; .locals 0 - check-cast p1, Lcom/discord/utilities/fcm/NotificationClient$Settings; + check-cast p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; - invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNotifications$setEnabledInApp$oldValue$1;->invoke(Lcom/discord/utilities/fcm/NotificationClient$Settings;)Lcom/discord/utilities/fcm/NotificationClient$Settings; + invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNotifications$setEnabledInApp$oldValue$1;->invoke(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; move-result-object p1 diff --git a/com.discord/smali/com/discord/stores/StoreNotifications$setNotificationLightDisabled$1.smali b/com.discord/smali/com/discord/stores/StoreNotifications$setNotificationLightDisabled$1.smali index cc4dc3188f..dbf55ab45f 100644 --- a/com.discord/smali/com/discord/stores/StoreNotifications$setNotificationLightDisabled$1.smali +++ b/com.discord/smali/com/discord/stores/StoreNotifications$setNotificationLightDisabled$1.smali @@ -19,8 +19,8 @@ value = { "Lkotlin/jvm/internal/k;", "Lkotlin/jvm/functions/Function1<", - "Lcom/discord/utilities/fcm/NotificationClient$Settings;", - "Lcom/discord/utilities/fcm/NotificationClient$Settings;", + "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;", + "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;", ">;" } .end annotation @@ -45,7 +45,7 @@ # virtual methods -.method public final invoke(Lcom/discord/utilities/fcm/NotificationClient$Settings;)Lcom/discord/utilities/fcm/NotificationClient$Settings; +.method public final invoke(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; .locals 13 const-string v0, "it" @@ -76,7 +76,7 @@ move-object v1, p1 - invoke-static/range {v1 .. v12}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->copy$default(Lcom/discord/utilities/fcm/NotificationClient$Settings;ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;ILjava/lang/Object;)Lcom/discord/utilities/fcm/NotificationClient$Settings; + invoke-static/range {v1 .. v12}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->copy$default(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;ILjava/lang/Object;)Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; move-result-object p1 @@ -86,9 +86,9 @@ .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object; .locals 0 - check-cast p1, Lcom/discord/utilities/fcm/NotificationClient$Settings; + check-cast p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; - invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNotifications$setNotificationLightDisabled$1;->invoke(Lcom/discord/utilities/fcm/NotificationClient$Settings;)Lcom/discord/utilities/fcm/NotificationClient$Settings; + invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNotifications$setNotificationLightDisabled$1;->invoke(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; move-result-object p1 diff --git a/com.discord/smali/com/discord/stores/StoreNotifications$setNotificationSoundDisabled$1.smali b/com.discord/smali/com/discord/stores/StoreNotifications$setNotificationSoundDisabled$1.smali index 19d00790cb..bd65fbc003 100644 --- a/com.discord/smali/com/discord/stores/StoreNotifications$setNotificationSoundDisabled$1.smali +++ b/com.discord/smali/com/discord/stores/StoreNotifications$setNotificationSoundDisabled$1.smali @@ -19,8 +19,8 @@ value = { "Lkotlin/jvm/internal/k;", "Lkotlin/jvm/functions/Function1<", - "Lcom/discord/utilities/fcm/NotificationClient$Settings;", - "Lcom/discord/utilities/fcm/NotificationClient$Settings;", + "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;", + "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;", ">;" } .end annotation @@ -45,7 +45,7 @@ # virtual methods -.method public final invoke(Lcom/discord/utilities/fcm/NotificationClient$Settings;)Lcom/discord/utilities/fcm/NotificationClient$Settings; +.method public final invoke(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; .locals 13 const-string v0, "it" @@ -76,7 +76,7 @@ move-object v1, p1 - invoke-static/range {v1 .. v12}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->copy$default(Lcom/discord/utilities/fcm/NotificationClient$Settings;ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;ILjava/lang/Object;)Lcom/discord/utilities/fcm/NotificationClient$Settings; + invoke-static/range {v1 .. v12}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->copy$default(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;ILjava/lang/Object;)Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; move-result-object p1 @@ -86,9 +86,9 @@ .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object; .locals 0 - check-cast p1, Lcom/discord/utilities/fcm/NotificationClient$Settings; + check-cast p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; - invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNotifications$setNotificationSoundDisabled$1;->invoke(Lcom/discord/utilities/fcm/NotificationClient$Settings;)Lcom/discord/utilities/fcm/NotificationClient$Settings; + invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNotifications$setNotificationSoundDisabled$1;->invoke(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; move-result-object p1 diff --git a/com.discord/smali/com/discord/stores/StoreNotifications$setNotificationsVibrateDisabled$1.smali b/com.discord/smali/com/discord/stores/StoreNotifications$setNotificationsVibrateDisabled$1.smali index fa8c5c5229..0c4d5ed5dc 100644 --- a/com.discord/smali/com/discord/stores/StoreNotifications$setNotificationsVibrateDisabled$1.smali +++ b/com.discord/smali/com/discord/stores/StoreNotifications$setNotificationsVibrateDisabled$1.smali @@ -19,8 +19,8 @@ value = { "Lkotlin/jvm/internal/k;", "Lkotlin/jvm/functions/Function1<", - "Lcom/discord/utilities/fcm/NotificationClient$Settings;", - "Lcom/discord/utilities/fcm/NotificationClient$Settings;", + "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;", + "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;", ">;" } .end annotation @@ -45,7 +45,7 @@ # virtual methods -.method public final invoke(Lcom/discord/utilities/fcm/NotificationClient$Settings;)Lcom/discord/utilities/fcm/NotificationClient$Settings; +.method public final invoke(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; .locals 13 const-string v0, "it" @@ -76,7 +76,7 @@ move-object v1, p1 - invoke-static/range {v1 .. v12}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->copy$default(Lcom/discord/utilities/fcm/NotificationClient$Settings;ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;ILjava/lang/Object;)Lcom/discord/utilities/fcm/NotificationClient$Settings; + invoke-static/range {v1 .. v12}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->copy$default(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;ILjava/lang/Object;)Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; move-result-object p1 @@ -86,9 +86,9 @@ .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object; .locals 0 - check-cast p1, Lcom/discord/utilities/fcm/NotificationClient$Settings; + check-cast p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; - invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNotifications$setNotificationsVibrateDisabled$1;->invoke(Lcom/discord/utilities/fcm/NotificationClient$Settings;)Lcom/discord/utilities/fcm/NotificationClient$Settings; + invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNotifications$setNotificationsVibrateDisabled$1;->invoke(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; move-result-object p1 diff --git a/com.discord/smali/com/discord/stores/StoreNotifications$setWakeUpDevice$1.smali b/com.discord/smali/com/discord/stores/StoreNotifications$setWakeUpDevice$1.smali index 1a23b16e24..9c2bffaf2c 100644 --- a/com.discord/smali/com/discord/stores/StoreNotifications$setWakeUpDevice$1.smali +++ b/com.discord/smali/com/discord/stores/StoreNotifications$setWakeUpDevice$1.smali @@ -19,8 +19,8 @@ value = { "Lkotlin/jvm/internal/k;", "Lkotlin/jvm/functions/Function1<", - "Lcom/discord/utilities/fcm/NotificationClient$Settings;", - "Lcom/discord/utilities/fcm/NotificationClient$Settings;", + "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;", + "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;", ">;" } .end annotation @@ -45,7 +45,7 @@ # virtual methods -.method public final invoke(Lcom/discord/utilities/fcm/NotificationClient$Settings;)Lcom/discord/utilities/fcm/NotificationClient$Settings; +.method public final invoke(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; .locals 13 const-string v0, "it" @@ -76,7 +76,7 @@ move-object v1, p1 - invoke-static/range {v1 .. v12}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->copy$default(Lcom/discord/utilities/fcm/NotificationClient$Settings;ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;ILjava/lang/Object;)Lcom/discord/utilities/fcm/NotificationClient$Settings; + invoke-static/range {v1 .. v12}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->copy$default(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;ILjava/lang/Object;)Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; move-result-object p1 @@ -86,9 +86,9 @@ .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object; .locals 0 - check-cast p1, Lcom/discord/utilities/fcm/NotificationClient$Settings; + check-cast p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; - invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNotifications$setWakeUpDevice$1;->invoke(Lcom/discord/utilities/fcm/NotificationClient$Settings;)Lcom/discord/utilities/fcm/NotificationClient$Settings; + invoke-virtual {p0, p1}, Lcom/discord/stores/StoreNotifications$setWakeUpDevice$1;->invoke(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; move-result-object p1 diff --git a/com.discord/smali/com/discord/stores/StoreNotifications.smali b/com.discord/smali/com/discord/stores/StoreNotifications.smali index defffb7b8f..29db83f4f4 100644 --- a/com.discord/smali/com/discord/stores/StoreNotifications.smali +++ b/com.discord/smali/com/discord/stores/StoreNotifications.smali @@ -23,7 +23,7 @@ .annotation system Ldalvik/annotation/Signature; value = { "Lcom/discord/utilities/persister/Persister<", - "Lcom/discord/utilities/fcm/NotificationClient$Settings;", + "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;", ">;" } .end annotation @@ -66,7 +66,7 @@ const-string v0, "STORE_NOTIFICATIONS_SETTINGS_V2" - invoke-direct {p0}, Lcom/discord/stores/StoreNotifications;->getDefaultSettings()Lcom/discord/utilities/fcm/NotificationClient$Settings; + invoke-direct {p0}, Lcom/discord/stores/StoreNotifications;->getDefaultSettings()Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; move-result-object v1 @@ -308,14 +308,14 @@ return-void .end method -.method private final getDefaultSettings()Lcom/discord/utilities/fcm/NotificationClient$Settings; +.method private final getDefaultSettings()Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; .locals 15 new-instance v0, Lcom/discord/utilities/persister/Persister; const-string v1, "STORE_NOTIFICATIONS_SETTINGS" - new-instance v14, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated; + new-instance v14, Lcom/discord/utilities/fcm/NotificationClient$Settings; const/4 v3, 0x0 @@ -341,7 +341,7 @@ move-object v2, v14 - invoke-direct/range {v2 .. v13}, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->(ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + invoke-direct/range {v2 .. v13}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->(ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V invoke-direct {v0, v1, v14}, Lcom/discord/utilities/persister/Persister;->(Ljava/lang/String;Ljava/lang/Object;)V @@ -349,9 +349,9 @@ move-result-object v0 - check-cast v0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated; + check-cast v0, Lcom/discord/utilities/fcm/NotificationClient$Settings; - invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->toNewSettings()Lcom/discord/utilities/fcm/NotificationClient$Settings; + invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->toNewSettings()Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; move-result-object v0 @@ -529,7 +529,7 @@ value = { "()", "Lrx/Observable<", - "Lcom/discord/utilities/fcm/NotificationClient$Settings;", + "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;", ">;" } .end annotation @@ -604,9 +604,9 @@ move-result-object v0 - check-cast v0, Lcom/discord/utilities/fcm/NotificationClient$Settings; + check-cast v0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; - invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->isEnabledInApp()Z + invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isEnabledInApp()Z move-result v0 @@ -1012,11 +1012,11 @@ move-result-object v0 - check-cast v0, Lcom/discord/utilities/fcm/NotificationClient$Settings; + check-cast v0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; if-eqz p2, :cond_0 - invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->isEnabledInApp()Z + invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isEnabledInApp()Z move-result p2 diff --git a/com.discord/smali/com/discord/stores/StoreSearchQuery.smali b/com.discord/smali/com/discord/stores/StoreSearchQuery.smali index dd5d17dccc..14c2b6411c 100644 --- a/com.discord/smali/com/discord/stores/StoreSearchQuery.smali +++ b/com.discord/smali/com/discord/stores/StoreSearchQuery.smali @@ -221,7 +221,7 @@ check-cast v0, Ljava/util/Collection; - invoke-static {v0}, Lkotlin/a/l;->j(Ljava/util/Collection;)Ljava/util/List; + invoke-static {v0}, Lkotlin/a/l;->k(Ljava/util/Collection;)Ljava/util/List; move-result-object v0 diff --git a/com.discord/smali/com/discord/stores/StoreStream.smali b/com.discord/smali/com/discord/stores/StoreStream.smali index 2cb3070868..c6f025aa59 100644 --- a/com.discord/smali/com/discord/stores/StoreStream.smali +++ b/com.discord/smali/com/discord/stores/StoreStream.smali @@ -98,6 +98,8 @@ .field final messageAck:Lcom/discord/stores/StoreMessageAck; +.field final messageStates:Lcom/discord/stores/StoreMessageState; + .field final messageUploads:Lcom/discord/stores/StoreMessageUploads; .field final messages:Lcom/discord/stores/StoreMessages; @@ -335,6 +337,12 @@ iput-object v0, p0, Lcom/discord/stores/StoreStream;->messageAck:Lcom/discord/stores/StoreMessageAck; + new-instance v0, Lcom/discord/stores/StoreMessageState; + + invoke-direct {v0, p0}, Lcom/discord/stores/StoreMessageState;->(Lcom/discord/stores/StoreStream;)V + + iput-object v0, p0, Lcom/discord/stores/StoreStream;->messageStates:Lcom/discord/stores/StoreMessageState; + new-instance v0, Lcom/discord/stores/StoreNotifications; invoke-direct {v0, p0}, Lcom/discord/stores/StoreNotifications;->(Lcom/discord/stores/StoreStream;)V @@ -1108,6 +1116,16 @@ return-object v0 .end method +.method public static getMessageState()Lcom/discord/stores/StoreMessageState; + .locals 1 + + sget-object v0, Lcom/discord/stores/StoreStream;->collector:Lcom/discord/stores/StoreStream; + + iget-object v0, v0, Lcom/discord/stores/StoreStream;->messageStates:Lcom/discord/stores/StoreMessageState; + + return-object v0 +.end method + .method public static getMessageUploads()Lcom/discord/stores/StoreMessageUploads; .locals 1 @@ -2685,7 +2703,7 @@ .end method .method private handleMessageDelete(Lcom/discord/models/domain/ModelMessageDelete;)V - .locals 3 + .locals 4 .annotation runtime Lcom/discord/stores/StoreThread; .end annotation @@ -2701,9 +2719,13 @@ invoke-virtual {p1}, Lcom/discord/models/domain/ModelMessageDelete;->getMessageIds()Ljava/util/List; - move-result-object p1 + move-result-object v3 - invoke-virtual {v0, v1, v2, p1}, Lcom/discord/stores/StorePinnedMessages;->handleMessageDeleteBulk(JLjava/util/Collection;)V + invoke-virtual {v0, v1, v2, v3}, Lcom/discord/stores/StorePinnedMessages;->handleMessageDeleteBulk(JLjava/util/Collection;)V + + iget-object v0, p0, Lcom/discord/stores/StoreStream;->messageStates:Lcom/discord/stores/StoreMessageState; + + invoke-virtual {v0, p1}, Lcom/discord/stores/StoreMessageState;->handleMessageDelete(Lcom/discord/models/domain/ModelMessageDelete;)V return-void .end method @@ -2760,6 +2782,10 @@ invoke-virtual {v0, p1}, Lcom/discord/stores/StorePinnedMessages;->handleMessagesUpdate(Ljava/util/List;)V + iget-object v0, p0, Lcom/discord/stores/StoreStream;->messageStates:Lcom/discord/stores/StoreMessageState; + + invoke-virtual {v0, p1}, Lcom/discord/stores/StoreMessageState;->handleMessageUpdate(Ljava/util/List;)V + return-void .end method diff --git a/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali b/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali index 0f47c9f813..bcb24c6c49 100644 --- a/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali +++ b/com.discord/smali/com/discord/stores/StoreUserGuildSettings.smali @@ -300,7 +300,7 @@ .method static synthetic lambda$setGroupMuted$6(Landroid/content/Context;Lcom/discord/models/domain/ModelUserGuildSettings;)V .locals 0 - const p1, 0x7f1206d2 + const p1, 0x7f1206d3 invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -614,7 +614,7 @@ invoke-direct {v4, v0, v1, p2}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(JLcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;)V - const v5, 0x7f120315 + const v5, 0x7f120316 move-object v0, p0 @@ -662,16 +662,16 @@ if-eqz p2, :cond_0 - const p2, 0x7f120315 + const p2, 0x7f120316 - const v5, 0x7f120315 + const v5, 0x7f120316 goto :goto_0 :cond_0 - const p2, 0x7f1202e8 + const p2, 0x7f1202e9 - const v5, 0x7f1202e8 + const v5, 0x7f1202e9 :goto_0 move-object v0, p0 @@ -718,7 +718,7 @@ invoke-direct {v4, v0, v1, p2}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(JLcom/discord/restapi/RestAPIParams$UserGuildSettings$ChannelOverride;)V - const v5, 0x7f120315 + const v5, 0x7f120316 move-object v0, p0 @@ -804,7 +804,7 @@ invoke-direct {v4, p3}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(I)V - const v5, 0x7f120cf3 + const v5, 0x7f120cf4 move-object v0, p0 @@ -834,7 +834,7 @@ invoke-direct {v4, p3, p4, p5}, Lcom/discord/restapi/RestAPIParams$UserGuildSettings;->(Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)V - const v5, 0x7f120cf3 + const v5, 0x7f120cf4 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 e3a930dc4b..9812f237ea 100644 --- a/com.discord/smali/com/discord/stores/StoreUserSettings.smali +++ b/com.discord/smali/com/discord/stores/StoreUserSettings.smali @@ -1299,7 +1299,7 @@ move-result-object v0 - const v1, 0x7f120ded + const v1, 0x7f120dee invoke-static {v1}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -1438,7 +1438,7 @@ move-result-object p2 - const v0, 0x7f12091a + const v0, 0x7f12091b invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -1715,7 +1715,7 @@ move-result-object p2 - const v0, 0x7f120ded + const v0, 0x7f120dee :goto_1 invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -1749,7 +1749,7 @@ move-result-object p2 - const v0, 0x7f120dec + const v0, 0x7f120ded goto :goto_1 diff --git a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils.smali b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils.smali index 918f780d0d..6e5369fe95 100644 --- a/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils.smali +++ b/com.discord/smali/com/discord/utilities/analytics/AnalyticsUtils.smali @@ -193,7 +193,7 @@ const-string v1, "browser_user_agent" - const-string v2, "Discord-Android/823" + const-string v2, "Discord-Android/824" invoke-static {v1, v2}, Lkotlin/q;->w(Ljava/lang/Object;Ljava/lang/Object;)Lkotlin/Pair; @@ -205,7 +205,7 @@ const-string v1, "client_build_number" - const/16 v2, 0x337 + const/16 v2, 0x338 invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -221,7 +221,7 @@ const-string v1, "client_version" - const-string v2, "8.2.3" + const-string v2, "8.2.4" invoke-static {v1, v2}, Lkotlin/q;->w(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 685cba1cda..e1aa96b4fa 100644 --- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali +++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogChangeUtils.smali @@ -1327,9 +1327,9 @@ if-eqz v0, :cond_4 - const v0, 0x7f12070b + const v0, 0x7f12070c - const v1, 0x7f12070a + const v1, 0x7f12070b :goto_0 invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I @@ -1347,9 +1347,9 @@ if-eqz v0, :cond_4 - const v0, 0x7f120709 + const v0, 0x7f12070a - const v1, 0x7f120708 + const v1, 0x7f120709 goto :goto_0 @@ -1362,9 +1362,9 @@ if-eqz v0, :cond_4 - const v0, 0x7f12070e + const v0, 0x7f12070f - const v1, 0x7f12070d + const v1, 0x7f12070e goto :goto_0 @@ -1377,7 +1377,7 @@ if-eqz p1, :cond_4 - const p1, 0x7f120707 + const p1, 0x7f120708 return p1 @@ -1404,7 +1404,7 @@ if-nez p1, :cond_1 - const p1, 0x7f120700 + const p1, 0x7f120701 return p1 @@ -1413,7 +1413,7 @@ if-ne p1, v0, :cond_2 - const p1, 0x7f120701 + const p1, 0x7f120702 return p1 @@ -1442,9 +1442,9 @@ if-eqz v0, :cond_4 - const v0, 0x7f1206ff + const v0, 0x7f120700 - const v1, 0x7f1206fe + const v1, 0x7f1206ff goto :goto_0 @@ -1457,7 +1457,7 @@ if-eqz p1, :cond_4 - const p1, 0x7f120706 + const p1, 0x7f120707 return p1 @@ -1470,9 +1470,9 @@ if-eqz v0, :cond_4 - const v0, 0x7f1206fb + const v0, 0x7f1206fc - const v1, 0x7f1206fa + const v1, 0x7f1206fb goto/16 :goto_0 @@ -1485,7 +1485,7 @@ if-eqz p1, :cond_4 - const p1, 0x7f120711 + const p1, 0x7f120712 return p1 @@ -1546,9 +1546,9 @@ if-eqz v0, :cond_3 - const v0, 0x7f120715 + const v0, 0x7f120716 - const v1, 0x7f120714 + const v1, 0x7f120715 invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I @@ -1565,7 +1565,7 @@ if-eqz p1, :cond_3 - const p1, 0x7f120711 + const p1, 0x7f120712 return p1 @@ -1717,7 +1717,7 @@ return-object p1 :cond_5 - const p1, 0x7f120a07 + const p1, 0x7f120a08 invoke-virtual {p2, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1775,14 +1775,14 @@ if-ne p1, v0, :cond_1 - const p1, 0x7f120733 + const p1, 0x7f120734 return p1 :cond_1 if-nez p1, :cond_2 - const p1, 0x7f120732 + const p1, 0x7f120733 return p1 @@ -1811,7 +1811,7 @@ if-eqz p1, :cond_8 - const p1, 0x7f120723 + const p1, 0x7f120724 return p1 @@ -1824,9 +1824,9 @@ if-eqz v0, :cond_8 - const v0, 0x7f120731 + const v0, 0x7f120732 - const v1, 0x7f120730 + const v1, 0x7f120731 :goto_0 invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableNewValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I @@ -1844,9 +1844,9 @@ if-eqz v0, :cond_8 - const v0, 0x7f12072a + const v0, 0x7f12072b - const v1, 0x7f120729 + const v1, 0x7f12072a goto :goto_0 @@ -1878,12 +1878,12 @@ return v1 :pswitch_0 - const p1, 0x7f12071b + const p1, 0x7f12071c return p1 :pswitch_1 - const p1, 0x7f12071a + const p1, 0x7f12071b return p1 @@ -1924,12 +1924,12 @@ return v1 :pswitch_2 - const p1, 0x7f120721 + const p1, 0x7f120722 return p1 :pswitch_3 - const p1, 0x7f120720 + const p1, 0x7f120721 return p1 @@ -1951,7 +1951,7 @@ if-eqz p1, :cond_8 - const p1, 0x7f120725 + const p1, 0x7f120726 return p1 @@ -1964,7 +1964,7 @@ if-eqz p1, :cond_8 - const p1, 0x7f120722 + const p1, 0x7f120723 return p1 @@ -1977,7 +1977,7 @@ if-eqz p1, :cond_8 - const p1, 0x7f120719 + const p1, 0x7f12071a return p1 @@ -2009,30 +2009,30 @@ return v1 :pswitch_4 - const p1, 0x7f12072f + const p1, 0x7f120730 return p1 :pswitch_5 - const p1, 0x7f12072b - - return p1 - - :pswitch_6 - const p1, 0x7f12072d - - return p1 - - :pswitch_7 const p1, 0x7f12072c return p1 - :pswitch_8 + :pswitch_6 const p1, 0x7f12072e return p1 + :pswitch_7 + const p1, 0x7f12072d + + return p1 + + :pswitch_8 + const p1, 0x7f12072f + + return p1 + :cond_6 new-instance p1, Lkotlin/r; @@ -2051,7 +2051,7 @@ if-eqz p1, :cond_8 - const p1, 0x7f120724 + const p1, 0x7f120725 return p1 @@ -2064,7 +2064,7 @@ if-eqz p1, :cond_8 - const p1, 0x7f120711 + const p1, 0x7f120712 return p1 @@ -2077,9 +2077,9 @@ if-eqz v0, :cond_8 - const v0, 0x7f120727 + const v0, 0x7f120728 - const v1, 0x7f120726 + const v1, 0x7f120727 goto/16 :goto_0 @@ -2092,7 +2092,7 @@ if-eqz p1, :cond_8 - const p1, 0x7f12071f + const p1, 0x7f120720 return p1 @@ -2105,9 +2105,9 @@ if-eqz v0, :cond_8 - const v0, 0x7f120718 + const v0, 0x7f120719 - const v1, 0x7f120717 + const v1, 0x7f120718 goto/16 :goto_0 @@ -2139,17 +2139,17 @@ return v1 :pswitch_9 - const p1, 0x7f12071c + const p1, 0x7f12071d return p1 :pswitch_a - const p1, 0x7f12071e + const p1, 0x7f12071f return p1 :pswitch_b - const p1, 0x7f12071d + const p1, 0x7f12071e return p1 @@ -2262,14 +2262,14 @@ if-ne p1, v0, :cond_1 - const p1, 0x7f12073d + const p1, 0x7f12073e return p1 :cond_1 if-nez p1, :cond_2 - const p1, 0x7f12073c + const p1, 0x7f12073d return p1 @@ -2314,12 +2314,12 @@ if-eqz p1, :cond_4 - const p1, 0x7f120738 + const p1, 0x7f120739 return p1 :cond_4 - const p1, 0x7f120739 + const p1, 0x7f12073a return p1 @@ -2357,12 +2357,12 @@ if-eqz p1, :cond_6 - const p1, 0x7f12073a + const p1, 0x7f12073b return p1 :cond_6 - const p1, 0x7f12073b + const p1, 0x7f12073c return p1 @@ -2384,7 +2384,7 @@ if-eqz p1, :cond_8 - const p1, 0x7f120735 + const p1, 0x7f120736 return p1 @@ -2397,7 +2397,7 @@ if-eqz p1, :cond_8 - const p1, 0x7f120711 + const p1, 0x7f120712 return p1 @@ -2410,7 +2410,7 @@ if-eqz p1, :cond_8 - const p1, 0x7f120734 + const p1, 0x7f120735 return p1 @@ -2768,7 +2768,7 @@ if-eqz p2, :cond_7 - const p2, 0x7f120707 + const p2, 0x7f120708 new-array p3, v1, [Ljava/lang/Object; @@ -2822,7 +2822,7 @@ if-eqz p2, :cond_7 - const p2, 0x7f120706 + const p2, 0x7f120707 new-array p3, v1, [Ljava/lang/Object; @@ -3177,14 +3177,14 @@ if-ne p1, v2, :cond_1 - const p1, 0x7f120756 + const p1, 0x7f120757 return p1 :cond_1 if-nez p1, :cond_2 - const p1, 0x7f120755 + const p1, 0x7f120756 return p1 @@ -3231,12 +3231,12 @@ if-nez p1, :cond_4 - const p1, 0x7f120752 + const p1, 0x7f120753 return p1 :cond_4 - const p1, 0x7f120751 + const p1, 0x7f120752 return p1 @@ -3258,7 +3258,7 @@ if-eqz p1, :cond_9 - const p1, 0x7f12075c + const p1, 0x7f12075d return p1 @@ -3285,14 +3285,14 @@ if-ne p1, v2, :cond_6 - const p1, 0x7f120758 + const p1, 0x7f120759 return p1 :cond_6 if-nez p1, :cond_7 - const p1, 0x7f120757 + const p1, 0x7f120758 return p1 @@ -3321,9 +3321,9 @@ if-eqz v0, :cond_9 - const v0, 0x7f12075a + const v0, 0x7f12075b - const v1, 0x7f120759 + const v1, 0x7f12075a invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I @@ -3340,7 +3340,7 @@ if-eqz p1, :cond_9 - const p1, 0x7f12075b + const p1, 0x7f12075c return p1 @@ -3353,7 +3353,7 @@ if-eqz p1, :cond_9 - const p1, 0x7f120711 + const p1, 0x7f120712 return p1 @@ -3389,112 +3389,112 @@ return p1 :sswitch_0 - const p1, 0x7f120944 - - return p1 - - :sswitch_1 - const p1, 0x7f120950 - - return p1 - - :sswitch_2 - const p1, 0x7f12094b - - return p1 - - :sswitch_3 - const p1, 0x7f120947 - - return p1 - - :sswitch_4 - const p1, 0x7f1202fd - - return p1 - - :sswitch_5 - const p1, 0x7f120eae - - return p1 - - :sswitch_6 - const p1, 0x7f1209a7 - - return p1 - - :sswitch_7 - const p1, 0x7f1203fd - - return p1 - - :sswitch_8 - const p1, 0x7f1209b1 - - return p1 - - :sswitch_9 - const p1, 0x7f120d4d - - return p1 - - :sswitch_a - const p1, 0x7f120376 - - return p1 - - :sswitch_b - const p1, 0x7f120eab - - return p1 - - :sswitch_c - const p1, 0x7f12096c - - return p1 - - :sswitch_d - const p1, 0x7f120bda - - return p1 - - :sswitch_e - const p1, 0x7f1201f3 - - return p1 - - :sswitch_f - const p1, 0x7f12048b - - return p1 - - :sswitch_10 const p1, 0x7f120945 return p1 - :sswitch_11 - const p1, 0x7f120ce5 + :sswitch_1 + const p1, 0x7f120951 return p1 - :sswitch_12 - const p1, 0x7f120ce4 + :sswitch_2 + const p1, 0x7f12094c return p1 - :sswitch_13 + :sswitch_3 + const p1, 0x7f120948 + + return p1 + + :sswitch_4 + const p1, 0x7f1202fe + + return p1 + + :sswitch_5 + const p1, 0x7f120eaf + + return p1 + + :sswitch_6 + const p1, 0x7f1209a8 + + return p1 + + :sswitch_7 + const p1, 0x7f1203fe + + return p1 + + :sswitch_8 + const p1, 0x7f1209b2 + + return p1 + + :sswitch_9 + const p1, 0x7f120d4e + + return p1 + + :sswitch_a + const p1, 0x7f120377 + + return p1 + + :sswitch_b + const p1, 0x7f120eac + + return p1 + + :sswitch_c + const p1, 0x7f12096d + + return p1 + + :sswitch_d const p1, 0x7f120bdb return p1 + :sswitch_e + const p1, 0x7f1201f4 + + return p1 + + :sswitch_f + const p1, 0x7f12048c + + return p1 + + :sswitch_10 + const p1, 0x7f120946 + + return p1 + + :sswitch_11 + const p1, 0x7f120ce6 + + return p1 + + :sswitch_12 + const p1, 0x7f120ce5 + + return p1 + + :sswitch_13 + const p1, 0x7f120bdc + + return p1 + :sswitch_14 - const p1, 0x7f120ba1 + const p1, 0x7f120ba2 return p1 :sswitch_15 - const p1, 0x7f120f6f + const p1, 0x7f120f70 return p1 @@ -3504,7 +3504,7 @@ return p1 :sswitch_17 - const p1, 0x7f12094d + const p1, 0x7f12094e return p1 @@ -3517,12 +3517,12 @@ if-ne p1, p2, :cond_0 - const p1, 0x7f120940 + const p1, 0x7f120941 return p1 :cond_0 - const p1, 0x7f120942 + const p1, 0x7f120943 return p1 @@ -3532,17 +3532,17 @@ return p1 :sswitch_1a - const p1, 0x7f120222 + const p1, 0x7f120223 return p1 :sswitch_1b - const p1, 0x7f120910 + const p1, 0x7f120911 return p1 :sswitch_1c - const p1, 0x7f1203c3 + const p1, 0x7f1203c4 return p1 @@ -3674,7 +3674,7 @@ if-eqz p1, :cond_7 - const p1, 0x7f12074e + const p1, 0x7f12074f return p1 @@ -3687,19 +3687,19 @@ if-eqz v0, :cond_7 - const v0, 0x7f120747 + const v0, 0x7f120748 invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; move-result-object v3 - const v0, 0x7f120748 + const v0, 0x7f120749 invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; move-result-object v4 - const v0, 0x7f120749 + const v0, 0x7f12074a invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -3744,14 +3744,14 @@ if-ne p1, v2, :cond_1 - const p1, 0x7f120746 + const p1, 0x7f120747 return p1 :cond_1 if-nez p1, :cond_2 - const p1, 0x7f120745 + const p1, 0x7f120746 return p1 @@ -3794,14 +3794,14 @@ if-ne p1, v2, :cond_4 - const p1, 0x7f120743 + const p1, 0x7f120744 return p1 :cond_4 if-nez p1, :cond_5 - const p1, 0x7f120742 + const p1, 0x7f120743 return p1 @@ -3830,7 +3830,7 @@ if-eqz p1, :cond_7 - const p1, 0x7f12074d + const p1, 0x7f12074e return p1 @@ -3843,7 +3843,7 @@ if-eqz p1, :cond_7 - const p1, 0x7f120711 + const p1, 0x7f120712 return p1 @@ -3856,7 +3856,7 @@ if-eqz p1, :cond_7 - const p1, 0x7f12074b + const p1, 0x7f12074c return p1 @@ -3923,7 +3923,7 @@ if-eqz p1, :cond_5 - const p1, 0x7f12075f + const p1, 0x7f120760 return p1 @@ -3936,9 +3936,9 @@ if-eqz v0, :cond_5 - const v0, 0x7f120765 + const v0, 0x7f120766 - const v1, 0x7f120764 + const v1, 0x7f120765 :goto_0 invoke-direct {p0, p1, v0, v1}, Lcom/discord/utilities/auditlogs/AuditLogChangeUtils;->getNullableOldValueString(Lcom/discord/models/domain/ModelAuditLogEntry$Change;II)I @@ -3956,7 +3956,7 @@ if-eqz p1, :cond_5 - const p1, 0x7f120711 + const p1, 0x7f120712 return p1 @@ -3969,9 +3969,9 @@ if-eqz v0, :cond_5 - const v0, 0x7f120761 + const v0, 0x7f120762 - const v1, 0x7f120760 + const v1, 0x7f120761 goto :goto_0 diff --git a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali index f103d606b0..f8f0520512 100644 --- a/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali +++ b/com.discord/smali/com/discord/utilities/auditlogs/AuditLogUtils.smali @@ -103,117 +103,117 @@ goto/16 :goto_0 :pswitch_0 - const p1, 0x7f120713 + const p1, 0x7f120714 return p1 :pswitch_1 - const p1, 0x7f120716 + const p1, 0x7f120717 return p1 :pswitch_2 - const p1, 0x7f120712 + const p1, 0x7f120713 return p1 :pswitch_3 - const p1, 0x7f120763 + const p1, 0x7f120764 return p1 :pswitch_4 - const p1, 0x7f120766 + const p1, 0x7f120767 return p1 :pswitch_5 - const p1, 0x7f120762 + const p1, 0x7f120763 return p1 :pswitch_6 - const p1, 0x7f120737 + const p1, 0x7f120738 return p1 :pswitch_7 - const p1, 0x7f12073e + const p1, 0x7f12073f return p1 :pswitch_8 - const p1, 0x7f120736 + const p1, 0x7f120737 return p1 :pswitch_9 - const p1, 0x7f120754 + const p1, 0x7f120755 return p1 :pswitch_a - const p1, 0x7f12075d + const p1, 0x7f12075e return p1 :pswitch_b - const p1, 0x7f120753 + const p1, 0x7f120754 return p1 :pswitch_c - const p1, 0x7f12074c + const p1, 0x7f12074d return p1 :pswitch_d - const p1, 0x7f12074f + const p1, 0x7f120750 return p1 :pswitch_e - const p1, 0x7f120741 + const p1, 0x7f120742 return p1 :pswitch_f - const p1, 0x7f120740 + const p1, 0x7f120741 return p1 :pswitch_10 - const p1, 0x7f12074a + const p1, 0x7f12074b return p1 :pswitch_11 - const p1, 0x7f120744 + const p1, 0x7f120745 return p1 :pswitch_12 - const p1, 0x7f120703 - - return p1 - - :pswitch_13 const p1, 0x7f120704 return p1 + :pswitch_13 + const p1, 0x7f120705 + + return p1 + :pswitch_14 - const p1, 0x7f120702 + const p1, 0x7f120703 return p1 :pswitch_15 - const p1, 0x7f1206fd + const p1, 0x7f1206fe return p1 :pswitch_16 - const p1, 0x7f12070f + const p1, 0x7f120710 return p1 @@ -293,17 +293,17 @@ if-eq p1, v0, :cond_3 - const p1, 0x7f12070c + const p1, 0x7f12070d return p1 :cond_3 - const p1, 0x7f1206fc + const p1, 0x7f1206fd return p1 :cond_4 - const p1, 0x7f120710 + const p1, 0x7f120711 return p1 @@ -323,12 +323,12 @@ return p1 :cond_7 - const p1, 0x7f120750 + const p1, 0x7f120751 return p1 :cond_8 - const p1, 0x7f120728 + const p1, 0x7f120729 return p1 @@ -944,7 +944,7 @@ if-gez v5, :cond_0 - const v0, 0x7f12075e + const v0, 0x7f12075f const/4 v1, 0x2 @@ -1034,137 +1034,137 @@ return p1 :pswitch_0 - const p1, 0x7f1206e7 - - return p1 - - :pswitch_1 const p1, 0x7f1206e8 return p1 - :pswitch_2 - const p1, 0x7f1206e6 - - return p1 - - :pswitch_3 - const p1, 0x7f1206f8 - - return p1 - - :pswitch_4 - const p1, 0x7f1206f9 - - return p1 - - :pswitch_5 - const p1, 0x7f1206f7 - - return p1 - - :pswitch_6 - const p1, 0x7f1206eb - - return p1 - - :pswitch_7 - const p1, 0x7f1206ec - - return p1 - - :pswitch_8 - const p1, 0x7f1206ea - - return p1 - - :pswitch_9 - const p1, 0x7f1206f5 - - return p1 - - :pswitch_a - const p1, 0x7f1206f6 - - return p1 - - :pswitch_b - const p1, 0x7f1206f4 - - return p1 - - :pswitch_c - const p1, 0x7f1206f1 - - return p1 - - :pswitch_d - const p1, 0x7f1206f2 - - return p1 - - :pswitch_e - const p1, 0x7f1206ee - - return p1 - - :pswitch_f - const p1, 0x7f1206ed - - return p1 - - :pswitch_10 - const p1, 0x7f1206f0 - - return p1 - - :pswitch_11 - const p1, 0x7f1206ef - - return p1 - - :pswitch_12 - const p1, 0x7f1206e3 - - return p1 - - :pswitch_13 - const p1, 0x7f1206e4 - - return p1 - - :pswitch_14 - const p1, 0x7f1206e2 - - return p1 - - :pswitch_15 - const p1, 0x7f1206e1 - - return p1 - - :pswitch_16 - const p1, 0x7f1206e5 - - return p1 - - :pswitch_17 - const p1, 0x7f1206e0 - - return p1 - - :pswitch_18 + :pswitch_1 const p1, 0x7f1206e9 return p1 + :pswitch_2 + const p1, 0x7f1206e7 + + return p1 + + :pswitch_3 + const p1, 0x7f1206f9 + + return p1 + + :pswitch_4 + const p1, 0x7f1206fa + + return p1 + + :pswitch_5 + const p1, 0x7f1206f8 + + return p1 + + :pswitch_6 + const p1, 0x7f1206ec + + return p1 + + :pswitch_7 + const p1, 0x7f1206ed + + return p1 + + :pswitch_8 + const p1, 0x7f1206eb + + return p1 + + :pswitch_9 + const p1, 0x7f1206f6 + + return p1 + + :pswitch_a + const p1, 0x7f1206f7 + + return p1 + + :pswitch_b + const p1, 0x7f1206f5 + + return p1 + + :pswitch_c + const p1, 0x7f1206f2 + + return p1 + + :pswitch_d + const p1, 0x7f1206f3 + + return p1 + + :pswitch_e + const p1, 0x7f1206ef + + return p1 + + :pswitch_f + const p1, 0x7f1206ee + + return p1 + + :pswitch_10 + const p1, 0x7f1206f1 + + return p1 + + :pswitch_11 + const p1, 0x7f1206f0 + + return p1 + + :pswitch_12 + const p1, 0x7f1206e4 + + return p1 + + :pswitch_13 + const p1, 0x7f1206e5 + + return p1 + + :pswitch_14 + const p1, 0x7f1206e3 + + return p1 + + :pswitch_15 + const p1, 0x7f1206e2 + + return p1 + + :pswitch_16 + const p1, 0x7f1206e6 + + return p1 + + :pswitch_17 + const p1, 0x7f1206e1 + + return p1 + + :pswitch_18 + const p1, 0x7f1206ea + + return p1 + :pswitch_19 - const p1, 0x7f12076e + const p1, 0x7f12076f return p1 :cond_0 - const p1, 0x7f1206f3 + const p1, 0x7f1206f4 return p1 diff --git a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$2.smali b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$2.smali index 05146fcef7..c2c985ba60 100644 --- a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$2.smali +++ b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$ensurePlayServicesAvailable$2.smali @@ -46,7 +46,7 @@ const-string v1, "missing_dependencies" - const v2, 0x7f1202dd + const v2, 0x7f1202de invoke-direct {v0, v2, v1}, Lcom/discord/utilities/captcha/CaptchaHelper$Failure;->(ILjava/lang/String;)V diff --git a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptcha$2.smali b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptcha$2.smali index 897e6008b6..17a7ce6bd6 100644 --- a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptcha$2.smali +++ b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper$showCaptcha$2.smali @@ -46,7 +46,7 @@ const-string v1, "expired" - const v2, 0x7f1202dc + const v2, 0x7f1202dd invoke-direct {v0, v2, v1}, Lcom/discord/utilities/captcha/CaptchaHelper$Failure;->(ILjava/lang/String;)V diff --git a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper.smali b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper.smali index 89eca93407..65dd26f1c9 100644 --- a/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper.smali +++ b/com.discord/smali/com/discord/utilities/captcha/CaptchaHelper.smali @@ -135,7 +135,7 @@ :cond_1 new-instance p1, Lcom/discord/utilities/captcha/CaptchaHelper$Failure; - const p2, 0x7f1202de + const p2, 0x7f1202df const-string p3, "unsupported_device" @@ -237,19 +237,19 @@ invoke-direct {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V - const v2, 0x7f1202e1 + const v2, 0x7f1202e2 invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; move-result-object v1 - const v2, 0x7f1202e2 + const v2, 0x7f1202e3 invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; move-result-object v1 - const v2, 0x7f1202e0 + const v2, 0x7f1202e1 new-instance v3, Lcom/discord/utilities/captcha/CaptchaHelper$showCaptchaHelpDialog$$inlined$let$lambda$1; @@ -261,7 +261,7 @@ move-result-object p1 - const p2, 0x7f1202d4 + const p2, 0x7f1202d5 const/4 v1, 0x2 diff --git a/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali b/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali index fd71e5d036..c348a72053 100644 --- a/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali +++ b/com.discord/smali/com/discord/utilities/channel/ChannelUtils.smali @@ -287,7 +287,7 @@ :pswitch_1 if-eqz v0, :cond_0 - const p2, 0x7f1206be + const p2, 0x7f1206bf invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -301,7 +301,7 @@ :pswitch_2 if-eqz v0, :cond_1 - const p2, 0x7f120860 + const p2, 0x7f120861 invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -321,7 +321,7 @@ if-eqz v0, :cond_2 - const p2, 0x7f120430 + const p2, 0x7f120431 invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -345,7 +345,7 @@ if-eqz v0, :cond_3 - const p2, 0x7f12085f + const p2, 0x7f120860 invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/utilities/collections/LeastRecentlyAddedSet.smali b/com.discord/smali/com/discord/utilities/collections/LeastRecentlyAddedSet.smali index 1a5759c52f..b1aca69a23 100644 --- a/com.discord/smali/com/discord/utilities/collections/LeastRecentlyAddedSet.smali +++ b/com.discord/smali/com/discord/utilities/collections/LeastRecentlyAddedSet.smali @@ -370,7 +370,7 @@ .method public final toArray()[Ljava/lang/Object; .locals 1 - invoke-static {p0}, Lkotlin/jvm/internal/f;->k(Ljava/util/Collection;)[Ljava/lang/Object; + invoke-static {p0}, Lkotlin/jvm/internal/f;->l(Ljava/util/Collection;)[Ljava/lang/Object; move-result-object v0 diff --git a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection.smali b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection.smali index ee41b4d7bb..034d083c31 100644 --- a/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection.smali +++ b/com.discord/smali/com/discord/utilities/collections/ShallowPartitionCollection.smali @@ -644,7 +644,7 @@ .method public toArray()[Ljava/lang/Object; .locals 1 - invoke-static {p0}, Lkotlin/jvm/internal/f;->k(Ljava/util/Collection;)[Ljava/lang/Object; + invoke-static {p0}, Lkotlin/jvm/internal/f;->l(Ljava/util/Collection;)[Ljava/lang/Object; move-result-object v0 diff --git a/com.discord/smali/com/discord/utilities/collections/SparseMutableList.smali b/com.discord/smali/com/discord/utilities/collections/SparseMutableList.smali index 0ba561ff7b..7b590fda73 100644 --- a/com.discord/smali/com/discord/utilities/collections/SparseMutableList.smali +++ b/com.discord/smali/com/discord/utilities/collections/SparseMutableList.smali @@ -1504,7 +1504,7 @@ .method public final toArray()[Ljava/lang/Object; .locals 1 - invoke-static {p0}, Lkotlin/jvm/internal/f;->k(Ljava/util/Collection;)[Ljava/lang/Object; + invoke-static {p0}, Lkotlin/jvm/internal/f;->l(Ljava/util/Collection;)[Ljava/lang/Object; move-result-object v0 diff --git a/com.discord/smali/com/discord/utilities/error/Error.smali b/com.discord/smali/com/discord/utilities/error/Error.smali index 700aab63c5..e87b8d152c 100644 --- a/com.discord/smali/com/discord/utilities/error/Error.smali +++ b/com.discord/smali/com/discord/utilities/error/Error.smali @@ -734,7 +734,7 @@ packed-switch v0, :pswitch_data_0 - const v0, 0x7f1209c4 + const v0, 0x7f1209c5 :goto_0 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -749,39 +749,39 @@ return-object p1 :pswitch_0 - const v0, 0x7f120858 + const v0, 0x7f120859 goto :goto_0 :pswitch_1 - const v0, 0x7f1209c3 + const v0, 0x7f1209c4 goto :goto_0 :pswitch_2 - const v0, 0x7f1209c0 + const v0, 0x7f1209c1 goto :goto_0 :pswitch_3 - const v0, 0x7f120df2 + const v0, 0x7f120df3 goto :goto_0 :pswitch_4 - const v0, 0x7f1209c2 + const v0, 0x7f1209c3 goto :goto_0 :pswitch_5 - const v0, 0x7f1209be + const v0, 0x7f1209bf goto :goto_0 :pswitch_6 iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response; - const v1, 0x7f1209bb + const v1, 0x7f1209bc :goto_2 invoke-static {v0, p1, v1}, Lcom/discord/utilities/error/Error$Response;->access$100(Lcom/discord/utilities/error/Error$Response;Landroid/content/Context;I)Ljava/lang/String; @@ -793,22 +793,22 @@ :pswitch_7 iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response; - const v1, 0x7f1209bf + const v1, 0x7f1209c0 goto :goto_2 :pswitch_8 - const v0, 0x7f120bce + const v0, 0x7f120bcf goto :goto_0 :pswitch_9 - const v0, 0x7f1209bd + const v0, 0x7f1209be goto :goto_0 :pswitch_a - const v0, 0x7f1209bc + const v0, 0x7f1209bd goto :goto_0 @@ -816,7 +816,7 @@ :pswitch_b iget-object v0, p0, Lcom/discord/utilities/error/Error;->response:Lcom/discord/utilities/error/Error$Response; - const v1, 0x7f1209c1 + const v1, 0x7f1209c2 goto :goto_2 diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$FCMMessagingService.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$FCMMessagingService.smali index 8faa5dc4d9..900c17557f 100644 --- a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$FCMMessagingService.smali +++ b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$FCMMessagingService.smali @@ -188,7 +188,7 @@ sget-object v0, Lcom/discord/utilities/fcm/NotificationClient;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient; - invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient;->getSettings$app_productionExternalRelease()Lcom/discord/utilities/fcm/NotificationClient$Settings; + invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient;->getSettings$app_productionExternalRelease()Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; move-result-object v0 @@ -261,7 +261,7 @@ if-eqz v7, :cond_c - invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->isAuthed()Z + invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isAuthed()Z move-result v7 @@ -278,7 +278,7 @@ if-eqz v1, :cond_a - invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->isEnabled()Z + invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isEnabled()Z move-result v1 @@ -286,7 +286,7 @@ sget-object v1, Lcom/discord/utilities/fcm/NotificationRenderer;->INSTANCE:Lcom/discord/utilities/fcm/NotificationRenderer; - invoke-virtual {v1, v6, p1, v0}, Lcom/discord/utilities/fcm/NotificationRenderer;->display(Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;Lcom/discord/utilities/fcm/NotificationClient$Settings;)V + invoke-virtual {v1, v6, p1, v0}, Lcom/discord/utilities/fcm/NotificationRenderer;->display(Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)V return-void @@ -299,7 +299,7 @@ if-nez v1, :cond_b - invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->isEnabledInApp()Z + invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isEnabledInApp()Z move-result v0 @@ -368,7 +368,7 @@ const-string v4, "isAuthed" - invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->isAuthed()Z + invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isAuthed()Z move-result v0 diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$Settings.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$Settings.smali index 707afc53a5..d686d0c7f4 100644 --- a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$Settings.smali +++ b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$Settings.smali @@ -14,6 +14,17 @@ # instance fields +.field private final channelPermissions:Ljava/util/Map; + .annotation system Ldalvik/annotation/Signature; + value = { + "Ljava/util/Map<", + "Ljava/lang/Long;", + "Ljava/lang/Integer;", + ">;" + } + .end annotation +.end field + .field private final isAuthed:Z .field private final isDisableBlink:Z @@ -30,16 +41,6 @@ .field private final locale:Ljava/lang/String; -.field private final sendBlockedChannels:Ljava/util/Set; - .annotation system Ldalvik/annotation/Signature; - value = { - "Ljava/util/Set<", - "Ljava/lang/Long;", - ">;" - } - .end annotation -.end field - .field private final token:Ljava/lang/String; @@ -71,20 +72,21 @@ move-object v0, p0 - invoke-direct/range {v0 .. v11}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->(ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + invoke-direct/range {v0 .. v11}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->(ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V return-void .end method -.method public constructor (ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;)V +.method public constructor (ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Map;)V .locals 1 .annotation system Ldalvik/annotation/Signature; value = { "(ZZZZZZ", "Ljava/lang/String;", "Ljava/lang/String;", - "Ljava/util/Set<", + "Ljava/util/Map<", "Ljava/lang/Long;", + "Ljava/lang/Integer;", ">;)V" } .end annotation @@ -93,7 +95,7 @@ invoke-static {p8, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V - const-string v0, "sendBlockedChannels" + const-string v0, "channelPermissions" invoke-static {p9, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V @@ -115,7 +117,7 @@ iput-object p8, p0, Lcom/discord/utilities/fcm/NotificationClient$Settings;->locale:Ljava/lang/String; - iput-object p9, p0, Lcom/discord/utilities/fcm/NotificationClient$Settings;->sendBlockedChannels:Ljava/util/Set; + iput-object p9, p0, Lcom/discord/utilities/fcm/NotificationClient$Settings;->channelPermissions:Ljava/util/Map; iget-object p1, p0, Lcom/discord/utilities/fcm/NotificationClient$Settings;->token:Ljava/lang/String; @@ -134,8 +136,8 @@ return-void .end method -.method public synthetic constructor (ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - .locals 10 +.method public synthetic constructor (ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + .locals 9 move/from16 v0, p10 @@ -205,47 +207,43 @@ if-eqz v7, :cond_5 - const/4 v7, 0x0 - goto :goto_5 :cond_5 - move/from16 v7, p6 + move v3, p6 :goto_5 - and-int/lit8 v8, v0, 0x40 + and-int/lit8 v7, v0, 0x40 - if-eqz v8, :cond_6 + if-eqz v7, :cond_6 - const/4 v8, 0x0 + const/4 v7, 0x0 goto :goto_6 :cond_6 - move-object/from16 v8, p7 + move-object/from16 v7, p7 :goto_6 - and-int/lit16 v9, v0, 0x80 + and-int/lit16 v8, v0, 0x80 - if-eqz v9, :cond_7 + if-eqz v8, :cond_7 - const-string v9, "" + const-string v8, "" goto :goto_7 :cond_7 - move-object/from16 v9, p8 + move-object/from16 v8, p8 :goto_7 and-int/lit16 v0, v0, 0x100 if-eqz v0, :cond_8 - new-instance v0, Ljava/util/HashSet; + invoke-static {}, Lkotlin/a/ab;->emptyMap()Ljava/util/Map; - invoke-direct {v0, v3}, Ljava/util/HashSet;->(I)V - - check-cast v0, Ljava/util/Set; + move-result-object v0 goto :goto_8 @@ -263,22 +261,22 @@ move p5, v5 - move/from16 p6, v6 + move p6, v6 - move/from16 p7, v7 + move/from16 p7, v3 - move-object/from16 p8, v8 + move-object/from16 p8, v7 - move-object/from16 p9, v9 + move-object/from16 p9, v8 move-object/from16 p10, v0 - invoke-direct/range {p1 .. p10}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->(ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;)V + invoke-direct/range {p1 .. p10}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->(ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Map;)V return-void .end method -.method public static synthetic copy$default(Lcom/discord/utilities/fcm/NotificationClient$Settings;ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;ILjava/lang/Object;)Lcom/discord/utilities/fcm/NotificationClient$Settings; +.method public static synthetic copy$default(Lcom/discord/utilities/fcm/NotificationClient$Settings;ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)Lcom/discord/utilities/fcm/NotificationClient$Settings; .locals 10 move-object v0, p0 @@ -385,7 +383,7 @@ if-eqz v1, :cond_8 - iget-object v1, v0, Lcom/discord/utilities/fcm/NotificationClient$Settings;->sendBlockedChannels:Ljava/util/Set; + iget-object v1, v0, Lcom/discord/utilities/fcm/NotificationClient$Settings;->channelPermissions:Ljava/util/Map; goto :goto_8 @@ -411,13 +409,19 @@ move-object/from16 p9, v1 - invoke-virtual/range {p0 .. p9}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->copy(ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;)Lcom/discord/utilities/fcm/NotificationClient$Settings; + invoke-virtual/range {p0 .. p9}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->copy(ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Map;)Lcom/discord/utilities/fcm/NotificationClient$Settings; move-result-object v0 return-object v0 .end method +.method public static synthetic isAuthed$annotations()V + .locals 0 + + return-void +.end method + # virtual methods .method public final component1()Z @@ -484,31 +488,33 @@ return-object v0 .end method -.method public final component9()Ljava/util/Set; +.method public final component9()Ljava/util/Map; .locals 1 .annotation system Ldalvik/annotation/Signature; value = { "()", - "Ljava/util/Set<", + "Ljava/util/Map<", "Ljava/lang/Long;", + "Ljava/lang/Integer;", ">;" } .end annotation - iget-object v0, p0, Lcom/discord/utilities/fcm/NotificationClient$Settings;->sendBlockedChannels:Ljava/util/Set; + iget-object v0, p0, Lcom/discord/utilities/fcm/NotificationClient$Settings;->channelPermissions:Ljava/util/Map; return-object v0 .end method -.method public final copy(ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;)Lcom/discord/utilities/fcm/NotificationClient$Settings; +.method public final copy(ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Map;)Lcom/discord/utilities/fcm/NotificationClient$Settings; .locals 11 .annotation system Ldalvik/annotation/Signature; value = { "(ZZZZZZ", "Ljava/lang/String;", "Ljava/lang/String;", - "Ljava/util/Set<", + "Ljava/util/Map<", "Ljava/lang/Long;", + "Ljava/lang/Integer;", ">;)", "Lcom/discord/utilities/fcm/NotificationClient$Settings;" } @@ -520,7 +526,7 @@ invoke-static {v9, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V - const-string v0, "sendBlockedChannels" + const-string v0, "channelPermissions" move-object/from16 v10, p9 @@ -544,7 +550,7 @@ move-object/from16 v8, p7 - invoke-direct/range {v1 .. v10}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->(ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;)V + invoke-direct/range {v1 .. v10}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->(ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Map;)V return-object v0 .end method @@ -680,9 +686,9 @@ if-eqz v1, :cond_6 - iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationClient$Settings;->sendBlockedChannels:Ljava/util/Set; + iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationClient$Settings;->channelPermissions:Ljava/util/Map; - iget-object p1, p1, Lcom/discord/utilities/fcm/NotificationClient$Settings;->sendBlockedChannels:Ljava/util/Set; + iget-object p1, p1, Lcom/discord/utilities/fcm/NotificationClient$Settings;->channelPermissions:Ljava/util/Map; invoke-static {v1, p1}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z @@ -700,26 +706,27 @@ return v0 .end method -.method public final getLocale()Ljava/lang/String; - .locals 1 - - iget-object v0, p0, Lcom/discord/utilities/fcm/NotificationClient$Settings;->locale:Ljava/lang/String; - - return-object v0 -.end method - -.method public final getSendBlockedChannels()Ljava/util/Set; +.method public final getChannelPermissions()Ljava/util/Map; .locals 1 .annotation system Ldalvik/annotation/Signature; value = { "()", - "Ljava/util/Set<", + "Ljava/util/Map<", "Ljava/lang/Long;", + "Ljava/lang/Integer;", ">;" } .end annotation - iget-object v0, p0, Lcom/discord/utilities/fcm/NotificationClient$Settings;->sendBlockedChannels:Ljava/util/Set; + iget-object v0, p0, Lcom/discord/utilities/fcm/NotificationClient$Settings;->channelPermissions:Ljava/util/Map; + + return-object v0 +.end method + +.method public final getLocale()Ljava/lang/String; + .locals 1 + + iget-object v0, p0, Lcom/discord/utilities/fcm/NotificationClient$Settings;->locale:Ljava/lang/String; return-object v0 .end method @@ -842,7 +849,7 @@ mul-int/lit8 v0, v0, 0x1f - iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationClient$Settings;->sendBlockedChannels:Ljava/util/Set; + iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationClient$Settings;->channelPermissions:Ljava/util/Map; if-eqz v1, :cond_8 @@ -912,6 +919,105 @@ return v0 .end method +.method public final toNewSettings()Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; + .locals 13 + + iget-boolean v1, p0, Lcom/discord/utilities/fcm/NotificationClient$Settings;->isEnabled:Z + + iget-boolean v2, p0, Lcom/discord/utilities/fcm/NotificationClient$Settings;->isEnabledInApp:Z + + iget-boolean v3, p0, Lcom/discord/utilities/fcm/NotificationClient$Settings;->isWake:Z + + iget-boolean v4, p0, Lcom/discord/utilities/fcm/NotificationClient$Settings;->isDisableBlink:Z + + iget-boolean v5, p0, Lcom/discord/utilities/fcm/NotificationClient$Settings;->isDisableSound:Z + + iget-boolean v6, p0, Lcom/discord/utilities/fcm/NotificationClient$Settings;->isDisableVibrate:Z + + iget-object v8, p0, Lcom/discord/utilities/fcm/NotificationClient$Settings;->locale:Ljava/lang/String; + + iget-object v7, p0, Lcom/discord/utilities/fcm/NotificationClient$Settings;->token:Ljava/lang/String; + + iget-object v0, p0, Lcom/discord/utilities/fcm/NotificationClient$Settings;->channelPermissions:Ljava/util/Map; + + new-instance v9, Ljava/util/LinkedHashMap; + + invoke-direct {v9}, Ljava/util/LinkedHashMap;->()V + + invoke-interface {v0}, Ljava/util/Map;->entrySet()Ljava/util/Set; + + move-result-object v0 + + invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator; + + move-result-object v0 + + :cond_0 + :goto_0 + invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z + + move-result v10 + + if-eqz v10, :cond_1 + + invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object; + + move-result-object v10 + + check-cast v10, Ljava/util/Map$Entry; + + invoke-interface {v10}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object; + + move-result-object v11 + + check-cast v11, Ljava/lang/Number; + + invoke-virtual {v11}, Ljava/lang/Number;->intValue()I + + move-result v11 + + const/16 v12, 0x800 + + invoke-static {v11}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + + move-result-object v11 + + invoke-static {v12, v11}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z + + move-result v11 + + xor-int/lit8 v11, v11, 0x1 + + if-eqz v11, :cond_0 + + invoke-interface {v10}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object; + + move-result-object v11 + + invoke-interface {v10}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object; + + move-result-object v10 + + invoke-virtual {v9, v11, v10}, Ljava/util/LinkedHashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + + goto :goto_0 + + :cond_1 + check-cast v9, Ljava/util/Map; + + invoke-interface {v9}, Ljava/util/Map;->keySet()Ljava/util/Set; + + move-result-object v9 + + new-instance v10, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; + + move-object v0, v10 + + invoke-direct/range {v0 .. v9}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->(ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;)V + + return-object v10 +.end method + .method public final toString()Ljava/lang/String; .locals 2 @@ -981,11 +1087,11 @@ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v1, ", sendBlockedChannels=" + const-string v1, ", channelPermissions=" invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationClient$Settings;->sendBlockedChannels:Ljava/util/Set; + iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationClient$Settings;->channelPermissions:Ljava/util/Map; invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$SettingsDeprecated.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$SettingsV2.smali similarity index 67% rename from com.discord/smali/com/discord/utilities/fcm/NotificationClient$SettingsDeprecated.smali rename to com.discord/smali/com/discord/utilities/fcm/NotificationClient$SettingsV2.smali index 38fc88b6dc..8b9ef0e8da 100644 --- a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$SettingsDeprecated.smali +++ b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$SettingsV2.smali @@ -1,4 +1,4 @@ -.class public final Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated; +.class public final Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; .super Ljava/lang/Object; @@ -9,22 +9,11 @@ .annotation system Ldalvik/annotation/InnerClass; accessFlags = 0x19 - name = "SettingsDeprecated" + name = "SettingsV2" .end annotation # instance fields -.field private final channelPermissions:Ljava/util/Map; - .annotation system Ldalvik/annotation/Signature; - value = { - "Ljava/util/Map<", - "Ljava/lang/Long;", - "Ljava/lang/Integer;", - ">;" - } - .end annotation -.end field - .field private final isAuthed:Z .field private final isDisableBlink:Z @@ -41,6 +30,16 @@ .field private final locale:Ljava/lang/String; +.field private final sendBlockedChannels:Ljava/util/Set; + .annotation system Ldalvik/annotation/Signature; + value = { + "Ljava/util/Set<", + "Ljava/lang/Long;", + ">;" + } + .end annotation +.end field + .field private final token:Ljava/lang/String; @@ -72,21 +71,20 @@ move-object v0, p0 - invoke-direct/range {v0 .. v11}, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->(ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + invoke-direct/range {v0 .. v11}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->(ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V return-void .end method -.method public constructor (ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Map;)V +.method public constructor (ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;)V .locals 1 .annotation system Ldalvik/annotation/Signature; value = { "(ZZZZZZ", "Ljava/lang/String;", "Ljava/lang/String;", - "Ljava/util/Map<", + "Ljava/util/Set<", "Ljava/lang/Long;", - "Ljava/lang/Integer;", ">;)V" } .end annotation @@ -95,31 +93,31 @@ invoke-static {p8, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V - const-string v0, "channelPermissions" + const-string v0, "sendBlockedChannels" invoke-static {p9, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V invoke-direct {p0}, Ljava/lang/Object;->()V - iput-boolean p1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isEnabled:Z + iput-boolean p1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isEnabled:Z - iput-boolean p2, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isEnabledInApp:Z + iput-boolean p2, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isEnabledInApp:Z - iput-boolean p3, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isWake:Z + iput-boolean p3, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isWake:Z - iput-boolean p4, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isDisableBlink:Z + iput-boolean p4, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableBlink:Z - iput-boolean p5, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isDisableSound:Z + iput-boolean p5, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableSound:Z - iput-boolean p6, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isDisableVibrate:Z + iput-boolean p6, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableVibrate:Z - iput-object p7, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->token:Ljava/lang/String; + iput-object p7, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->token:Ljava/lang/String; - iput-object p8, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->locale:Ljava/lang/String; + iput-object p8, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->locale:Ljava/lang/String; - iput-object p9, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->channelPermissions:Ljava/util/Map; + iput-object p9, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->sendBlockedChannels:Ljava/util/Set; - iget-object p1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->token:Ljava/lang/String; + iget-object p1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->token:Ljava/lang/String; if-eqz p1, :cond_0 @@ -131,13 +129,13 @@ const/4 p1, 0x0 :goto_0 - iput-boolean p1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isAuthed:Z + iput-boolean p1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isAuthed:Z return-void .end method -.method public synthetic constructor (ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Map;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - .locals 9 +.method public synthetic constructor (ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + .locals 10 move/from16 v0, p10 @@ -207,43 +205,47 @@ if-eqz v7, :cond_5 + const/4 v7, 0x0 + goto :goto_5 :cond_5 - move v3, p6 + move/from16 v7, p6 :goto_5 - and-int/lit8 v7, v0, 0x40 + and-int/lit8 v8, v0, 0x40 - if-eqz v7, :cond_6 + if-eqz v8, :cond_6 - const/4 v7, 0x0 + const/4 v8, 0x0 goto :goto_6 :cond_6 - move-object/from16 v7, p7 + move-object/from16 v8, p7 :goto_6 - and-int/lit16 v8, v0, 0x80 + and-int/lit16 v9, v0, 0x80 - if-eqz v8, :cond_7 + if-eqz v9, :cond_7 - const-string v8, "" + const-string v9, "" goto :goto_7 :cond_7 - move-object/from16 v8, p8 + move-object/from16 v9, p8 :goto_7 and-int/lit16 v0, v0, 0x100 if-eqz v0, :cond_8 - invoke-static {}, Lkotlin/a/ab;->emptyMap()Ljava/util/Map; + new-instance v0, Ljava/util/HashSet; - move-result-object v0 + invoke-direct {v0, v3}, Ljava/util/HashSet;->(I)V + + check-cast v0, Ljava/util/Set; goto :goto_8 @@ -261,22 +263,22 @@ move p5, v5 - move p6, v6 + move/from16 p6, v6 - move/from16 p7, v3 + move/from16 p7, v7 - move-object/from16 p8, v7 + move-object/from16 p8, v8 - move-object/from16 p9, v8 + move-object/from16 p9, v9 move-object/from16 p10, v0 - invoke-direct/range {p1 .. p10}, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->(ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Map;)V + invoke-direct/range {p1 .. p10}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->(ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;)V return-void .end method -.method public static synthetic copy$default(Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated; +.method public static synthetic copy$default(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;ILjava/lang/Object;)Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; .locals 10 move-object v0, p0 @@ -287,7 +289,7 @@ if-eqz v2, :cond_0 - iget-boolean v2, v0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isEnabled:Z + iget-boolean v2, v0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isEnabled:Z goto :goto_0 @@ -299,7 +301,7 @@ if-eqz v3, :cond_1 - iget-boolean v3, v0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isEnabledInApp:Z + iget-boolean v3, v0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isEnabledInApp:Z goto :goto_1 @@ -311,7 +313,7 @@ if-eqz v4, :cond_2 - iget-boolean v4, v0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isWake:Z + iget-boolean v4, v0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isWake:Z goto :goto_2 @@ -323,7 +325,7 @@ if-eqz v5, :cond_3 - iget-boolean v5, v0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isDisableBlink:Z + iget-boolean v5, v0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableBlink:Z goto :goto_3 @@ -335,7 +337,7 @@ if-eqz v6, :cond_4 - iget-boolean v6, v0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isDisableSound:Z + iget-boolean v6, v0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableSound:Z goto :goto_4 @@ -347,7 +349,7 @@ if-eqz v7, :cond_5 - iget-boolean v7, v0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isDisableVibrate:Z + iget-boolean v7, v0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableVibrate:Z goto :goto_5 @@ -359,7 +361,7 @@ if-eqz v8, :cond_6 - iget-object v8, v0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->token:Ljava/lang/String; + iget-object v8, v0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->token:Ljava/lang/String; goto :goto_6 @@ -371,7 +373,7 @@ if-eqz v9, :cond_7 - iget-object v9, v0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->locale:Ljava/lang/String; + iget-object v9, v0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->locale:Ljava/lang/String; goto :goto_7 @@ -383,7 +385,7 @@ if-eqz v1, :cond_8 - iget-object v1, v0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->channelPermissions:Ljava/util/Map; + iget-object v1, v0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->sendBlockedChannels:Ljava/util/Set; goto :goto_8 @@ -409,25 +411,19 @@ move-object/from16 p9, v1 - invoke-virtual/range {p0 .. p9}, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->copy(ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Map;)Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated; + invoke-virtual/range {p0 .. p9}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->copy(ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;)Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; move-result-object v0 return-object v0 .end method -.method public static synthetic isAuthed$annotations()V - .locals 0 - - return-void -.end method - # virtual methods .method public final component1()Z .locals 1 - iget-boolean v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isEnabled:Z + iget-boolean v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isEnabled:Z return v0 .end method @@ -435,7 +431,7 @@ .method public final component2()Z .locals 1 - iget-boolean v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isEnabledInApp:Z + iget-boolean v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isEnabledInApp:Z return v0 .end method @@ -443,7 +439,7 @@ .method public final component3()Z .locals 1 - iget-boolean v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isWake:Z + iget-boolean v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isWake:Z return v0 .end method @@ -451,7 +447,7 @@ .method public final component4()Z .locals 1 - iget-boolean v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isDisableBlink:Z + iget-boolean v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableBlink:Z return v0 .end method @@ -459,7 +455,7 @@ .method public final component5()Z .locals 1 - iget-boolean v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isDisableSound:Z + iget-boolean v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableSound:Z return v0 .end method @@ -467,7 +463,7 @@ .method public final component6()Z .locals 1 - iget-boolean v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isDisableVibrate:Z + iget-boolean v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableVibrate:Z return v0 .end method @@ -475,7 +471,7 @@ .method public final component7()Ljava/lang/String; .locals 1 - iget-object v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->token:Ljava/lang/String; + iget-object v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->token:Ljava/lang/String; return-object v0 .end method @@ -483,40 +479,38 @@ .method public final component8()Ljava/lang/String; .locals 1 - iget-object v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->locale:Ljava/lang/String; + iget-object v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->locale:Ljava/lang/String; return-object v0 .end method -.method public final component9()Ljava/util/Map; +.method public final component9()Ljava/util/Set; .locals 1 .annotation system Ldalvik/annotation/Signature; value = { "()", - "Ljava/util/Map<", + "Ljava/util/Set<", "Ljava/lang/Long;", - "Ljava/lang/Integer;", ">;" } .end annotation - iget-object v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->channelPermissions:Ljava/util/Map; + iget-object v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->sendBlockedChannels:Ljava/util/Set; return-object v0 .end method -.method public final copy(ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Map;)Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated; +.method public final copy(ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;)Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; .locals 11 .annotation system Ldalvik/annotation/Signature; value = { "(ZZZZZZ", "Ljava/lang/String;", "Ljava/lang/String;", - "Ljava/util/Map<", + "Ljava/util/Set<", "Ljava/lang/Long;", - "Ljava/lang/Integer;", ">;)", - "Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;" + "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;" } .end annotation @@ -526,13 +520,13 @@ invoke-static {v9, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V - const-string v0, "channelPermissions" + const-string v0, "sendBlockedChannels" move-object/from16 v10, p9 invoke-static {v10, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V - new-instance v0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated; + new-instance v0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; move-object v1, v0 @@ -550,7 +544,7 @@ move-object/from16 v8, p7 - invoke-direct/range {v1 .. v10}, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->(ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Map;)V + invoke-direct/range {v1 .. v10}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->(ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;)V return-object v0 .end method @@ -562,17 +556,17 @@ if-eq p0, p1, :cond_7 - instance-of v1, p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated; + instance-of v1, p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; const/4 v2, 0x0 if-eqz v1, :cond_6 - check-cast p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated; + check-cast p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; - iget-boolean v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isEnabled:Z + iget-boolean v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isEnabled:Z - iget-boolean v3, p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isEnabled:Z + iget-boolean v3, p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isEnabled:Z if-ne v1, v3, :cond_0 @@ -586,9 +580,9 @@ :goto_0 if-eqz v1, :cond_6 - iget-boolean v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isEnabledInApp:Z + iget-boolean v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isEnabledInApp:Z - iget-boolean v3, p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isEnabledInApp:Z + iget-boolean v3, p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isEnabledInApp:Z if-ne v1, v3, :cond_1 @@ -602,9 +596,9 @@ :goto_1 if-eqz v1, :cond_6 - iget-boolean v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isWake:Z + iget-boolean v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isWake:Z - iget-boolean v3, p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isWake:Z + iget-boolean v3, p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isWake:Z if-ne v1, v3, :cond_2 @@ -618,9 +612,9 @@ :goto_2 if-eqz v1, :cond_6 - iget-boolean v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isDisableBlink:Z + iget-boolean v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableBlink:Z - iget-boolean v3, p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isDisableBlink:Z + iget-boolean v3, p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableBlink:Z if-ne v1, v3, :cond_3 @@ -634,9 +628,9 @@ :goto_3 if-eqz v1, :cond_6 - iget-boolean v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isDisableSound:Z + iget-boolean v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableSound:Z - iget-boolean v3, p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isDisableSound:Z + iget-boolean v3, p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableSound:Z if-ne v1, v3, :cond_4 @@ -650,9 +644,9 @@ :goto_4 if-eqz v1, :cond_6 - iget-boolean v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isDisableVibrate:Z + iget-boolean v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableVibrate:Z - iget-boolean v3, p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isDisableVibrate:Z + iget-boolean v3, p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableVibrate:Z if-ne v1, v3, :cond_5 @@ -666,9 +660,9 @@ :goto_5 if-eqz v1, :cond_6 - iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->token:Ljava/lang/String; + iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->token:Ljava/lang/String; - iget-object v3, p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->token:Ljava/lang/String; + iget-object v3, p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->token:Ljava/lang/String; invoke-static {v1, v3}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z @@ -676,9 +670,9 @@ if-eqz v1, :cond_6 - iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->locale:Ljava/lang/String; + iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->locale:Ljava/lang/String; - iget-object v3, p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->locale:Ljava/lang/String; + iget-object v3, p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->locale:Ljava/lang/String; invoke-static {v1, v3}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z @@ -686,9 +680,9 @@ if-eqz v1, :cond_6 - iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->channelPermissions:Ljava/util/Map; + iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->sendBlockedChannels:Ljava/util/Set; - iget-object p1, p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->channelPermissions:Ljava/util/Map; + iget-object p1, p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->sendBlockedChannels:Ljava/util/Set; invoke-static {v1, p1}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z @@ -706,27 +700,26 @@ return v0 .end method -.method public final getChannelPermissions()Ljava/util/Map; +.method public final getLocale()Ljava/lang/String; .locals 1 - .annotation system Ldalvik/annotation/Signature; - value = { - "()", - "Ljava/util/Map<", - "Ljava/lang/Long;", - "Ljava/lang/Integer;", - ">;" - } - .end annotation - iget-object v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->channelPermissions:Ljava/util/Map; + iget-object v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->locale:Ljava/lang/String; return-object v0 .end method -.method public final getLocale()Ljava/lang/String; +.method public final getSendBlockedChannels()Ljava/util/Set; .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Ljava/util/Set<", + "Ljava/lang/Long;", + ">;" + } + .end annotation - iget-object v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->locale:Ljava/lang/String; + iget-object v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->sendBlockedChannels:Ljava/util/Set; return-object v0 .end method @@ -734,7 +727,7 @@ .method public final getToken()Ljava/lang/String; .locals 1 - iget-object v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->token:Ljava/lang/String; + iget-object v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->token:Ljava/lang/String; return-object v0 .end method @@ -742,7 +735,7 @@ .method public final hashCode()I .locals 3 - iget-boolean v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isEnabled:Z + iget-boolean v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isEnabled:Z const/4 v1, 0x1 @@ -753,7 +746,7 @@ :cond_0 mul-int/lit8 v0, v0, 0x1f - iget-boolean v2, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isEnabledInApp:Z + iget-boolean v2, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isEnabledInApp:Z if-eqz v2, :cond_1 @@ -764,7 +757,7 @@ mul-int/lit8 v0, v0, 0x1f - iget-boolean v2, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isWake:Z + iget-boolean v2, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isWake:Z if-eqz v2, :cond_2 @@ -775,7 +768,7 @@ mul-int/lit8 v0, v0, 0x1f - iget-boolean v2, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isDisableBlink:Z + iget-boolean v2, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableBlink:Z if-eqz v2, :cond_3 @@ -786,7 +779,7 @@ mul-int/lit8 v0, v0, 0x1f - iget-boolean v2, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isDisableSound:Z + iget-boolean v2, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableSound:Z if-eqz v2, :cond_4 @@ -797,7 +790,7 @@ mul-int/lit8 v0, v0, 0x1f - iget-boolean v2, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isDisableVibrate:Z + iget-boolean v2, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableVibrate:Z if-eqz v2, :cond_5 @@ -811,7 +804,7 @@ mul-int/lit8 v0, v0, 0x1f - iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->token:Ljava/lang/String; + iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->token:Ljava/lang/String; const/4 v2, 0x0 @@ -831,7 +824,7 @@ mul-int/lit8 v0, v0, 0x1f - iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->locale:Ljava/lang/String; + iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->locale:Ljava/lang/String; if-eqz v1, :cond_7 @@ -849,7 +842,7 @@ mul-int/lit8 v0, v0, 0x1f - iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->channelPermissions:Ljava/util/Map; + iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->sendBlockedChannels:Ljava/util/Set; if-eqz v1, :cond_8 @@ -866,7 +859,7 @@ .method public final isAuthed()Z .locals 1 - iget-boolean v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isAuthed:Z + iget-boolean v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isAuthed:Z return v0 .end method @@ -874,7 +867,7 @@ .method public final isDisableBlink()Z .locals 1 - iget-boolean v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isDisableBlink:Z + iget-boolean v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableBlink:Z return v0 .end method @@ -882,7 +875,7 @@ .method public final isDisableSound()Z .locals 1 - iget-boolean v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isDisableSound:Z + iget-boolean v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableSound:Z return v0 .end method @@ -890,7 +883,7 @@ .method public final isDisableVibrate()Z .locals 1 - iget-boolean v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isDisableVibrate:Z + iget-boolean v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableVibrate:Z return v0 .end method @@ -898,7 +891,7 @@ .method public final isEnabled()Z .locals 1 - iget-boolean v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isEnabled:Z + iget-boolean v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isEnabled:Z return v0 .end method @@ -906,7 +899,7 @@ .method public final isEnabledInApp()Z .locals 1 - iget-boolean v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isEnabledInApp:Z + iget-boolean v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isEnabledInApp:Z return v0 .end method @@ -914,120 +907,21 @@ .method public final isWake()Z .locals 1 - iget-boolean v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isWake:Z + iget-boolean v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isWake:Z return v0 .end method -.method public final toNewSettings()Lcom/discord/utilities/fcm/NotificationClient$Settings; - .locals 13 - - iget-boolean v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isEnabled:Z - - iget-boolean v2, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isEnabledInApp:Z - - iget-boolean v3, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isWake:Z - - iget-boolean v4, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isDisableBlink:Z - - iget-boolean v5, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isDisableSound:Z - - iget-boolean v6, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isDisableVibrate:Z - - iget-object v8, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->locale:Ljava/lang/String; - - iget-object v7, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->token:Ljava/lang/String; - - iget-object v0, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->channelPermissions:Ljava/util/Map; - - new-instance v9, Ljava/util/LinkedHashMap; - - invoke-direct {v9}, Ljava/util/LinkedHashMap;->()V - - invoke-interface {v0}, Ljava/util/Map;->entrySet()Ljava/util/Set; - - move-result-object v0 - - invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator; - - move-result-object v0 - - :cond_0 - :goto_0 - invoke-interface {v0}, Ljava/util/Iterator;->hasNext()Z - - move-result v10 - - if-eqz v10, :cond_1 - - invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object; - - move-result-object v10 - - check-cast v10, Ljava/util/Map$Entry; - - invoke-interface {v10}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object; - - move-result-object v11 - - check-cast v11, Ljava/lang/Number; - - invoke-virtual {v11}, Ljava/lang/Number;->intValue()I - - move-result v11 - - const/16 v12, 0x800 - - invoke-static {v11}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - - move-result-object v11 - - invoke-static {v12, v11}, Lcom/discord/utilities/permissions/PermissionUtils;->can(ILjava/lang/Integer;)Z - - move-result v11 - - xor-int/lit8 v11, v11, 0x1 - - if-eqz v11, :cond_0 - - invoke-interface {v10}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object; - - move-result-object v11 - - invoke-interface {v10}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object; - - move-result-object v10 - - invoke-virtual {v9, v11, v10}, Ljava/util/LinkedHashMap;->put(Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; - - goto :goto_0 - - :cond_1 - check-cast v9, Ljava/util/Map; - - invoke-interface {v9}, Ljava/util/Map;->keySet()Ljava/util/Set; - - move-result-object v9 - - new-instance v10, Lcom/discord/utilities/fcm/NotificationClient$Settings; - - move-object v0, v10 - - invoke-direct/range {v0 .. v9}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->(ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;)V - - return-object v10 -.end method - .method public final toString()Ljava/lang/String; .locals 2 new-instance v0, Ljava/lang/StringBuilder; - const-string v1, "SettingsDeprecated(isEnabled=" + const-string v1, "SettingsV2(isEnabled=" invoke-direct {v0, v1}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V - iget-boolean v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isEnabled:Z + iget-boolean v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isEnabled:Z invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder; @@ -1035,7 +929,7 @@ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - iget-boolean v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isEnabledInApp:Z + iget-boolean v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isEnabledInApp:Z invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder; @@ -1043,7 +937,7 @@ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - iget-boolean v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isWake:Z + iget-boolean v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isWake:Z invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder; @@ -1051,7 +945,7 @@ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - iget-boolean v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isDisableBlink:Z + iget-boolean v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableBlink:Z invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder; @@ -1059,7 +953,7 @@ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - iget-boolean v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isDisableSound:Z + iget-boolean v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableSound:Z invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder; @@ -1067,7 +961,7 @@ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - iget-boolean v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->isDisableVibrate:Z + iget-boolean v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableVibrate:Z invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Z)Ljava/lang/StringBuilder; @@ -1075,7 +969,7 @@ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->token:Ljava/lang/String; + iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->token:Ljava/lang/String; invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; @@ -1083,15 +977,15 @@ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->locale:Ljava/lang/String; + iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->locale:Ljava/lang/String; invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v1, ", channelPermissions=" + const-string v1, ", sendBlockedChannels=" invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;->channelPermissions:Ljava/util/Map; + iget-object v1, p0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->sendBlockedChannels:Ljava/util/Set; invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$1.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$1.smali index c89ae9299a..df4a1a8c12 100644 --- a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$1.smali +++ b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$1.smali @@ -69,11 +69,11 @@ sget-object v0, Lcom/discord/utilities/fcm/NotificationClient;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient; - invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient;->getSettings$app_productionExternalRelease()Lcom/discord/utilities/fcm/NotificationClient$Settings; + invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient;->getSettings$app_productionExternalRelease()Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; move-result-object v0 - invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->getToken()Ljava/lang/String; + invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->getToken()Ljava/lang/String; move-result-object v0 diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$2.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$2.smali index 7041fe34c8..49a561291e 100644 --- a/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$2.smali +++ b/com.discord/smali/com/discord/utilities/fcm/NotificationClient$init$2.smali @@ -69,11 +69,11 @@ sget-object v0, Lcom/discord/utilities/fcm/NotificationClient;->INSTANCE:Lcom/discord/utilities/fcm/NotificationClient; - invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient;->getSettings$app_productionExternalRelease()Lcom/discord/utilities/fcm/NotificationClient$Settings; + invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient;->getSettings$app_productionExternalRelease()Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; move-result-object v0 - invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->getLocale()Ljava/lang/String; + invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->getLocale()Ljava/lang/String; move-result-object v0 diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationClient.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationClient.smali index 8d2c0abc1f..468d4433aa 100644 --- a/com.discord/smali/com/discord/utilities/fcm/NotificationClient.smali +++ b/com.discord/smali/com/discord/utilities/fcm/NotificationClient.smali @@ -12,8 +12,8 @@ .annotation system Ldalvik/annotation/MemberClasses; value = { Lcom/discord/utilities/fcm/NotificationClient$FCMMessagingService;, - Lcom/discord/utilities/fcm/NotificationClient$SettingsDeprecated;, - Lcom/discord/utilities/fcm/NotificationClient$Settings; + Lcom/discord/utilities/fcm/NotificationClient$Settings;, + Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; } .end annotation @@ -29,7 +29,7 @@ .annotation system Ldalvik/annotation/Signature; value = { "Lcom/discord/utilities/persister/Persister<", - "Lcom/discord/utilities/fcm/NotificationClient$Settings;", + "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;", ">;" } .end annotation @@ -64,7 +64,7 @@ const-string v1, "NOTIFICATION_CLIENT_SETTINGS_V3" - new-instance v14, Lcom/discord/utilities/fcm/NotificationClient$Settings; + new-instance v14, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; const/4 v3, 0x0 @@ -90,7 +90,7 @@ move-object v2, v14 - invoke-direct/range {v2 .. v13}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->(ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + invoke-direct/range {v2 .. v13}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->(ZZZZZZLjava/lang/String;Ljava/lang/String;Ljava/util/Set;ILkotlin/jvm/internal/DefaultConstructorMarker;)V invoke-direct {v0, v1, v14}, Lcom/discord/utilities/persister/Persister;->(Ljava/lang/String;Ljava/lang/Object;)V @@ -204,7 +204,7 @@ return-void .end method -.method public final declared-synchronized getSettings$app_productionExternalRelease()Lcom/discord/utilities/fcm/NotificationClient$Settings; +.method public final declared-synchronized getSettings$app_productionExternalRelease()Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; .locals 1 monitor-enter p0 @@ -216,7 +216,7 @@ move-result-object v0 - check-cast v0, Lcom/discord/utilities/fcm/NotificationClient$Settings; + check-cast v0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; :try_end_0 .catchall {:try_start_0 .. :try_end_0} :catchall_0 @@ -346,9 +346,9 @@ move-result-object v0 - check-cast v0, Lcom/discord/utilities/fcm/NotificationClient$Settings; + check-cast v0, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; - invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->isAuthed()Z + invoke-virtual {v0}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isAuthed()Z move-result v0 :try_end_0 @@ -468,7 +468,7 @@ throw p1 .end method -.method public final declared-synchronized updateSettings$app_productionExternalRelease(Lcom/discord/utilities/fcm/NotificationClient$Settings;Z)V +.method public final declared-synchronized updateSettings$app_productionExternalRelease(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;Z)V .locals 1 monitor-enter p0 diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali index ad7c42006d..ae3ba2730b 100644 --- a/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali +++ b/com.discord/smali/com/discord/utilities/fcm/NotificationData.smali @@ -1276,7 +1276,7 @@ if-eqz v0, :cond_9 - const v0, 0x7f120a9e + const v0, 0x7f120a9f new-array v1, v5, [Ljava/lang/Object; @@ -1369,7 +1369,7 @@ if-ne v0, v3, :cond_1 - const v0, 0x7f120a4c + const v0, 0x7f120a4d new-array v1, v3, [Ljava/lang/Object; @@ -1394,7 +1394,7 @@ if-ne v0, v5, :cond_2 - const v0, 0x7f120a4a + const v0, 0x7f120a4b new-array v1, v3, [Ljava/lang/Object; @@ -1445,7 +1445,7 @@ return-object p1 :pswitch_2 - const v0, 0x7f120a46 + const v0, 0x7f120a47 new-array v1, v3, [Ljava/lang/Object; @@ -1466,7 +1466,7 @@ return-object p1 :pswitch_3 - const v0, 0x7f120a44 + const v0, 0x7f120a45 new-array v1, v3, [Ljava/lang/Object; @@ -1502,7 +1502,7 @@ if-nez v0, :cond_6 - const v0, 0x7f120a43 + const v0, 0x7f120a44 new-array v1, v3, [Ljava/lang/Object; @@ -1537,7 +1537,7 @@ if-eqz v0, :cond_9 - const v0, 0x7f12059e + const v0, 0x7f12059f new-array v1, v3, [Ljava/lang/Object; @@ -1566,7 +1566,7 @@ if-eqz v0, :cond_9 - const v0, 0x7f120615 + const v0, 0x7f120616 new-array v1, v5, [Ljava/lang/Object; @@ -1602,12 +1602,12 @@ goto :goto_2 :cond_7 - const v0, 0x7f120a4e + const v0, 0x7f120a4f goto :goto_1 :cond_8 - const v0, 0x7f120a41 + const v0, 0x7f120a42 :goto_1 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1923,7 +1923,7 @@ invoke-direct {p2, v0}, Landroidx/core/app/RemoteInput$Builder;->(Ljava/lang/String;)V - const v0, 0x7f120ce2 + const v0, 0x7f120ce3 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1973,7 +1973,7 @@ const v3, 0x7f0802c3 - const v4, 0x7f120a4f + const v4, 0x7f120a50 invoke-virtual {p1, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -2383,7 +2383,7 @@ const v2, 0x7f0801d5 - const v3, 0x7f120953 + const v3, 0x7f120954 invoke-virtual {p1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -2775,7 +2775,7 @@ goto :goto_0 :cond_0 - const v0, 0x7f120448 + const v0, 0x7f120449 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -3141,7 +3141,7 @@ goto :goto_0 :cond_0 - const v0, 0x7f120822 + const v0, 0x7f120823 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -3251,7 +3251,7 @@ if-nez v0, :cond_2 - const v0, 0x7f120a54 + const v0, 0x7f120a55 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -3287,7 +3287,7 @@ if-eqz v0, :cond_3 - const v0, 0x7f120616 + const v0, 0x7f120617 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$display$1.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$display$1.smali index 15d75793ad..b1e6724609 100644 --- a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$display$1.smali +++ b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$display$1.smali @@ -7,7 +7,7 @@ # annotations .annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/utilities/fcm/NotificationRenderer;->display(Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;Lcom/discord/utilities/fcm/NotificationClient$Settings;)V + value = Lcom/discord/utilities/fcm/NotificationRenderer;->display(Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)V .end annotation .annotation system Ldalvik/annotation/InnerClass; @@ -31,18 +31,18 @@ .field final synthetic $notificationData:Lcom/discord/utilities/fcm/NotificationData; -.field final synthetic $settings:Lcom/discord/utilities/fcm/NotificationClient$Settings; +.field final synthetic $settings:Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; # direct methods -.method constructor (Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;Lcom/discord/utilities/fcm/NotificationClient$Settings;)V +.method constructor (Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)V .locals 0 iput-object p1, p0, Lcom/discord/utilities/fcm/NotificationRenderer$display$1;->$context:Landroid/content/Context; iput-object p2, p0, Lcom/discord/utilities/fcm/NotificationRenderer$display$1;->$notificationData:Lcom/discord/utilities/fcm/NotificationData; - iput-object p3, p0, Lcom/discord/utilities/fcm/NotificationRenderer$display$1;->$settings:Lcom/discord/utilities/fcm/NotificationClient$Settings; + iput-object p3, p0, Lcom/discord/utilities/fcm/NotificationRenderer$display$1;->$settings:Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; const/4 p1, 0x1 @@ -75,9 +75,9 @@ iget-object v2, p0, Lcom/discord/utilities/fcm/NotificationRenderer$display$1;->$notificationData:Lcom/discord/utilities/fcm/NotificationData; - iget-object v3, p0, Lcom/discord/utilities/fcm/NotificationRenderer$display$1;->$settings:Lcom/discord/utilities/fcm/NotificationClient$Settings; + iget-object v3, p0, Lcom/discord/utilities/fcm/NotificationRenderer$display$1;->$settings:Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; - invoke-static {v0, v1, v2, p1, v3}, Lcom/discord/utilities/fcm/NotificationRenderer;->access$displayAndUpdateCache(Lcom/discord/utilities/fcm/NotificationRenderer;Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;Landroid/graphics/Bitmap;Lcom/discord/utilities/fcm/NotificationClient$Settings;)V + invoke-static {v0, v1, v2, p1, v3}, Lcom/discord/utilities/fcm/NotificationRenderer;->access$displayAndUpdateCache(Lcom/discord/utilities/fcm/NotificationRenderer;Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;Landroid/graphics/Bitmap;Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)V :try_end_0 .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_0 diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$display$2.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$display$2.smali index 2fd75990fa..4b69810bda 100644 --- a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$display$2.smali +++ b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$display$2.smali @@ -7,7 +7,7 @@ # annotations .annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/utilities/fcm/NotificationRenderer;->display(Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;Lcom/discord/utilities/fcm/NotificationClient$Settings;)V + value = Lcom/discord/utilities/fcm/NotificationRenderer;->display(Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)V .end annotation .annotation system Ldalvik/annotation/InnerClass; diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$display$3.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$display$3.smali index 127b72244e..707bb83061 100644 --- a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$display$3.smali +++ b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer$display$3.smali @@ -7,7 +7,7 @@ # annotations .annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/utilities/fcm/NotificationRenderer;->display(Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;Lcom/discord/utilities/fcm/NotificationClient$Settings;)V + value = Lcom/discord/utilities/fcm/NotificationRenderer;->display(Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)V .end annotation .annotation system Ldalvik/annotation/InnerClass; diff --git a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali index db1cd2edce..09d9559b11 100644 --- a/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali +++ b/com.discord/smali/com/discord/utilities/fcm/NotificationRenderer.smali @@ -49,10 +49,10 @@ return-void .end method -.method public static final synthetic access$displayAndUpdateCache(Lcom/discord/utilities/fcm/NotificationRenderer;Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;Landroid/graphics/Bitmap;Lcom/discord/utilities/fcm/NotificationClient$Settings;)V +.method public static final synthetic access$displayAndUpdateCache(Lcom/discord/utilities/fcm/NotificationRenderer;Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;Landroid/graphics/Bitmap;Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)V .locals 0 - invoke-direct {p0, p1, p2, p3, p4}, Lcom/discord/utilities/fcm/NotificationRenderer;->displayAndUpdateCache(Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;Landroid/graphics/Bitmap;Lcom/discord/utilities/fcm/NotificationClient$Settings;)V + invoke-direct {p0, p1, p2, p3, p4}, Lcom/discord/utilities/fcm/NotificationRenderer;->displayAndUpdateCache(Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;Landroid/graphics/Bitmap;Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)V return-void .end method @@ -106,7 +106,7 @@ throw p1 .end method -.method private final displayAndUpdateCache(Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;Landroid/graphics/Bitmap;Lcom/discord/utilities/fcm/NotificationClient$Settings;)V +.method private final displayAndUpdateCache(Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;Landroid/graphics/Bitmap;Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)V .locals 7 new-instance v0, Landroidx/core/app/NotificationCompat$Builder; @@ -169,11 +169,11 @@ move-result-object v0 - invoke-virtual {p4}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->isDisableSound()Z + invoke-virtual {p4}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableSound()Z move-result v2 - invoke-virtual {p4}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->isDisableVibrate()Z + invoke-virtual {p4}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableVibrate()Z move-result v3 @@ -274,7 +274,7 @@ invoke-virtual {p3, v3}, Landroidx/core/app/NotificationCompat$Builder;->setVibrate([J)Landroidx/core/app/NotificationCompat$Builder; - invoke-virtual {p4}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->isDisableBlink()Z + invoke-virtual {p4}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableBlink()Z move-result p3 @@ -297,7 +297,7 @@ if-eqz p3, :cond_5 - invoke-virtual {p4}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->isDisableSound()Z + invoke-virtual {p4}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableSound()Z move-result v3 @@ -315,11 +315,11 @@ sget-object v1, Lcom/discord/utilities/fcm/NotificationRenderer;->INSTANCE:Lcom/discord/utilities/fcm/NotificationRenderer; - invoke-virtual {p4}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->isDisableSound()Z + invoke-virtual {p4}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableSound()Z move-result v3 - invoke-virtual {p4}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->isDisableVibrate()Z + invoke-virtual {p4}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableVibrate()Z move-result v4 @@ -351,7 +351,7 @@ invoke-virtual {v0, p3}, Landroidx/core/app/NotificationCompat$Builder;->addAction(Landroidx/core/app/NotificationCompat$Action;)Landroidx/core/app/NotificationCompat$Builder; :cond_6 - invoke-virtual {p4}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->getSendBlockedChannels()Ljava/util/Set; + invoke-virtual {p4}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->getSendBlockedChannels()Ljava/util/Set; move-result-object p3 @@ -403,7 +403,7 @@ invoke-static/range {v0 .. v5}, Lcom/discord/utilities/logging/Logger;->e$default(Lcom/discord/utilities/logging/Logger;Ljava/lang/String;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V :goto_1 - invoke-virtual {p4}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->isWake()Z + invoke-virtual {p4}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isWake()Z move-result p2 @@ -431,7 +431,7 @@ invoke-direct {v0}, Landroidx/core/app/Person$Builder;->()V - const v1, 0x7f120961 + const v1, 0x7f120962 invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -636,7 +636,7 @@ return-void .end method -.method public final display(Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;Lcom/discord/utilities/fcm/NotificationClient$Settings;)V +.method public final display(Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)V .locals 8 const-string v0, "context" @@ -653,7 +653,7 @@ new-instance v0, Lcom/discord/utilities/fcm/NotificationRenderer$display$1; - invoke-direct {v0, p1, p2, p3}, Lcom/discord/utilities/fcm/NotificationRenderer$display$1;->(Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;Lcom/discord/utilities/fcm/NotificationClient$Settings;)V + invoke-direct {v0, p1, p2, p3}, Lcom/discord/utilities/fcm/NotificationRenderer$display$1;->(Landroid/content/Context;Lcom/discord/utilities/fcm/NotificationData;Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)V invoke-virtual {p1}, Landroid/content/Context;->getResources()Landroid/content/res/Resources; @@ -821,12 +821,12 @@ if-eqz p5, :cond_0 - const p5, 0x7f120a51 + const p5, 0x7f120a52 goto :goto_0 :cond_0 - const p5, 0x7f120a50 + const p5, 0x7f120a51 :goto_0 sget-object v0, Lcom/discord/utilities/fcm/NotificationActions;->Companion:Lcom/discord/utilities/fcm/NotificationActions$Companion; @@ -950,7 +950,7 @@ const-string v1, "Calls" - const v2, 0x7f1202c2 + const v2, 0x7f1202c3 invoke-virtual {p1, v2}, Landroid/app/Application;->getString(I)Ljava/lang/String; @@ -966,7 +966,7 @@ const-string v3, "Media Connections" - const v5, 0x7f120f75 + const v5, 0x7f120f76 invoke-virtual {p1, v5}, Landroid/app/Application;->getString(I)Ljava/lang/String; @@ -982,7 +982,7 @@ const-string v5, "Messages" - const v7, 0x7f120984 + const v7, 0x7f120985 invoke-virtual {p1, v7}, Landroid/app/Application;->getString(I)Ljava/lang/String; @@ -998,7 +998,7 @@ const-string v7, "DirectMessages" - const v9, 0x7f120431 + const v9, 0x7f120432 invoke-virtual {p1, v9}, Landroid/app/Application;->getString(I)Ljava/lang/String; @@ -1012,7 +1012,7 @@ const-string v9, "Social" - const v10, 0x7f1205a0 + const v10, 0x7f1205a1 invoke-virtual {p1, v10}, Landroid/app/Application;->getString(I)Ljava/lang/String; @@ -1026,7 +1026,7 @@ const-string v10, "Game Detection" - const v11, 0x7f1205d5 + const v11, 0x7f1205d6 invoke-virtual {p1, v11}, 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 580d07dcbd..a1cd5215ff 100644 --- a/com.discord/smali/com/discord/utilities/games/GameDetectionService$Companion.smali +++ b/com.discord/smali/com/discord/utilities/games/GameDetectionService$Companion.smali @@ -111,7 +111,7 @@ move-result-object v2 - const v3, 0x7f120448 + const v3, 0x7f120449 invoke-virtual {p1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -125,7 +125,7 @@ if-nez p2, :cond_0 - const p2, 0x7f1205d5 + const p2, 0x7f1205d6 invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -134,7 +134,7 @@ goto :goto_0 :cond_0 - const v3, 0x7f1205d0 + const v3, 0x7f1205d1 const/4 v4, 0x1 diff --git a/com.discord/smali/com/discord/utilities/images/MGImages$requestAvatarCrop$1.smali b/com.discord/smali/com/discord/utilities/images/MGImages$requestAvatarCrop$1.smali index 283ad5d465..f61590e438 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 @@ -42,7 +42,7 @@ if-eqz v1, :cond_0 - const v2, 0x7f120e68 + const v2, 0x7f120e69 const/4 v3, 0x1 diff --git a/com.discord/smali/com/discord/utilities/images/MGImages.smali b/com.discord/smali/com/discord/utilities/images/MGImages.smali index c633e69b10..ddb1315ec2 100644 --- a/com.discord/smali/com/discord/utilities/images/MGImages.smali +++ b/com.discord/smali/com/discord/utilities/images/MGImages.smali @@ -283,7 +283,7 @@ const/4 v1, 0x1 - const v2, 0x7f12021a + const v2, 0x7f12021b const/4 v3, 0x0 diff --git a/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali b/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali index 6a651547ac..ba36f8640d 100644 --- a/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali +++ b/com.discord/smali/com/discord/utilities/intent/IntentUtils.smali @@ -348,7 +348,7 @@ if-eqz p3, :cond_0 - const p2, 0x7f120d2c + const p2, 0x7f120d2d invoke-virtual {p0, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics.smali b/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics.smali index 06ab43a403..624346e6c9 100644 --- a/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics.smali +++ b/com.discord/smali/com/discord/utilities/keyboard/Keyboard$KeyboardMetrics.smali @@ -273,57 +273,17 @@ packed-switch v0, :pswitch_data_0 - const-string v0, "receiver$0" + invoke-static {v2}, Lkotlin/a/ab;->s(Ljava/util/Map;)Ljava/util/Map; - invoke-static {v2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V - - new-instance v0, Ljava/util/LinkedHashMap; - - invoke-direct {v0, v2}, Ljava/util/LinkedHashMap;->(Ljava/util/Map;)V - - check-cast v0, Ljava/util/Map; + move-result-object v0 return-object v0 :pswitch_0 - const-string v0, "receiver$0" - - invoke-static {v2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-interface {v2}, Ljava/util/Map;->entrySet()Ljava/util/Set; + invoke-static {v2}, Lkotlin/a/ab;->r(Ljava/util/Map;)Ljava/util/Map; move-result-object v0 - invoke-interface {v0}, Ljava/util/Set;->iterator()Ljava/util/Iterator; - - move-result-object v0 - - invoke-interface {v0}, Ljava/util/Iterator;->next()Ljava/lang/Object; - - move-result-object v0 - - check-cast v0, Ljava/util/Map$Entry; - - invoke-interface {v0}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object; - - move-result-object v1 - - invoke-interface {v0}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object; - - move-result-object v0 - - invoke-static {v1, v0}, Ljava/util/Collections;->singletonMap(Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map; - - move-result-object v0 - - const-string v1, "java.util.Collections.singletonMap(key, value)" - - invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - - const-string v1, "with(entries.iterator().\u2026ingletonMap(key, value) }" - - invoke-static {v0, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - return-object v0 :pswitch_1 @@ -333,8 +293,6 @@ return-object v0 - nop - :pswitch_data_0 .packed-switch 0x0 :pswitch_1 diff --git a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali index d88fc7c6a7..d0392d4e2c 100644 --- a/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali +++ b/com.discord/smali/com/discord/utilities/notices/NoticeBuilders.smali @@ -136,7 +136,7 @@ aput-object v1, v0, v2 - const v1, 0x7f120446 + const v1, 0x7f120447 invoke-virtual {p1, v1, v0}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -156,7 +156,7 @@ invoke-static {v3, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v0, 0x7f120445 + const v0, 0x7f120446 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -184,7 +184,7 @@ move-result-object v7 - const p2, 0x7f120443 + const p2, 0x7f120444 invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -221,7 +221,7 @@ new-instance p2, Lcom/discord/utilities/notices/NoticeBuilders$DialogData; - const v0, 0x7f120bd0 + const v0, 0x7f120bd1 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -231,7 +231,7 @@ invoke-static {v1, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v0, 0x7f120bcf + const v0, 0x7f120bd0 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -285,13 +285,13 @@ move-result-object v5 - const v0, 0x7f120a85 + const v0, 0x7f120a86 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; move-result-object v3 - const v0, 0x7f120a06 + const v0, 0x7f120a07 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/utilities/persister/Persister.smali b/com.discord/smali/com/discord/utilities/persister/Persister.smali index 22a2ecf551..4620b359f4 100644 --- a/com.discord/smali/com/discord/utilities/persister/Persister.smali +++ b/com.discord/smali/com/discord/utilities/persister/Persister.smali @@ -105,15 +105,6 @@ .end annotation .end field -.field private final valueTypeToken:Lcom/google/gson/reflect/TypeToken; - .annotation system Ldalvik/annotation/Signature; - value = { - "Lcom/google/gson/reflect/TypeToken<", - "+TT;>;" - } - .end annotation -.end field - .field private valueUnset:Z @@ -192,18 +183,6 @@ iput-object p1, p0, Lcom/discord/utilities/persister/Persister;->value:Ljava/lang/Object; - iget-object p1, p0, Lcom/discord/utilities/persister/Persister;->value:Ljava/lang/Object; - - invoke-virtual {p1}, Ljava/lang/Object;->getClass()Ljava/lang/Class; - - move-result-object p1 - - invoke-static {p1}, Lcom/google/gson/reflect/TypeToken;->ae(Ljava/lang/Class;)Lcom/google/gson/reflect/TypeToken; - - move-result-object p1 - - iput-object p1, p0, Lcom/discord/utilities/persister/Persister;->valueTypeToken:Lcom/google/gson/reflect/TypeToken; - const/4 p1, 0x1 iput-boolean p1, p0, Lcom/discord/utilities/persister/Persister;->valueUnset:Z @@ -439,231 +418,217 @@ .end method .method private final getFileValue()Ljava/lang/Object; - .locals 9 + .locals 11 .annotation system Ldalvik/annotation/Signature; value = { "()TT;" } .end annotation + const/16 v0, 0x2e + :try_start_0 invoke-direct {p0}, Lcom/discord/utilities/persister/Persister;->getFileInputStream()Lcom/esotericsoftware/kryo/io/Input; - move-result-object v0 + move-result-object v1 - if-eqz v0, :cond_3 + if-eqz v1, :cond_3 - check-cast v0, Ljava/io/Closeable; + check-cast v1, Ljava/io/Closeable; :try_end_0 .catch Ljava/lang/Exception; {:try_start_0 .. :try_end_0} :catch_1 - const/4 v1, 0x0 + const/4 v2, 0x0 :try_start_1 - move-object v2, v0 + move-object v3, v1 - check-cast v2, Lcom/esotericsoftware/kryo/io/Input; + check-cast v3, Lcom/esotericsoftware/kryo/io/Input; - sget-object v3, Lcom/discord/utilities/persister/Persister;->kryos:Lcom/discord/utilities/persister/Persister$Companion$kryos$1; + sget-object v4, Lcom/discord/utilities/persister/Persister;->kryos:Lcom/discord/utilities/persister/Persister$Companion$kryos$1; - invoke-virtual {v3}, Lcom/discord/utilities/persister/Persister$Companion$kryos$1;->get()Ljava/lang/Object; + invoke-virtual {v4}, Lcom/discord/utilities/persister/Persister$Companion$kryos$1;->get()Ljava/lang/Object; - move-result-object v3 + move-result-object v4 - check-cast v3, Lcom/esotericsoftware/kryo/Kryo; + check-cast v4, Lcom/esotericsoftware/kryo/Kryo; - if-nez v3, :cond_0 + if-nez v4, :cond_0 - :goto_0 - iget-object v2, p0, Lcom/discord/utilities/persister/Persister;->value:Ljava/lang/Object; + iget-object v3, p0, Lcom/discord/utilities/persister/Persister;->value:Ljava/lang/Object; + + move-object v4, v3 goto :goto_1 :cond_0 - invoke-virtual {v3, v2}, Lcom/esotericsoftware/kryo/Kryo;->readClassAndObject(Lcom/esotericsoftware/kryo/io/Input;)Ljava/lang/Object; - - move-result-object v2 - - invoke-virtual {v2}, Ljava/lang/Object;->getClass()Ljava/lang/Class; + invoke-virtual {v4, v3}, Lcom/esotericsoftware/kryo/Kryo;->readClassAndObject(Lcom/esotericsoftware/kryo/io/Input;)Ljava/lang/Object; move-result-object v3 - invoke-static {v3}, Lcom/google/gson/reflect/TypeToken;->ae(Ljava/lang/Class;)Lcom/google/gson/reflect/TypeToken; + instance-of v4, v3, Ljava/lang/Object; - move-result-object v3 + if-nez v4, :cond_1 - const-string v4, "valueTypeToken" + move-object v4, v2 - invoke-static {v3, v4}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - - iget-object v3, v3, Lcom/google/gson/reflect/TypeToken;->bEs:Ljava/lang/reflect/Type; - - iget-object v4, p0, Lcom/discord/utilities/persister/Persister;->valueTypeToken:Lcom/google/gson/reflect/TypeToken; - - const-string v5, "this.valueTypeToken" - - invoke-static {v4, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - - iget-object v4, v4, Lcom/google/gson/reflect/TypeToken;->bEs:Ljava/lang/reflect/Type; - - invoke-static {v3, v4}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z - - move-result v3 - - if-eqz v3, :cond_2 - - if-eqz v2, :cond_1 - - goto :goto_1 + goto :goto_0 :cond_1 - new-instance v2, Lkotlin/r; + move-object v4, v3 - const-string v3, "null cannot be cast to non-null type T" + :goto_0 + if-nez v4, :cond_2 - invoke-direct {v2, v3}, Lkotlin/r;->(Ljava/lang/String;)V + iget-object v4, p0, Lcom/discord/utilities/persister/Persister;->value:Ljava/lang/Object; - throw v2 + sget-object v5, Lcom/discord/utilities/persister/Persister;->logger:Lkotlin/jvm/functions/Function3; - :cond_2 - sget-object v3, Lcom/discord/utilities/persister/Persister;->logger:Lkotlin/jvm/functions/Function3; + const/4 v6, 0x6 - const/4 v4, 0x6 + invoke-static {v6}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - - move-result-object v4 - - const-string v5, "Unable to deserialize preference." - - new-instance v6, Ljava/lang/Exception; + move-result-object v6 new-instance v7, Ljava/lang/StringBuilder; - const-string v8, "Found " + const-string v8, "Unable to cast deserialized preference " invoke-direct {v7, v8}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V - invoke-virtual {v2}, Ljava/lang/Object;->getClass()Ljava/lang/Class; + iget-object v8, p0, Lcom/discord/utilities/persister/Persister;->key:Ljava/lang/String; - move-result-object v2 + invoke-virtual {v7, v8}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - invoke-virtual {v7, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; - - const-string v2, " for " - - invoke-virtual {v7, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - - iget-object v2, p0, Lcom/discord/utilities/persister/Persister;->key:Ljava/lang/String; - - invoke-virtual {v7, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - - const-string v2, ", but expecting " - - invoke-virtual {v7, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - - iget-object v2, p0, Lcom/discord/utilities/persister/Persister;->value:Ljava/lang/Object; - - invoke-virtual {v2}, Ljava/lang/Object;->getClass()Ljava/lang/Class; - - move-result-object v2 - - invoke-virtual {v7, v2}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + invoke-virtual {v7, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder; invoke-virtual {v7}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; - move-result-object v2 + move-result-object v7 - invoke-direct {v6, v2}, Ljava/lang/Exception;->(Ljava/lang/String;)V + new-instance v8, Ljava/lang/Exception; - invoke-interface {v3, v4, v5, v6}, Lkotlin/jvm/functions/Function3;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + new-instance v9, Ljava/lang/StringBuilder; + + const-string v10, "Found " + + invoke-direct {v9, v10}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V + + invoke-virtual {v3}, Ljava/lang/Object;->getClass()Ljava/lang/Class; + + move-result-object v3 + + invoke-virtual {v9, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + + const-string v3, " for " + + invoke-virtual {v9, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + iget-object v3, p0, Lcom/discord/utilities/persister/Persister;->key:Ljava/lang/String; + + invoke-virtual {v9, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + const-string v3, ", but expecting " + + invoke-virtual {v9, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v4}, Ljava/lang/Object;->getClass()Ljava/lang/Class; + + move-result-object v3 + + invoke-virtual {v9, v3}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + + invoke-virtual {v9}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + + move-result-object v3 + + invoke-direct {v8, v3}, Ljava/lang/Exception;->(Ljava/lang/String;)V + + invoke-interface {v5, v6, v7, v8}, Lkotlin/jvm/functions/Function3;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; :try_end_1 .catch Ljava/lang/Throwable; {:try_start_1 .. :try_end_1} :catch_0 .catchall {:try_start_1 .. :try_end_1} :catchall_0 - goto :goto_0 - + :cond_2 :goto_1 :try_start_2 - invoke-static {v0, v1}, Lkotlin/e/a;->a(Ljava/io/Closeable;Ljava/lang/Throwable;)V + invoke-static {v1, v2}, Lkotlin/e/a;->a(Ljava/io/Closeable;Ljava/lang/Throwable;)V :try_end_2 .catch Ljava/lang/Exception; {:try_start_2 .. :try_end_2} :catch_1 - if-nez v2, :cond_4 + if-nez v4, :cond_4 goto :goto_3 :catchall_0 - move-exception v2 + move-exception v3 goto :goto_2 :catch_0 - move-exception v1 + move-exception v2 :try_start_3 - throw v1 + throw v2 :try_end_3 .catchall {:try_start_3 .. :try_end_3} :catchall_0 :goto_2 :try_start_4 - invoke-static {v0, v1}, Lkotlin/e/a;->a(Ljava/io/Closeable;Ljava/lang/Throwable;)V + invoke-static {v1, v2}, Lkotlin/e/a;->a(Ljava/io/Closeable;Ljava/lang/Throwable;)V - throw v2 + throw v3 :cond_3 :goto_3 - iget-object v2, p0, Lcom/discord/utilities/persister/Persister;->value:Ljava/lang/Object; + iget-object v4, p0, Lcom/discord/utilities/persister/Persister;->value:Ljava/lang/Object; :try_end_4 .catch Ljava/lang/Exception; {:try_start_4 .. :try_end_4} :catch_1 goto :goto_4 :catch_1 - move-exception v0 + move-exception v1 - sget-object v1, Lcom/discord/utilities/persister/Persister;->logger:Lkotlin/jvm/functions/Function3; + sget-object v2, Lcom/discord/utilities/persister/Persister;->logger:Lkotlin/jvm/functions/Function3; - const/4 v2, 0x5 + const/4 v3, 0x5 - invoke-static {v2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; - - move-result-object v2 - - new-instance v3, Ljava/lang/StringBuilder; - - const-string v4, "Unable to deserialize preference " - - invoke-direct {v3, v4}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V - - iget-object v4, p0, Lcom/discord/utilities/persister/Persister;->key:Ljava/lang/String; - - invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - - const/16 v4, 0x2e - - invoke-virtual {v3, v4}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder; - - invoke-virtual {v3}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; move-result-object v3 + new-instance v4, Ljava/lang/StringBuilder; + + const-string v5, "Unable to deserialize preference " + + invoke-direct {v4, v5}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V + + iget-object v5, p0, Lcom/discord/utilities/persister/Persister;->key:Ljava/lang/String; + + invoke-virtual {v4, v5}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {v4, v0}, Ljava/lang/StringBuilder;->append(C)Ljava/lang/StringBuilder; + + invoke-virtual {v4}, Ljava/lang/StringBuilder;->toString()Ljava/lang/String; + + move-result-object v0 + new-instance v4, Ljava/lang/Exception; iget-object v5, p0, Lcom/discord/utilities/persister/Persister;->key:Ljava/lang/String; - check-cast v0, Ljava/lang/Throwable; + check-cast v1, Ljava/lang/Throwable; - invoke-direct {v4, v5, v0}, Ljava/lang/Exception;->(Ljava/lang/String;Ljava/lang/Throwable;)V + invoke-direct {v4, v5, v1}, Ljava/lang/Exception;->(Ljava/lang/String;Ljava/lang/Throwable;)V - invoke-interface {v1, v2, v3, v4}, Lkotlin/jvm/functions/Function3;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v2, v3, v0, v4}, Lkotlin/jvm/functions/Function3;->invoke(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; - iget-object v2, p0, Lcom/discord/utilities/persister/Persister;->value:Ljava/lang/Object; + iget-object v4, p0, Lcom/discord/utilities/persister/Persister;->value:Ljava/lang/Object; :cond_4 :goto_4 - return-object v2 + return-object v4 .end method .method public static final isPreloaded()Lrx/Observable; 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 ebf8122973..3947b99985 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 @@ -88,7 +88,7 @@ return-object p1 :pswitch_0 - const p2, 0x7f120f89 + const p2, 0x7f120f8a :goto_0 invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -98,17 +98,17 @@ return-object p1 :pswitch_1 - const p2, 0x7f120930 + const p2, 0x7f120931 goto :goto_0 :pswitch_2 - const p2, 0x7f120d81 + const p2, 0x7f120d82 goto :goto_0 :pswitch_3 - const p2, 0x7f120b37 + const p2, 0x7f120b38 goto :goto_0 diff --git a/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali b/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali index 721be2437f..f6f80d2fbb 100644 --- a/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali +++ b/com.discord/smali/com/discord/utilities/presence/PresenceUtils.smali @@ -42,7 +42,7 @@ move-result v0 - const v1, 0x7f120ec6 + const v1, 0x7f120ec7 const/4 v2, 0x0 @@ -58,7 +58,7 @@ goto :goto_1 :pswitch_1 - const v0, 0x7f120ec8 + const v0, 0x7f120ec9 new-array v1, v3, [Ljava/lang/Object; @@ -71,7 +71,7 @@ goto :goto_0 :pswitch_2 - const v0, 0x7f120ec4 + const v0, 0x7f120ec5 new-array v1, v3, [Ljava/lang/Object; @@ -84,7 +84,7 @@ goto :goto_0 :pswitch_3 - const v0, 0x7f120ec5 + const v0, 0x7f120ec6 new-array v1, v3, [Ljava/lang/Object; @@ -215,7 +215,7 @@ if-ne v0, v1, :cond_2 - const p1, 0x7f120d74 + const p1, 0x7f120d75 return p1 @@ -234,7 +234,7 @@ if-ne v0, v1, :cond_4 - const p1, 0x7f120d70 + const p1, 0x7f120d71 return p1 @@ -253,13 +253,13 @@ if-ne p1, v0, :cond_6 - const p1, 0x7f120d6e + const p1, 0x7f120d6f return p1 :cond_6 :goto_3 - const p1, 0x7f120d73 + const p1, 0x7f120d74 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 eaf06728a3..61de49eb46 100644 --- a/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali +++ b/com.discord/smali/com/discord/utilities/rest/RestAPI$AppHeadersProvider.smali @@ -136,7 +136,7 @@ .method public final getUserAgent()Ljava/lang/String; .locals 1 - const-string v0, "Discord-Android/823" + const-string v0, "Discord-Android/824" return-object v0 .end method diff --git a/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages.smali b/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages.smali index 80d890f5c3..95954cdd8a 100644 --- a/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages.smali +++ b/com.discord/smali/com/discord/utilities/rest/RestAPIAbortMessages.smali @@ -37,7 +37,7 @@ move-result-object v2 - const v3, 0x7f1202a4 + const v3, 0x7f1202a5 invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -57,7 +57,7 @@ move-result-object v2 - const v3, 0x7f1202a0 + const v3, 0x7f1202a1 invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -77,7 +77,7 @@ move-result-object v2 - const v3, 0x7f12029f + const v3, 0x7f1202a0 invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -97,7 +97,7 @@ move-result-object v2 - const v3, 0x7f1202a1 + const v3, 0x7f1202a2 invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; diff --git a/com.discord/smali/com/discord/utilities/rest/SendUtils.smali b/com.discord/smali/com/discord/utilities/rest/SendUtils.smali index 98d6ab200d..597e1972f8 100644 --- a/com.discord/smali/com/discord/utilities/rest/SendUtils.smali +++ b/com.discord/smali/com/discord/utilities/rest/SendUtils.smali @@ -931,7 +931,7 @@ if-eqz p2, :cond_0 - const p2, 0x7f1204d0 + const p2, 0x7f1204d1 :goto_0 invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -941,7 +941,7 @@ goto :goto_1 :cond_0 - const p2, 0x7f1204d1 + const p2, 0x7f1204d2 goto :goto_0 @@ -1372,7 +1372,7 @@ goto :goto_0 :cond_2 - const p3, 0x7f120ea2 + const p3, 0x7f120ea3 invoke-static {p2, p3}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V 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 d6145f0454..3540d06295 100644 --- a/com.discord/smali/com/discord/utilities/search/strings/ContextSearchStringProvider.smali +++ b/com.discord/smali/com/discord/utilities/search/strings/ContextSearchStringProvider.smali @@ -37,7 +37,7 @@ invoke-direct {p0}, Ljava/lang/Object;->()V - const v0, 0x7f120ca5 + const v0, 0x7f120ca6 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -49,7 +49,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->fromFilterString:Ljava/lang/String; - const v0, 0x7f120ca7 + const v0, 0x7f120ca8 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -61,7 +61,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->inFilterString:Ljava/lang/String; - const v0, 0x7f120ca9 + const v0, 0x7f120caa invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -73,7 +73,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->mentionsFilterString:Ljava/lang/String; - const v0, 0x7f120ca6 + const v0, 0x7f120ca7 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -85,7 +85,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->hasFilterString:Ljava/lang/String; - const v0, 0x7f120c92 + const v0, 0x7f120c93 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -97,7 +97,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->linkAnswerString:Ljava/lang/String; - const v0, 0x7f120c90 + const v0, 0x7f120c91 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -109,7 +109,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->embedAnswerString:Ljava/lang/String; - const v0, 0x7f120c8f + const v0, 0x7f120c90 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -121,7 +121,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->fileAnswerString:Ljava/lang/String; - const v0, 0x7f120c94 + const v0, 0x7f120c95 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -133,7 +133,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->videoAnswerString:Ljava/lang/String; - const v0, 0x7f120c91 + const v0, 0x7f120c92 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -145,7 +145,7 @@ iput-object v0, p0, Lcom/discord/utilities/search/strings/ContextSearchStringProvider;->imageAnswerString:Ljava/lang/String; - const v0, 0x7f120c93 + const v0, 0x7f120c94 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 f91844a15c..f407f8cf72 100644 --- a/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler.smali +++ b/com.discord/smali/com/discord/utilities/stateful/StatefulViews$FragmentOnBackPressedHandler.smali @@ -189,11 +189,11 @@ check-cast v0, Landroid/widget/TextView; - const v5, 0x7f120441 + const v5, 0x7f120442 invoke-virtual {v2, v5}, Landroid/widget/TextView;->setText(I)V - const v2, 0x7f120442 + const v2, 0x7f120443 invoke-virtual {v3, v2}, Landroid/widget/TextView;->setText(I)V @@ -205,7 +205,7 @@ invoke-virtual {v4, v2}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V - const v2, 0x7f120a85 + const v2, 0x7f120a86 invoke-virtual {v0, v2}, Landroid/widget/TextView;->setText(I)V diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali index 712dd9800b..b0a00527cf 100644 --- a/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali +++ b/com.discord/smali/com/discord/utilities/textprocessing/MessagePreprocessor.smali @@ -22,14 +22,26 @@ # instance fields .field private customEmojiCount:I -.field private isFoundCode:Z +.field private hasCodeNode:Z .field private isFoundSelfMention:Z +.field private final messageState:Lcom/discord/stores/StoreMessageState$State; + .field private final myUserId:J .field private shouldJumboify:Z +.field private spoilers:Ljava/util/List; + .annotation system Ldalvik/annotation/Signature; + value = { + "Ljava/util/List<", + "Lcom/discord/utilities/textprocessing/node/SpoilerNode<", + "*>;>;" + } + .end annotation +.end field + # direct methods .method static constructor ()V @@ -46,13 +58,15 @@ return-void .end method -.method public constructor (J)V +.method public constructor (JLcom/discord/stores/StoreMessageState$State;)V .locals 0 invoke-direct {p0}, Ljava/lang/Object;->()V iput-wide p1, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->myUserId:J + iput-object p3, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->messageState:Lcom/discord/stores/StoreMessageState$State; + const/4 p1, 0x1 iput-boolean p1, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->shouldJumboify:Z @@ -60,14 +74,6 @@ return-void .end method -.method private final setFoundCode(Z)V - .locals 0 - - iput-boolean p1, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->isFoundCode:Z - - return-void -.end method - .method private final setFoundSelfMention(Z)V .locals 0 @@ -76,6 +82,22 @@ return-void .end method +.method private final setSpoilers(Ljava/util/List;)V + .locals 0 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Ljava/util/List<", + "Lcom/discord/utilities/textprocessing/node/SpoilerNode<", + "*>;>;)V" + } + .end annotation + + iput-object p1, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->spoilers:Ljava/util/List; + + return-void +.end method + # virtual methods .method public final getMyUserId()J @@ -86,12 +108,20 @@ return-wide v0 .end method -.method public final isFoundCode()Z +.method public final getSpoilers()Ljava/util/List; .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Ljava/util/List<", + "Lcom/discord/utilities/textprocessing/node/SpoilerNode<", + "*>;>;" + } + .end annotation - iget-boolean v0, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->isFoundCode:Z + iget-object v0, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->spoilers:Ljava/util/List; - return v0 + return-object v0 .end method .method public final isFoundSelfMention()Z @@ -102,6 +132,53 @@ return v0 .end method +.method public final isLinkifyConflicting()Z + .locals 3 + + iget-boolean v0, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->hasCodeNode:Z + + const/4 v1, 0x1 + + if-nez v0, :cond_3 + + iget-object v0, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->spoilers:Ljava/util/List; + + check-cast v0, Ljava/util/Collection; + + const/4 v2, 0x0 + + if-eqz v0, :cond_1 + + invoke-interface {v0}, Ljava/util/Collection;->isEmpty()Z + + move-result v0 + + if-eqz v0, :cond_0 + + goto :goto_0 + + :cond_0 + const/4 v0, 0x0 + + goto :goto_1 + + :cond_1 + :goto_0 + const/4 v0, 0x1 + + :goto_1 + if-nez v0, :cond_2 + + goto :goto_2 + + :cond_2 + return v2 + + :cond_3 + :goto_2 + return v1 +.end method + .method public final process(Ljava/util/Collection;)V .locals 1 .annotation system Ldalvik/annotation/Signature; @@ -215,16 +292,21 @@ :goto_1 if-eqz v0, :cond_3 - const/4 v1, 0x1 + const/4 v0, 0x1 + + goto :goto_2 :cond_3 - iput-boolean v1, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->shouldJumboify:Z + const/4 v0, 0x0 + + :goto_2 + iput-boolean v0, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->shouldJumboify:Z instance-of v0, p1, Lcom/discord/utilities/textprocessing/node/CodeNode; if-eqz v0, :cond_4 - iput-boolean v2, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->isFoundCode:Z + iput-boolean v2, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->hasCodeNode:Z return-void @@ -243,10 +325,59 @@ cmp-long p1, v0, v3 - if-nez p1, :cond_5 + if-nez p1, :cond_8 iput-boolean v2, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->isFoundSelfMention:Z + return-void + :cond_5 + instance-of v0, p1, Lcom/discord/utilities/textprocessing/node/SpoilerNode; + + if-eqz v0, :cond_8 + + iget-object v0, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->spoilers:Ljava/util/List; + + if-nez v0, :cond_6 + + new-instance v0, Ljava/util/ArrayList; + + invoke-direct {v0}, Ljava/util/ArrayList;->()V + + check-cast v0, Ljava/util/List; + + iput-object v0, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->spoilers:Ljava/util/List; + + :cond_6 + invoke-interface {v0, p1}, Ljava/util/List;->add(Ljava/lang/Object;)Z + + invoke-interface {v0}, Ljava/util/List;->size()I + + move-result v0 + + iget-object v2, p0, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->messageState:Lcom/discord/stores/StoreMessageState$State; + + if-eqz v2, :cond_7 + + invoke-virtual {v2}, Lcom/discord/stores/StoreMessageState$State;->getVisibleSpoilerNodeIndices()Ljava/util/Set; + + move-result-object v2 + + if-eqz v2, :cond_7 + + invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + + move-result-object v1 + + invoke-interface {v2, v1}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z + + move-result v1 + + :cond_7 + check-cast p1, Lcom/discord/utilities/textprocessing/node/SpoilerNode; + + invoke-virtual {p1, v0, v1}, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->updateState(IZ)V + + :cond_8 return-void .end method diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessageRenderContext.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessageRenderContext.smali index 5e41033550..36ea69cd70 100644 --- a/com.discord/smali/com/discord/utilities/textprocessing/MessageRenderContext.smali +++ b/com.discord/smali/com/discord/utilities/textprocessing/MessageRenderContext.smali @@ -2,11 +2,11 @@ .super Ljava/lang/Object; # interfaces +.implements Lcom/discord/utilities/textprocessing/node/BasicRenderContext; .implements Lcom/discord/utilities/textprocessing/node/ChannelMentionNode$RenderContext; -.implements Lcom/discord/utilities/textprocessing/node/CodeNode$RenderContext; .implements Lcom/discord/utilities/textprocessing/node/EmojiNode$RenderContext; -.implements Lcom/discord/utilities/textprocessing/node/InviteNode$RenderContext; .implements Lcom/discord/utilities/textprocessing/node/RoleMentionNode$RenderContext; +.implements Lcom/discord/utilities/textprocessing/node/SpoilerNode$RenderContext; .implements Lcom/discord/utilities/textprocessing/node/UrlNode$RenderContext; .implements Lcom/discord/utilities/textprocessing/node/UserMentionNode$RenderContext; @@ -42,6 +42,18 @@ .end annotation .end field +.field private final spoilerOnClick:Lkotlin/jvm/functions/Function1; + .annotation system Ldalvik/annotation/Signature; + value = { + "Lkotlin/jvm/functions/Function1<", + "Lcom/discord/utilities/textprocessing/node/SpoilerNode<", + "*>;", + "Lkotlin/Unit;", + ">;" + } + .end annotation +.end field + .field private final userNames:Ljava/util/Map; .annotation system Ldalvik/annotation/Signature; value = { @@ -56,7 +68,7 @@ # direct methods .method public constructor (Landroid/content/Context;JZ)V - .locals 11 + .locals 12 const/4 v5, 0x0 @@ -66,9 +78,11 @@ const/4 v8, 0x0 - const/16 v9, 0x78 + const/4 v9, 0x0 - const/4 v10, 0x0 + const/16 v10, 0xf8 + + const/4 v11, 0x0 move-object v0, p0 @@ -76,15 +90,15 @@ move-wide v2, p2 - move v4, p4 + move/from16 v4, p4 - invoke-direct/range {v0 .. v10}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->(Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;IILkotlin/jvm/internal/DefaultConstructorMarker;)V + invoke-direct/range {v0 .. v11}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->(Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;ILkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V return-void .end method .method public constructor (Landroid/content/Context;JZLjava/util/Map;)V - .locals 11 + .locals 12 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -103,9 +117,11 @@ const/4 v8, 0x0 - const/16 v9, 0x70 + const/4 v9, 0x0 - const/4 v10, 0x0 + const/16 v10, 0xf0 + + const/4 v11, 0x0 move-object v0, p0 @@ -113,17 +129,17 @@ move-wide v2, p2 - move v4, p4 + move/from16 v4, p4 move-object/from16 v5, p5 - invoke-direct/range {v0 .. v10}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->(Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;IILkotlin/jvm/internal/DefaultConstructorMarker;)V + invoke-direct/range {v0 .. v11}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->(Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;ILkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V return-void .end method .method public constructor (Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;)V - .locals 11 + .locals 12 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -144,9 +160,11 @@ const/4 v8, 0x0 - const/16 v9, 0x60 + const/4 v9, 0x0 - const/4 v10, 0x0 + const/16 v10, 0xe0 + + const/4 v11, 0x0 move-object v0, p0 @@ -154,19 +172,19 @@ move-wide v2, p2 - move v4, p4 + move/from16 v4, p4 move-object/from16 v5, p5 move-object/from16 v6, p6 - invoke-direct/range {v0 .. v10}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->(Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;IILkotlin/jvm/internal/DefaultConstructorMarker;)V + invoke-direct/range {v0 .. v11}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->(Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;ILkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V return-void .end method .method public constructor (Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;)V - .locals 11 + .locals 12 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -190,9 +208,11 @@ const/4 v8, 0x0 - const/16 v9, 0x40 + const/4 v9, 0x0 - const/4 v10, 0x0 + const/16 v10, 0xc0 + + const/4 v11, 0x0 move-object v0, p0 @@ -200,7 +220,7 @@ move-wide v2, p2 - move v4, p4 + move/from16 v4, p4 move-object/from16 v5, p5 @@ -208,13 +228,13 @@ move-object/from16 v7, p7 - invoke-direct/range {v0 .. v10}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->(Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;IILkotlin/jvm/internal/DefaultConstructorMarker;)V + invoke-direct/range {v0 .. v11}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->(Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;ILkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V return-void .end method .method public constructor (Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;I)V - .locals 1 + .locals 12 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -236,6 +256,62 @@ } .end annotation + const/4 v9, 0x0 + + const/16 v10, 0x80 + + const/4 v11, 0x0 + + move-object v0, p0 + + move-object v1, p1 + + move-wide v2, p2 + + move/from16 v4, p4 + + move-object/from16 v5, p5 + + move-object/from16 v6, p6 + + move-object/from16 v7, p7 + + move/from16 v8, p8 + + invoke-direct/range {v0 .. v11}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->(Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;ILkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + + return-void +.end method + +.method public constructor (Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;ILkotlin/jvm/functions/Function1;)V + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Landroid/content/Context;", + "JZ", + "Ljava/util/Map<", + "Ljava/lang/Long;", + "Ljava/lang/String;", + ">;", + "Ljava/util/Map<", + "Ljava/lang/Long;", + "Ljava/lang/String;", + ">;", + "Ljava/util/Map<", + "Ljava/lang/Long;", + "+", + "Lcom/discord/models/domain/ModelGuildRole;", + ">;I", + "Lkotlin/jvm/functions/Function1<", + "-", + "Lcom/discord/utilities/textprocessing/node/SpoilerNode<", + "*>;", + "Lkotlin/Unit;", + ">;)V" + } + .end annotation + const-string v0, "context" invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V @@ -256,13 +332,17 @@ iput p8, p0, Lcom/discord/utilities/textprocessing/MessageRenderContext;->linkColorResId:I + iput-object p9, p0, Lcom/discord/utilities/textprocessing/MessageRenderContext;->spoilerOnClick:Lkotlin/jvm/functions/Function1; + return-void .end method -.method public synthetic constructor (Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;IILkotlin/jvm/internal/DefaultConstructorMarker;)V - .locals 12 +.method public synthetic constructor (Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;ILkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V + .locals 13 - and-int/lit8 v1, p9, 0x8 + move/from16 v0, p10 + + and-int/lit8 v1, v0, 0x8 const/4 v2, 0x0 @@ -276,7 +356,7 @@ move-object/from16 v8, p5 :goto_0 - and-int/lit8 v1, p9, 0x10 + and-int/lit8 v1, v0, 0x10 if-eqz v1, :cond_1 @@ -288,7 +368,7 @@ move-object/from16 v9, p6 :goto_1 - and-int/lit8 v1, p9, 0x20 + and-int/lit8 v1, v0, 0x20 if-eqz v1, :cond_2 @@ -300,11 +380,11 @@ move-object/from16 v10, p7 :goto_2 - and-int/lit8 v0, p9, 0x40 + and-int/lit8 v1, v0, 0x40 - if-eqz v0, :cond_3 + if-eqz v1, :cond_3 - const v0, 0x7f06008f + const v1, 0x7f06008f const v11, 0x7f06008f @@ -314,6 +394,18 @@ move/from16 v11, p8 :goto_3 + and-int/lit16 v0, v0, 0x80 + + if-eqz v0, :cond_4 + + move-object v12, v2 + + goto :goto_4 + + :cond_4 + move-object/from16 v12, p9 + + :goto_4 move-object v3, p0 move-object v4, p1 @@ -322,15 +414,17 @@ move/from16 v7, p4 - invoke-direct/range {v3 .. v11}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->(Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;I)V + invoke-direct/range {v3 .. v12}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->(Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;ILkotlin/jvm/functions/Function1;)V return-void .end method -.method public static synthetic copy$default(Lcom/discord/utilities/textprocessing/MessageRenderContext;Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;IILjava/lang/Object;)Lcom/discord/utilities/textprocessing/MessageRenderContext; - .locals 8 +.method public static synthetic copy$default(Lcom/discord/utilities/textprocessing/MessageRenderContext;Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;ILkotlin/jvm/functions/Function1;ILjava/lang/Object;)Lcom/discord/utilities/textprocessing/MessageRenderContext; + .locals 9 - and-int/lit8 v1, p9, 0x1 + move/from16 v0, p10 + + and-int/lit8 v1, v0, 0x1 if-eqz v1, :cond_0 @@ -344,7 +438,7 @@ move-object v1, p1 :goto_0 - and-int/lit8 v2, p9, 0x2 + and-int/lit8 v2, v0, 0x2 if-eqz v2, :cond_1 @@ -358,7 +452,7 @@ move-wide v2, p2 :goto_1 - and-int/lit8 v4, p9, 0x4 + and-int/lit8 v4, v0, 0x4 if-eqz v4, :cond_2 @@ -372,7 +466,7 @@ move v4, p4 :goto_2 - and-int/lit8 v5, p9, 0x8 + and-int/lit8 v5, v0, 0x8 if-eqz v5, :cond_3 @@ -386,7 +480,7 @@ move-object v5, p5 :goto_3 - and-int/lit8 v6, p9, 0x10 + and-int/lit8 v6, v0, 0x10 if-eqz v6, :cond_4 @@ -400,7 +494,7 @@ move-object v6, p6 :goto_4 - and-int/lit8 v7, p9, 0x20 + and-int/lit8 v7, v0, 0x20 if-eqz v7, :cond_5 @@ -411,23 +505,37 @@ goto :goto_5 :cond_5 - move-object v7, p7 + move-object/from16 v7, p7 :goto_5 - and-int/lit8 v0, p9, 0x40 + and-int/lit8 v8, v0, 0x40 - if-eqz v0, :cond_6 + if-eqz v8, :cond_6 invoke-virtual {p0}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->getLinkColorResId()I - move-result v0 + move-result v8 goto :goto_6 :cond_6 - move/from16 v0, p8 + move/from16 v8, p8 :goto_6 + and-int/lit16 v0, v0, 0x80 + + if-eqz v0, :cond_7 + + invoke-virtual {p0}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->getSpoilerOnClick()Lkotlin/jvm/functions/Function1; + + move-result-object v0 + + goto :goto_7 + + :cond_7 + move-object/from16 v0, p9 + + :goto_7 move-object p1, v1 move-wide p2, v2 @@ -438,11 +546,13 @@ move-object p6, v6 - move-object p7, v7 + move-object/from16 p7, v7 - move/from16 p8, v0 + move/from16 p8, v8 - invoke-virtual/range {p0 .. p8}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->copy(Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;I)Lcom/discord/utilities/textprocessing/MessageRenderContext; + move-object/from16 p9, v0 + + invoke-virtual/range {p0 .. p9}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->copy(Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;ILkotlin/jvm/functions/Function1;)Lcom/discord/utilities/textprocessing/MessageRenderContext; move-result-object v0 @@ -548,8 +658,28 @@ return v0 .end method -.method public final copy(Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;I)Lcom/discord/utilities/textprocessing/MessageRenderContext; - .locals 10 +.method public final component8()Lkotlin/jvm/functions/Function1; + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Lkotlin/jvm/functions/Function1<", + "Lcom/discord/utilities/textprocessing/node/SpoilerNode<", + "*>;", + "Lkotlin/Unit;", + ">;" + } + .end annotation + + invoke-virtual {p0}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->getSpoilerOnClick()Lkotlin/jvm/functions/Function1; + + move-result-object v0 + + return-object v0 +.end method + +.method public final copy(Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;ILkotlin/jvm/functions/Function1;)Lcom/discord/utilities/textprocessing/MessageRenderContext; + .locals 11 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -567,7 +697,13 @@ "Ljava/lang/Long;", "+", "Lcom/discord/models/domain/ModelGuildRole;", - ">;I)", + ">;I", + "Lkotlin/jvm/functions/Function1<", + "-", + "Lcom/discord/utilities/textprocessing/node/SpoilerNode<", + "*>;", + "Lkotlin/Unit;", + ">;)", "Lcom/discord/utilities/textprocessing/MessageRenderContext;" } .end annotation @@ -586,7 +722,7 @@ move v5, p4 - move-object v6, p5 + move-object/from16 v6, p5 move-object/from16 v7, p6 @@ -594,7 +730,9 @@ move/from16 v9, p8 - invoke-direct/range {v1 .. v9}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->(Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;I)V + move-object/from16 v10, p9 + + invoke-direct/range {v1 .. v10}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->(Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;ILkotlin/jvm/functions/Function1;)V return-object v0 .end method @@ -718,18 +856,32 @@ invoke-virtual {p1}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->getLinkColorResId()I - move-result p1 + move-result v3 - if-ne v1, p1, :cond_2 + if-ne v1, v3, :cond_2 - const/4 p1, 0x1 + const/4 v1, 0x1 goto :goto_2 :cond_2 - const/4 p1, 0x0 + const/4 v1, 0x0 :goto_2 + if-eqz v1, :cond_3 + + invoke-virtual {p0}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->getSpoilerOnClick()Lkotlin/jvm/functions/Function1; + + move-result-object v1 + + invoke-virtual {p1}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->getSpoilerOnClick()Lkotlin/jvm/functions/Function1; + + move-result-object p1 + + invoke-static {v1, p1}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z + + move-result p1 + if-eqz p1, :cond_3 goto :goto_3 @@ -800,6 +952,24 @@ return-object v0 .end method +.method public final getSpoilerOnClick()Lkotlin/jvm/functions/Function1; + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Lkotlin/jvm/functions/Function1<", + "Lcom/discord/utilities/textprocessing/node/SpoilerNode<", + "*>;", + "Lkotlin/Unit;", + ">;" + } + .end annotation + + iget-object v0, p0, Lcom/discord/utilities/textprocessing/MessageRenderContext;->spoilerOnClick:Lkotlin/jvm/functions/Function1; + + return-object v0 +.end method + .method public final getUserNames()Ljava/util/Map; .locals 1 .annotation system Ldalvik/annotation/Signature; @@ -917,17 +1087,37 @@ invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I - move-result v1 + move-result v2 + + goto :goto_3 :cond_4 - add-int/2addr v0, v1 + const/4 v2, 0x0 + + :goto_3 + add-int/2addr v0, v2 mul-int/lit8 v0, v0, 0x1f invoke-virtual {p0}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->getLinkColorResId()I + move-result v2 + + add-int/2addr v0, v2 + + mul-int/lit8 v0, v0, 0x1f + + invoke-virtual {p0}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->getSpoilerOnClick()Lkotlin/jvm/functions/Function1; + + move-result-object v2 + + if-eqz v2, :cond_5 + + invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I + move-result v1 + :cond_5 add-int/2addr v0, v1 return v0 @@ -1016,6 +1206,16 @@ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(I)Ljava/lang/StringBuilder; + const-string v1, ", spoilerOnClick=" + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + invoke-virtual {p0}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->getSpoilerOnClick()Lkotlin/jvm/functions/Function1; + + move-result-object v1 + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + const-string v1, ")" invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; diff --git a/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali b/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali index c364f185bd..be2e9b84bb 100644 --- a/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali +++ b/com.discord/smali/com/discord/utilities/textprocessing/MessageUtils.smali @@ -32,7 +32,6 @@ :array_0 .array-data 4 - 0x7f120da5 0x7f120da6 0x7f120da7 0x7f120da8 @@ -71,6 +70,7 @@ 0x7f120dc9 0x7f120dca 0x7f120dcb + 0x7f120dcc .end array-data .end method diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules$createSpoilerRule$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createSpoilerRule$1.smali new file mode 100644 index 0000000000..32abf90530 --- /dev/null +++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules$createSpoilerRule$1.smali @@ -0,0 +1,111 @@ +.class public final Lcom/discord/utilities/textprocessing/Rules$createSpoilerRule$1; +.super Lcom/discord/simpleast/core/parser/Rule; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/utilities/textprocessing/Rules;->createSpoilerRule()Lcom/discord/simpleast/core/parser/Rule; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x19 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "Lcom/discord/simpleast/core/parser/Rule<", + "TT;", + "Lcom/discord/utilities/textprocessing/node/SpoilerNode<", + "TT;>;>;" + } +.end annotation + + +# instance fields +.field final synthetic this$0:Lcom/discord/utilities/textprocessing/Rules; + + +# direct methods +.method constructor (Lcom/discord/utilities/textprocessing/Rules;Ljava/util/regex/Pattern;)V + .locals 0 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Ljava/util/regex/Pattern;", + ")V" + } + .end annotation + + iput-object p1, p0, Lcom/discord/utilities/textprocessing/Rules$createSpoilerRule$1;->this$0:Lcom/discord/utilities/textprocessing/Rules; + + invoke-direct {p0, p2}, Lcom/discord/simpleast/core/parser/Rule;->(Ljava/util/regex/Pattern;)V + + return-void +.end method + + +# virtual methods +.method public final parse(Ljava/util/regex/Matcher;Lcom/discord/simpleast/core/parser/Parser;)Lcom/discord/simpleast/core/parser/ParseSpec; + .locals 5 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Ljava/util/regex/Matcher;", + "Lcom/discord/simpleast/core/parser/Parser<", + "TT;-", + "Lcom/discord/utilities/textprocessing/node/SpoilerNode<", + "TT;>;>;)", + "Lcom/discord/simpleast/core/parser/ParseSpec<", + "TT;", + "Lcom/discord/utilities/textprocessing/node/SpoilerNode<", + "TT;>;>;" + } + .end annotation + + const-string v0, "matcher" + + invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V + + const-string v0, "parser" + + invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V + + sget-object p2, Lcom/discord/simpleast/core/parser/ParseSpec;->yq:Lcom/discord/simpleast/core/parser/ParseSpec$a; + + new-instance p2, Lcom/discord/utilities/textprocessing/node/SpoilerNode; + + const/4 v0, 0x1 + + invoke-virtual {p1, v0}, Ljava/util/regex/Matcher;->group(I)Ljava/lang/String; + + move-result-object v1 + + const-string v2, "matcher.group(1)" + + invoke-static {v1, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + const/4 v2, 0x0 + + const/4 v3, 0x2 + + const/4 v4, 0x0 + + invoke-direct {p2, v1, v2, v3, v4}, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->(Ljava/lang/String;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V + + check-cast p2, Lcom/discord/simpleast/core/node/Node; + + invoke-virtual {p1, v0}, Ljava/util/regex/Matcher;->start(I)I + + move-result v1 + + invoke-virtual {p1, v0}, Ljava/util/regex/Matcher;->end(I)I + + move-result p1 + + invoke-static {p2, v1, p1}, Lcom/discord/simpleast/core/parser/ParseSpec$a;->a(Lcom/discord/simpleast/core/node/Node;II)Lcom/discord/simpleast/core/parser/ParseSpec; + + move-result-object p1 + + return-object p1 +.end method diff --git a/com.discord/smali/com/discord/utilities/textprocessing/Rules.smali b/com.discord/smali/com/discord/utilities/textprocessing/Rules.smali index 547f2b05aa..0dd050c743 100644 --- a/com.discord/smali/com/discord/utilities/textprocessing/Rules.smali +++ b/com.discord/smali/com/discord/utilities/textprocessing/Rules.smali @@ -45,6 +45,8 @@ .field private static final PATTERN_SOFT_HYPHEN:Ljava/util/regex/Pattern; +.field private static final PATTERN_SPOILER:Ljava/util/regex/Pattern; + .field private static final PATTERN_UNESCAPE_EMOTICON:Ljava/util/regex/Pattern; .field private static final PATTERN_UNICODE_EMOJI$delegate:Lkotlin/Lazy; @@ -220,6 +222,14 @@ sput-object v0, Lcom/discord/utilities/textprocessing/Rules;->PATTERN_INLINE_CODE:Ljava/util/regex/Pattern; + const-string v0, "^\\{\\{([\\s\\S]+?)\\}\\}" + + invoke-static {v0}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;)Ljava/util/regex/Pattern; + + move-result-object v0 + + sput-object v0, Lcom/discord/utilities/textprocessing/Rules;->PATTERN_SPOILER:Ljava/util/regex/Pattern; + const-string v0, "^\\$\\[((?:\\[[^]]*]|[^]]|](?=[^\\[]*]))*)?]\\(\\s*?(?:\\s+[\'\"]([\\s\\S]*?)[\'\"])?\\s*\\)" invoke-static {v0}, Ljava/util/regex/Pattern;->compile(Ljava/lang/String;)Ljava/util/regex/Pattern; @@ -468,7 +478,7 @@ .annotation system Ldalvik/annotation/Signature; value = { "()", "Lcom/discord/simpleast/core/parser/Rule<", "TT;", @@ -555,7 +565,7 @@ .annotation system Ldalvik/annotation/Signature; value = { "()", "Lcom/discord/simpleast/core/parser/Rule<", "TT;", @@ -584,7 +594,7 @@ .annotation system Ldalvik/annotation/Signature; value = { "()", "Lcom/discord/simpleast/core/parser/Rule<", "TT;", @@ -753,6 +763,35 @@ return-object v0 .end method +.method public final createSpoilerRule()Lcom/discord/simpleast/core/parser/Rule; + .locals 3 + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Lcom/discord/simpleast/core/parser/Rule<", + "TT;", + "Lcom/discord/utilities/textprocessing/node/SpoilerNode<", + "TT;>;>;" + } + .end annotation + + new-instance v0, Lcom/discord/utilities/textprocessing/Rules$createSpoilerRule$1; + + sget-object v1, Lcom/discord/utilities/textprocessing/Rules;->PATTERN_SPOILER:Ljava/util/regex/Pattern; + + const-string v2, "PATTERN_SPOILER" + + invoke-static {v1, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-direct {v0, p0, v1}, Lcom/discord/utilities/textprocessing/Rules$createSpoilerRule$1;->(Lcom/discord/utilities/textprocessing/Rules;Ljava/util/regex/Pattern;)V + + check-cast v0, Lcom/discord/simpleast/core/parser/Rule; + + return-object v0 +.end method + .method public final createTextReplacementRule()Lcom/discord/simpleast/core/parser/Rule; .locals 3 .annotation system Ldalvik/annotation/Signature; diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/BasicRenderContext.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/BasicRenderContext.smali new file mode 100644 index 0000000000..f8c6c67431 --- /dev/null +++ b/com.discord/smali/com/discord/utilities/textprocessing/node/BasicRenderContext.smali @@ -0,0 +1,7 @@ +.class public interface abstract Lcom/discord/utilities/textprocessing/node/BasicRenderContext; +.super Ljava/lang/Object; + + +# virtual methods +.method public abstract getContext()Landroid/content/Context; +.end method diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/ChannelMentionNode$RenderContext.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/ChannelMentionNode$RenderContext.smali index e6f481be5c..debf4516d0 100644 --- a/com.discord/smali/com/discord/utilities/textprocessing/node/ChannelMentionNode$RenderContext.smali +++ b/com.discord/smali/com/discord/utilities/textprocessing/node/ChannelMentionNode$RenderContext.smali @@ -1,6 +1,9 @@ .class public interface abstract Lcom/discord/utilities/textprocessing/node/ChannelMentionNode$RenderContext; .super Ljava/lang/Object; +# interfaces +.implements Lcom/discord/utilities/textprocessing/node/BasicRenderContext; + # annotations .annotation system Ldalvik/annotation/EnclosingClass; @@ -25,6 +28,3 @@ } .end annotation .end method - -.method public abstract getContext()Landroid/content/Context; -.end method diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/CodeNode$RenderContext.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/CodeNode$RenderContext.smali deleted file mode 100644 index 4f772ad1ce..0000000000 --- a/com.discord/smali/com/discord/utilities/textprocessing/node/CodeNode$RenderContext.smali +++ /dev/null @@ -1,18 +0,0 @@ -.class public interface abstract Lcom/discord/utilities/textprocessing/node/CodeNode$RenderContext; -.super Ljava/lang/Object; - - -# annotations -.annotation system Ldalvik/annotation/EnclosingClass; - value = Lcom/discord/utilities/textprocessing/node/CodeNode; -.end annotation - -.annotation system Ldalvik/annotation/InnerClass; - accessFlags = 0x609 - name = "RenderContext" -.end annotation - - -# virtual methods -.method public abstract getContext()Landroid/content/Context; -.end method diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/CodeNode.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/CodeNode.smali index bd81c4489d..cdb0d62b62 100644 --- a/com.discord/smali/com/discord/utilities/textprocessing/node/CodeNode.smali +++ b/com.discord/smali/com/discord/utilities/textprocessing/node/CodeNode.smali @@ -3,16 +3,10 @@ # annotations -.annotation system Ldalvik/annotation/MemberClasses; - value = { - Lcom/discord/utilities/textprocessing/node/CodeNode$RenderContext; - } -.end annotation - .annotation system Ldalvik/annotation/Signature; value = { "", "Lcom/discord/simpleast/core/node/a<", "TT;>;" @@ -94,7 +88,7 @@ return p1 .end method -.method public final render(Landroid/text/SpannableStringBuilder;Lcom/discord/utilities/textprocessing/node/CodeNode$RenderContext;)V +.method public final render(Landroid/text/SpannableStringBuilder;Lcom/discord/utilities/textprocessing/node/BasicRenderContext;)V .locals 9 .annotation system Ldalvik/annotation/Signature; value = { @@ -116,7 +110,7 @@ invoke-direct {v0}, Ljava/util/ArrayList;->()V - invoke-interface {p2}, Lcom/discord/utilities/textprocessing/node/CodeNode$RenderContext;->getContext()Landroid/content/Context; + invoke-interface {p2}, Lcom/discord/utilities/textprocessing/node/BasicRenderContext;->getContext()Landroid/content/Context; move-result-object p2 @@ -340,9 +334,9 @@ .method public final bridge synthetic render(Landroid/text/SpannableStringBuilder;Ljava/lang/Object;)V .locals 0 - check-cast p2, Lcom/discord/utilities/textprocessing/node/CodeNode$RenderContext; + check-cast p2, Lcom/discord/utilities/textprocessing/node/BasicRenderContext; - invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/textprocessing/node/CodeNode;->render(Landroid/text/SpannableStringBuilder;Lcom/discord/utilities/textprocessing/node/CodeNode$RenderContext;)V + invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/textprocessing/node/CodeNode;->render(Landroid/text/SpannableStringBuilder;Lcom/discord/utilities/textprocessing/node/BasicRenderContext;)V return-void .end method diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/InviteNode$RenderContext.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/InviteNode$RenderContext.smali deleted file mode 100644 index 8083b6cb8b..0000000000 --- a/com.discord/smali/com/discord/utilities/textprocessing/node/InviteNode$RenderContext.smali +++ /dev/null @@ -1,18 +0,0 @@ -.class public interface abstract Lcom/discord/utilities/textprocessing/node/InviteNode$RenderContext; -.super Ljava/lang/Object; - - -# annotations -.annotation system Ldalvik/annotation/EnclosingClass; - value = Lcom/discord/utilities/textprocessing/node/InviteNode; -.end annotation - -.annotation system Ldalvik/annotation/InnerClass; - accessFlags = 0x609 - name = "RenderContext" -.end annotation - - -# virtual methods -.method public abstract getContext()Landroid/content/Context; -.end method diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/InviteNode$render$styles$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/InviteNode$render$styles$1.smali index c966975dcd..97bf9a8ef9 100644 --- a/com.discord/smali/com/discord/utilities/textprocessing/node/InviteNode$render$styles$1.smali +++ b/com.discord/smali/com/discord/utilities/textprocessing/node/InviteNode$render$styles$1.smali @@ -7,7 +7,7 @@ # annotations .annotation system Ldalvik/annotation/EnclosingMethod; - value = Lcom/discord/utilities/textprocessing/node/InviteNode;->render(Landroid/text/SpannableStringBuilder;Lcom/discord/utilities/textprocessing/node/InviteNode$RenderContext;)V + value = Lcom/discord/utilities/textprocessing/node/InviteNode;->render(Landroid/text/SpannableStringBuilder;Lcom/discord/utilities/textprocessing/node/BasicRenderContext;)V .end annotation .annotation system Ldalvik/annotation/InnerClass; diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/InviteNode.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/InviteNode.smali index 939a8375db..caffe34629 100644 --- a/com.discord/smali/com/discord/utilities/textprocessing/node/InviteNode.smali +++ b/com.discord/smali/com/discord/utilities/textprocessing/node/InviteNode.smali @@ -3,16 +3,10 @@ # annotations -.annotation system Ldalvik/annotation/MemberClasses; - value = { - Lcom/discord/utilities/textprocessing/node/InviteNode$RenderContext; - } -.end annotation - .annotation system Ldalvik/annotation/Signature; value = { "", "Lcom/discord/simpleast/core/node/Node<", "TT;>;" @@ -41,7 +35,7 @@ # virtual methods -.method public final render(Landroid/text/SpannableStringBuilder;Lcom/discord/utilities/textprocessing/node/InviteNode$RenderContext;)V +.method public final render(Landroid/text/SpannableStringBuilder;Lcom/discord/utilities/textprocessing/node/BasicRenderContext;)V .locals 5 .annotation system Ldalvik/annotation/Signature; value = { @@ -59,7 +53,7 @@ invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V - invoke-interface {p2}, Lcom/discord/utilities/textprocessing/node/InviteNode$RenderContext;->getContext()Landroid/content/Context; + invoke-interface {p2}, Lcom/discord/utilities/textprocessing/node/BasicRenderContext;->getContext()Landroid/content/Context; move-result-object v0 @@ -69,7 +63,7 @@ move-result v0 - invoke-interface {p2}, Lcom/discord/utilities/textprocessing/node/InviteNode$RenderContext;->getContext()Landroid/content/Context; + invoke-interface {p2}, Lcom/discord/utilities/textprocessing/node/BasicRenderContext;->getContext()Landroid/content/Context; move-result-object p2 @@ -165,9 +159,9 @@ .method public final bridge synthetic render(Landroid/text/SpannableStringBuilder;Ljava/lang/Object;)V .locals 0 - check-cast p2, Lcom/discord/utilities/textprocessing/node/InviteNode$RenderContext; + check-cast p2, Lcom/discord/utilities/textprocessing/node/BasicRenderContext; - invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/textprocessing/node/InviteNode;->render(Landroid/text/SpannableStringBuilder;Lcom/discord/utilities/textprocessing/node/InviteNode$RenderContext;)V + invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/textprocessing/node/InviteNode;->render(Landroid/text/SpannableStringBuilder;Lcom/discord/utilities/textprocessing/node/BasicRenderContext;)V return-void .end method diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/SpoilerNode$RenderContext.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/SpoilerNode$RenderContext.smali new file mode 100644 index 0000000000..f5870c7152 --- /dev/null +++ b/com.discord/smali/com/discord/utilities/textprocessing/node/SpoilerNode$RenderContext.smali @@ -0,0 +1,31 @@ +.class public interface abstract Lcom/discord/utilities/textprocessing/node/SpoilerNode$RenderContext; +.super Ljava/lang/Object; + +# interfaces +.implements Lcom/discord/utilities/textprocessing/node/BasicRenderContext; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingClass; + value = Lcom/discord/utilities/textprocessing/node/SpoilerNode; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x609 + name = "RenderContext" +.end annotation + + +# virtual methods +.method public abstract getSpoilerOnClick()Lkotlin/jvm/functions/Function1; + .annotation system Ldalvik/annotation/Signature; + value = { + "()", + "Lkotlin/jvm/functions/Function1<", + "Lcom/discord/utilities/textprocessing/node/SpoilerNode<", + "*>;", + "Lkotlin/Unit;", + ">;" + } + .end annotation +.end method diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/SpoilerNode$createStyles$1.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/SpoilerNode$createStyles$1.smali new file mode 100644 index 0000000000..8fe49ef944 --- /dev/null +++ b/com.discord/smali/com/discord/utilities/textprocessing/node/SpoilerNode$createStyles$1.smali @@ -0,0 +1,81 @@ +.class final Lcom/discord/utilities/textprocessing/node/SpoilerNode$createStyles$1; +.super Lkotlin/jvm/internal/k; + +# interfaces +.implements Lkotlin/jvm/functions/Function1; + + +# annotations +.annotation system Ldalvik/annotation/EnclosingMethod; + value = Lcom/discord/utilities/textprocessing/node/SpoilerNode;->createStyles(Lcom/discord/utilities/textprocessing/node/SpoilerNode$RenderContext;)[Ljava/lang/Object; +.end annotation + +.annotation system Ldalvik/annotation/InnerClass; + accessFlags = 0x18 + name = null +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "Lkotlin/jvm/internal/k;", + "Lkotlin/jvm/functions/Function1<", + "Landroid/view/View;", + "Lkotlin/Unit;", + ">;" + } +.end annotation + + +# instance fields +.field final synthetic $onClick:Lkotlin/jvm/functions/Function1; + +.field final synthetic this$0:Lcom/discord/utilities/textprocessing/node/SpoilerNode; + + +# direct methods +.method constructor (Lcom/discord/utilities/textprocessing/node/SpoilerNode;Lkotlin/jvm/functions/Function1;)V + .locals 0 + + iput-object p1, p0, Lcom/discord/utilities/textprocessing/node/SpoilerNode$createStyles$1;->this$0:Lcom/discord/utilities/textprocessing/node/SpoilerNode; + + iput-object p2, p0, Lcom/discord/utilities/textprocessing/node/SpoilerNode$createStyles$1;->$onClick:Lkotlin/jvm/functions/Function1; + + const/4 p1, 0x1 + + invoke-direct {p0, p1}, Lkotlin/jvm/internal/k;->(I)V + + return-void +.end method + + +# virtual methods +.method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object; + .locals 0 + + check-cast p1, Landroid/view/View; + + invoke-virtual {p0, p1}, Lcom/discord/utilities/textprocessing/node/SpoilerNode$createStyles$1;->invoke(Landroid/view/View;)V + + sget-object p1, Lkotlin/Unit;->bPn:Lkotlin/Unit; + + return-object p1 +.end method + +.method public final invoke(Landroid/view/View;)V + .locals 1 + + const-string v0, "it" + + invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V + + iget-object p1, p0, Lcom/discord/utilities/textprocessing/node/SpoilerNode$createStyles$1;->$onClick:Lkotlin/jvm/functions/Function1; + + if-eqz p1, :cond_0 + + iget-object v0, p0, Lcom/discord/utilities/textprocessing/node/SpoilerNode$createStyles$1;->this$0:Lcom/discord/utilities/textprocessing/node/SpoilerNode; + + invoke-interface {p1, v0}, Lkotlin/jvm/functions/Function1;->invoke(Ljava/lang/Object;)Ljava/lang/Object; + + :cond_0 + return-void +.end method diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/SpoilerNode.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/SpoilerNode.smali new file mode 100644 index 0000000000..00b97da888 --- /dev/null +++ b/com.discord/smali/com/discord/utilities/textprocessing/node/SpoilerNode.smali @@ -0,0 +1,323 @@ +.class public final Lcom/discord/utilities/textprocessing/node/SpoilerNode; +.super Lcom/discord/simpleast/core/node/Node; + + +# annotations +.annotation system Ldalvik/annotation/MemberClasses; + value = { + Lcom/discord/utilities/textprocessing/node/SpoilerNode$RenderContext; + } +.end annotation + +.annotation system Ldalvik/annotation/Signature; + value = { + "", + "Lcom/discord/simpleast/core/node/Node<", + "TT;>;" + } +.end annotation + + +# instance fields +.field private final content:Ljava/lang/String; + +.field private id:I + +.field private isRevealed:Z + + +# direct methods +.method public constructor (Ljava/lang/String;Z)V + .locals 1 + + const-string v0, "content" + + invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-direct {p0}, Lcom/discord/simpleast/core/node/Node;->()V + + iput-object p1, p0, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->content:Ljava/lang/String; + + iput-boolean p2, p0, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->isRevealed:Z + + const/4 p1, -0x1 + + iput p1, p0, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->id:I + + return-void +.end method + +.method public synthetic constructor (Ljava/lang/String;ZILkotlin/jvm/internal/DefaultConstructorMarker;)V + .locals 0 + + and-int/lit8 p3, p3, 0x2 + + if-eqz p3, :cond_0 + + const/4 p2, 0x0 + + :cond_0 + invoke-direct {p0, p1, p2}, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->(Ljava/lang/String;Z)V + + return-void +.end method + +.method private final createStyles(Lcom/discord/utilities/textprocessing/node/SpoilerNode$RenderContext;)[Ljava/lang/Object; + .locals 7 + .annotation system Ldalvik/annotation/Signature; + value = { + "(TT;)[", + "Ljava/lang/Object;" + } + .end annotation + + invoke-interface {p1}, Lcom/discord/utilities/textprocessing/node/SpoilerNode$RenderContext;->getContext()Landroid/content/Context; + + move-result-object v0 + + iget-boolean v1, p0, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->isRevealed:Z + + const/4 v2, 0x1 + + const/4 v3, 0x0 + + if-eqz v1, :cond_0 + + new-array p1, v2, [Ljava/lang/Object; + + new-instance v1, Landroid/text/style/BackgroundColorSpan; + + const v2, 0x7f040355 + + invoke-static {v0, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I + + move-result v0 + + invoke-direct {v1, v0}, Landroid/text/style/BackgroundColorSpan;->(I)V + + aput-object v1, p1, v3 + + return-object p1 + + :cond_0 + invoke-interface {p1}, Lcom/discord/utilities/textprocessing/node/SpoilerNode$RenderContext;->getSpoilerOnClick()Lkotlin/jvm/functions/Function1; + + move-result-object p1 + + const/4 v1, 0x3 + + new-array v1, v1, [Ljava/lang/Object; + + new-instance v4, Landroid/text/style/BackgroundColorSpan; + + const v5, 0x7f040354 + + invoke-static {v0, v5}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I + + move-result v5 + + invoke-direct {v4, v5}, Landroid/text/style/BackgroundColorSpan;->(I)V + + aput-object v4, v1, v3 + + new-instance v4, Landroid/text/style/ForegroundColorSpan; + + const v5, 0x7f060136 + + invoke-static {v0, v5}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I + + move-result v6 + + invoke-direct {v4, v6}, Landroid/text/style/ForegroundColorSpan;->(I)V + + aput-object v4, v1, v2 + + const/4 v2, 0x2 + + new-instance v4, Lcom/discord/utilities/spans/ClickableSpan; + + invoke-static {v0, v5}, Lcom/discord/utilities/color/ColorCompat;->getColor(Landroid/content/Context;I)I + + move-result v0 + + invoke-static {v0}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; + + move-result-object v0 + + new-instance v5, Lcom/discord/utilities/textprocessing/node/SpoilerNode$createStyles$1; + + invoke-direct {v5, p0, p1}, Lcom/discord/utilities/textprocessing/node/SpoilerNode$createStyles$1;->(Lcom/discord/utilities/textprocessing/node/SpoilerNode;Lkotlin/jvm/functions/Function1;)V + + check-cast v5, Lkotlin/jvm/functions/Function1; + + invoke-direct {v4, v0, v3, v5}, Lcom/discord/utilities/spans/ClickableSpan;->(Ljava/lang/Integer;ZLkotlin/jvm/functions/Function1;)V + + aput-object v4, v1, v2 + + return-object v1 +.end method + +.method private final setId(I)V + .locals 0 + + iput p1, p0, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->id:I + + return-void +.end method + + +# virtual methods +.method public final getContent()Ljava/lang/String; + .locals 1 + + iget-object v0, p0, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->content:Ljava/lang/String; + + return-object v0 +.end method + +.method public final getId()I + .locals 1 + + iget v0, p0, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->id:I + + return v0 +.end method + +.method public final render(Landroid/text/SpannableStringBuilder;Lcom/discord/utilities/textprocessing/node/SpoilerNode$RenderContext;)V + .locals 6 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Landroid/text/SpannableStringBuilder;", + "TT;)V" + } + .end annotation + + const-string v0, "builder" + + invoke-static {p1, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V + + const-string v0, "renderContext" + + invoke-static {p2, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-virtual {p1}, Landroid/text/SpannableStringBuilder;->length()I + + move-result v0 + + invoke-virtual {p0}, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->getChildren()Ljava/util/Collection; + + move-result-object v1 + + if-eqz v1, :cond_0 + + check-cast v1, Ljava/lang/Iterable; + + invoke-interface {v1}, Ljava/lang/Iterable;->iterator()Ljava/util/Iterator; + + move-result-object v1 + + :goto_0 + invoke-interface {v1}, Ljava/util/Iterator;->hasNext()Z + + move-result v2 + + if-eqz v2, :cond_0 + + invoke-interface {v1}, Ljava/util/Iterator;->next()Ljava/lang/Object; + + move-result-object v2 + + check-cast v2, Lcom/discord/simpleast/core/node/Node; + + invoke-virtual {v2, p1, p2}, Lcom/discord/simpleast/core/node/Node;->render(Landroid/text/SpannableStringBuilder;Ljava/lang/Object;)V + + goto :goto_0 + + :cond_0 + iget-boolean v1, p0, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->isRevealed:Z + + const/4 v2, 0x0 + + if-nez v1, :cond_1 + + invoke-virtual {p1}, Landroid/text/SpannableStringBuilder;->length()I + + move-result v1 + + const-class v3, Lcom/discord/utilities/spans/ClickableSpan; + + invoke-virtual {p1, v0, v1, v3}, Landroid/text/SpannableStringBuilder;->getSpans(IILjava/lang/Class;)[Ljava/lang/Object; + + move-result-object v1 + + const-string v3, "builder.getSpans(startIn\u2026lickableSpan::class.java)" + + invoke-static {v1, v3}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + array-length v3, v1 + + const/4 v4, 0x0 + + :goto_1 + if-ge v4, v3, :cond_1 + + aget-object v5, v1, v4 + + check-cast v5, Lcom/discord/utilities/spans/ClickableSpan; + + invoke-virtual {p1, v5}, Landroid/text/SpannableStringBuilder;->removeSpan(Ljava/lang/Object;)V + + add-int/lit8 v4, v4, 0x1 + + goto :goto_1 + + :cond_1 + invoke-direct {p0, p2}, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->createStyles(Lcom/discord/utilities/textprocessing/node/SpoilerNode$RenderContext;)[Ljava/lang/Object; + + move-result-object p2 + + array-length v1, p2 + + :goto_2 + if-ge v2, v1, :cond_2 + + aget-object v3, p2, v2 + + invoke-virtual {p1}, Landroid/text/SpannableStringBuilder;->length()I + + move-result v4 + + const/16 v5, 0x21 + + invoke-virtual {p1, v3, v0, v4, v5}, Landroid/text/SpannableStringBuilder;->setSpan(Ljava/lang/Object;III)V + + add-int/lit8 v2, v2, 0x1 + + goto :goto_2 + + :cond_2 + return-void +.end method + +.method public final bridge synthetic render(Landroid/text/SpannableStringBuilder;Ljava/lang/Object;)V + .locals 0 + + check-cast p2, Lcom/discord/utilities/textprocessing/node/SpoilerNode$RenderContext; + + invoke-virtual {p0, p1, p2}, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->render(Landroid/text/SpannableStringBuilder;Lcom/discord/utilities/textprocessing/node/SpoilerNode$RenderContext;)V + + return-void +.end method + +.method public final updateState(IZ)V + .locals 0 + + iput p1, p0, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->id:I + + iput-boolean p2, p0, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->isRevealed:Z + + return-void +.end method diff --git a/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode$RenderContext.smali b/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode$RenderContext.smali index b113eb0481..a76c0e8f46 100644 --- a/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode$RenderContext.smali +++ b/com.discord/smali/com/discord/utilities/textprocessing/node/UrlNode$RenderContext.smali @@ -1,6 +1,9 @@ .class public interface abstract Lcom/discord/utilities/textprocessing/node/UrlNode$RenderContext; .super Ljava/lang/Object; +# interfaces +.implements Lcom/discord/utilities/textprocessing/node/BasicRenderContext; + # annotations .annotation system Ldalvik/annotation/EnclosingClass; @@ -14,9 +17,6 @@ # virtual methods -.method public abstract getContext()Landroid/content/Context; -.end method - .method public abstract getLinkColorResId()I .annotation build Landroidx/annotation/ColorRes; .end annotation 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 aa5899ebac..2cefddf318 100644 --- a/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali +++ b/com.discord/smali/com/discord/utilities/voice/VoiceEngineForegroundService$NotificationBuilder.smali @@ -316,7 +316,7 @@ move-result-object v10 - const v11, 0x7f120443 + const v11, 0x7f120444 invoke-virtual {v10, v11}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; @@ -346,7 +346,7 @@ move-result-object v2 - const v9, 0x7f120e79 + const v9, 0x7f120e7a :goto_1 invoke-virtual {v2, v9}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; @@ -360,7 +360,7 @@ move-result-object v2 - const v9, 0x7f1209ac + const v9, 0x7f1209ad goto :goto_1 @@ -389,7 +389,7 @@ move-result-object p0 - const v6, 0x7f120e72 + const v6, 0x7f120e73 :goto_4 invoke-virtual {p0, v6}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; @@ -403,7 +403,7 @@ move-result-object p0 - const v6, 0x7f1203fc + const v6, 0x7f1203fd goto :goto_4 diff --git a/com.discord/smali/com/discord/utils/R$b.smali b/com.discord/smali/com/discord/utils/R$b.smali index f5c8b6a96c..3a99de9ab1 100644 --- a/com.discord/smali/com/discord/utils/R$b.smali +++ b/com.discord/smali/com/discord/utils/R$b.smali @@ -2306,8 +2306,8 @@ 0x7f0402a3 0x7f0402fb 0x7f0402fe - 0x7f040390 - 0x7f04039a + 0x7f040392 + 0x7f04039c .end array-data :array_1 @@ -2317,7 +2317,7 @@ 0x7f04009a 0x7f04013e 0x7f0402fe - 0x7f04039a + 0x7f04039c .end array-data :array_2 @@ -2390,16 +2390,16 @@ .array-data 4 0x1010119 0x7f0402ed - 0x7f04038e - 0x7f04038f + 0x7f040390 + 0x7f040391 .end array-data :array_b .array-data 4 0x1010142 - 0x7f04038b - 0x7f04038c 0x7f04038d + 0x7f04038e + 0x7f04038f .end array-data :array_c @@ -2536,13 +2536,11 @@ 0x7f040333 0x7f040336 0x7f040337 - 0x7f04039c - 0x7f04039d 0x7f04039e 0x7f04039f - 0x7f0403bd - 0x7f0403c0 - 0x7f0403c1 + 0x7f0403a0 + 0x7f0403a1 + 0x7f0403bf 0x7f0403c2 0x7f0403c3 0x7f0403c4 @@ -2551,6 +2549,8 @@ 0x7f0403c7 0x7f0403c8 0x7f0403c9 + 0x7f0403ca + 0x7f0403cb .end array-data :array_f @@ -2665,9 +2665,9 @@ 0x7f0402d0 0x7f0402d2 0x7f0402f5 - 0x7f040390 - 0x7f040391 - 0x7f04039b + 0x7f040392 + 0x7f040393 + 0x7f04039d .end array-data :array_16 @@ -2722,7 +2722,7 @@ 0x7f0400f9 0x7f040138 0x7f0402e9 - 0x7f040387 + 0x7f040389 .end array-data :array_1d @@ -2768,7 +2768,7 @@ 0x7f040267 0x7f0402b2 0x7f0402e0 - 0x7f0403b8 + 0x7f0403ba .end array-data :array_20 @@ -2800,7 +2800,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data :array_23 @@ -2840,7 +2840,7 @@ 0x7f0402be 0x7f0402bf 0x7f0402c0 - 0x7f0403bc + 0x7f0403be .end array-data :array_25 @@ -2995,7 +2995,7 @@ 0x7f0401ad 0x7f04024f 0x7f0402db - 0x7f0403a0 + 0x7f0403a2 .end array-data :array_30 @@ -3073,7 +3073,7 @@ 0x7f0402d4 0x7f0402fa 0x7f0402ff - 0x7f0403be + 0x7f0403c0 .end array-data :array_36 @@ -3115,7 +3115,7 @@ 0x7f0402be 0x7f0402bf 0x7f0402c0 - 0x7f0403bc + 0x7f0403be .end array-data :array_38 @@ -3160,12 +3160,12 @@ 0x7f040300 0x7f040301 0x7f040303 - 0x7f040388 - 0x7f040389 0x7f04038a - 0x7f0403a1 - 0x7f0403a2 + 0x7f04038b + 0x7f04038c 0x7f0403a3 + 0x7f0403a4 + 0x7f0403a5 .end array-data :array_3d @@ -3282,15 +3282,15 @@ 0x7f0402fb 0x7f0402fc 0x7f0402fd - 0x7f040390 0x7f040392 - 0x7f040393 0x7f040394 0x7f040395 0x7f040396 0x7f040397 0x7f040398 0x7f040399 + 0x7f04039a + 0x7f04039b .end array-data :array_43 diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthInviteInfo.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthInviteInfo.smali index 9577665672..6e87bd18e6 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthInviteInfo.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthInviteInfo.smali @@ -498,7 +498,7 @@ move-result v5 - const v6, 0x7f12020b + const v6, 0x7f12020c if-eqz v5, :cond_6 @@ -578,7 +578,7 @@ :cond_5 :goto_3 - const p1, 0x7f120850 + const p1, 0x7f120851 invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetAuthInviteInfo;->getString(I)Ljava/lang/String; @@ -614,7 +614,7 @@ goto :goto_6 :cond_7 - const p1, 0x7f12084e + const p1, 0x7f12084f invoke-virtual {p0, p1}, Lcom/discord/widgets/auth/WidgetAuthInviteInfo;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5$1.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5$1.smali index 8206b11e3d..d559546079 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5$1.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5$1.smali @@ -88,7 +88,7 @@ return-void :catch_0 - const v0, 0x7f120ad3 + const v0, 0x7f120ad4 invoke-static {p1, v0}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5.smali index 0a3031d729..1bebc22f96 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin$onViewBound$5.smali @@ -50,13 +50,13 @@ invoke-direct {p1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V - const v0, 0x7f120ad0 + const v0, 0x7f120ad1 invoke-virtual {p1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; move-result-object p1 - const v0, 0x7f120ad1 + const v0, 0x7f120ad2 invoke-virtual {p1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; @@ -66,7 +66,7 @@ check-cast v0, Lkotlin/jvm/functions/Function1; - const v1, 0x7f120ad2 + const v1, 0x7f120ad3 invoke-virtual {p1, v1, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setPositiveButton(ILkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; @@ -74,7 +74,7 @@ const/4 v0, 0x0 - const v1, 0x7f1202d4 + const v1, 0x7f1202d5 const/4 v2, 0x2 diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali index 7d5d2dff89..e70447356b 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthLogin.smali @@ -366,7 +366,7 @@ move-result-object v0 - const v1, 0x7f120488 + const v1, 0x7f120489 invoke-static {v0, v1}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V @@ -955,7 +955,7 @@ const/4 v3, 0x0 :goto_0 - const v6, 0x7f120ad5 + const v6, 0x7f120ad6 if-eqz v3, :cond_2 @@ -1092,7 +1092,7 @@ aput-object p1, v0, v1 - const p1, 0x7f120489 + const p1, 0x7f12048a 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 d65493dcbc..9ad3242c16 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthMfa.smali @@ -192,7 +192,7 @@ check-cast p1, Landroidx/fragment/app/Fragment; - const p2, 0x7f120e36 + const p2, 0x7f120e37 invoke-static {p1, p2}, Lcom/discord/app/f;->a(Landroidx/fragment/app/Fragment;I)V @@ -223,7 +223,7 @@ check-cast p1, Landroidx/fragment/app/Fragment; - const v0, 0x7f120e5a + const v0, 0x7f120e5b invoke-static {p1, v0}, Lcom/discord/app/f;->a(Landroidx/fragment/app/Fragment;I)V @@ -465,7 +465,7 @@ move-result-object v1 - const v4, 0x7f120e3f + const v4, 0x7f120e40 const/4 v5, 0x2 diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$configureRegisterButton$2.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$configureRegisterButton$2.smali index cde0fc4edf..5a2f1150d4 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$configureRegisterButton$2.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister$configureRegisterButton$2.smali @@ -76,7 +76,7 @@ iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegister$configureRegisterButton$2;->this$0:Lcom/discord/widgets/auth/WidgetAuthRegister; - const v1, 0x7f120f33 + const v1, 0x7f120f34 invoke-virtual {v0, v1}, Lcom/discord/widgets/auth/WidgetAuthRegister;->getString(I)Ljava/lang/String; @@ -109,7 +109,7 @@ iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegister$configureRegisterButton$2;->this$0:Lcom/discord/widgets/auth/WidgetAuthRegister; - const v1, 0x7f120488 + const v1, 0x7f120489 invoke-virtual {v0, v1}, Lcom/discord/widgets/auth/WidgetAuthRegister;->getString(I)Ljava/lang/String; @@ -142,7 +142,7 @@ iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegister$configureRegisterButton$2;->this$0:Lcom/discord/widgets/auth/WidgetAuthRegister; - const v1, 0x7f120487 + const v1, 0x7f120488 invoke-virtual {v0, v1}, Lcom/discord/widgets/auth/WidgetAuthRegister;->getString(I)Ljava/lang/String; @@ -175,7 +175,7 @@ iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegister$configureRegisterButton$2;->this$0:Lcom/discord/widgets/auth/WidgetAuthRegister; - const v1, 0x7f120ad5 + const v1, 0x7f120ad6 invoke-virtual {v0, v1}, Lcom/discord/widgets/auth/WidgetAuthRegister;->getString(I)Ljava/lang/String; @@ -214,7 +214,7 @@ move-result-object p1 - const v0, 0x7f120ddf + const v0, 0x7f120de0 invoke-static {p1, v0}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali index 2e59dedc5e..81f0b47be8 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegister.smali @@ -863,7 +863,7 @@ new-array v0, v0, [Ljava/lang/Object; - const v1, 0x7f120ddc + const v1, 0x7f120ddd invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -873,7 +873,7 @@ aput-object v1, v0, v2 - const v1, 0x7f120ba6 + const v1, 0x7f120ba7 invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1244,7 +1244,7 @@ move-result-object p1 - const v0, 0x7f120f33 + const v0, 0x7f120f34 invoke-static {p1, v0}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V @@ -1287,7 +1287,7 @@ move-result-object p1 - const v0, 0x7f120488 + const v0, 0x7f120489 invoke-static {p1, v0}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V @@ -1318,7 +1318,7 @@ move-result-object p1 - const v0, 0x7f120487 + const v0, 0x7f120488 invoke-static {p1, v0}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V @@ -1353,7 +1353,7 @@ move-result-object p1 - const v0, 0x7f120ad5 + const v0, 0x7f120ad6 invoke-static {p1, v0}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V @@ -1829,12 +1829,12 @@ if-eqz v2, :cond_1 - const v2, 0x7f120dde + const v2, 0x7f120ddf goto :goto_1 :cond_1 - const v2, 0x7f120ddd + const v2, 0x7f120dde :goto_1 invoke-direct {p0, v4, v2}, 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 eef42fd701..ed289443a9 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 @@ -80,9 +80,9 @@ check-cast v9, Lkotlin/jvm/functions/Function1; - const v2, 0x7f120838 + const v2, 0x7f120839 - const v3, 0x7f120835 + const v3, 0x7f120836 const v4, 0x7f0802ed 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 e9d4402e89..c6c70e94ce 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 @@ -64,7 +64,7 @@ iget-object v0, p0, Lcom/discord/widgets/auth/WidgetAuthRegisterInvite$configureRegisterButton$2;->this$0:Lcom/discord/widgets/auth/WidgetAuthRegisterInvite; - const v1, 0x7f120f33 + const v1, 0x7f120f34 invoke-virtual {v0, v1}, Lcom/discord/widgets/auth/WidgetAuthRegisterInvite;->getString(I)Ljava/lang/String; @@ -103,7 +103,7 @@ move-result-object p1 - const v0, 0x7f120ddf + const v0, 0x7f120de0 invoke-static {p1, v0}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V diff --git a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$5.smali b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$5.smali index d90581a889..f4cb682497 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$5.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite$onViewBound$5.smali @@ -134,7 +134,7 @@ check-cast p1, Landroidx/fragment/app/Fragment; - const v0, 0x7f120838 + const v0, 0x7f120839 invoke-static {p1, v0}, Lcom/discord/app/f;->a(Landroidx/fragment/app/Fragment;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 17c7a5e886..0f7cab4943 100644 --- a/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite.smali +++ b/com.discord/smali/com/discord/widgets/auth/WidgetAuthRegisterInvite.smali @@ -733,7 +733,7 @@ new-array v0, v0, [Ljava/lang/Object; - const v1, 0x7f120ddc + const v1, 0x7f120ddd invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -743,7 +743,7 @@ aput-object v1, v0, v2 - const v1, 0x7f120ba6 + const v1, 0x7f120ba7 invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -996,7 +996,7 @@ move-result-object p1 - const v0, 0x7f120f33 + const v0, 0x7f120f34 invoke-static {p1, v0}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V @@ -1372,12 +1372,12 @@ if-eqz p1, :cond_1 - const p1, 0x7f120dde + const p1, 0x7f120ddf goto :goto_1 :cond_1 - const p1, 0x7f120ddd + const p1, 0x7f120dde :goto_1 invoke-direct {p0, v1, p1}, 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 7ae6262283..6fa280564b 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelGroupDMSettings.smali @@ -237,7 +237,7 @@ move-result-object v1 - const v2, 0x7f120314 + const v2, 0x7f120315 invoke-virtual {p0, v2}, Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;->setActionBarTitle(I)Lkotlin/Unit; @@ -366,7 +366,7 @@ invoke-direct {v1, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V - const p1, 0x7f120924 + const p1, 0x7f120925 const/4 v2, 0x1 @@ -384,7 +384,7 @@ move-result-object p1 - const v1, 0x7f120921 + const v1, 0x7f120922 new-array v2, v2, [Ljava/lang/Object; @@ -404,7 +404,7 @@ move-result-object p1 - const p3, 0x7f120920 + const p3, 0x7f120921 new-instance v1, Lcom/discord/widgets/channels/-$$Lambda$WidgetChannelGroupDMSettings$6AsRxaqRqhNYQJ0hn1n5sKLRA50; @@ -414,7 +414,7 @@ move-result-object p1 - const p2, 0x7f1202d4 + const p2, 0x7f1202d5 sget-object p3, Lcom/discord/widgets/channels/-$$Lambda$WidgetChannelGroupDMSettings$jZKR32CdUh9Lxje1U4VG2Zd8PLI;->INSTANCE:Lcom/discord/widgets/channels/-$$Lambda$WidgetChannelGroupDMSettings$jZKR32CdUh9Lxje1U4VG2Zd8PLI; @@ -451,7 +451,7 @@ .method private handleUpdate()V .locals 2 - const v0, 0x7f1206d2 + const v0, 0x7f1206d3 invoke-static {p0, v0}, Lcom/discord/app/f;->b(Landroidx/fragment/app/Fragment;I)V @@ -691,9 +691,9 @@ .method public static synthetic lambda$null$7(Lcom/discord/widgets/channels/WidgetChannelGroupDMSettings;)V .locals 2 - const v0, 0x7f120329 + const v0, 0x7f12032a - const v1, 0x7f120e68 + const v1, 0x7f120e69 invoke-static {p0, v0, v1}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali index 72b0401c3f..384397fcbd 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelNotificationSettings.smali @@ -385,7 +385,7 @@ if-eqz v2, :cond_0 - const v2, 0x7f1209ae + const v2, 0x7f1209af const/4 v3, 0x1 @@ -429,7 +429,7 @@ goto :goto_1 :cond_0 - const v1, 0x7f1209ad + const v1, 0x7f1209ae invoke-virtual {p0, v1}, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;->getString(I)Ljava/lang/String; @@ -648,7 +648,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, 0x7f120a52 + const p1, 0x7f120a53 invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetChannelNotificationSettings;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForRole.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForRole.smali index fb229ff14c..4e69a209ce 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForRole.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForRole.smali @@ -794,7 +794,7 @@ const/4 v0, 0x0 :goto_0 - const v1, 0x7f1202d7 + const v1, 0x7f1202d8 if-eqz v0, :cond_4 @@ -822,7 +822,7 @@ return-void :cond_3 - const p2, 0x7f1202d5 + const p2, 0x7f1202d6 invoke-virtual {p1, p2}, Lcom/discord/views/TernaryCheckBox;->setOffDisabled(I)V diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForUser.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForUser.smali index 4a861e5e73..ccd1e05458 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForUser.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions$ModelForUser.smali @@ -372,7 +372,7 @@ move-result p2 - const v0, 0x7f1202d6 + const v0, 0x7f1202d7 if-eqz p2, :cond_0 @@ -399,7 +399,7 @@ return-void :cond_2 - const p2, 0x7f1202d5 + const p2, 0x7f1202d6 invoke-virtual {p1, p2}, Lcom/discord/views/TernaryCheckBox;->setDisabled(I)V diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions.smali index ff450556f7..102737102f 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsEditPermissions.smali @@ -134,12 +134,12 @@ if-eqz v0, :cond_0 - const v0, 0x7f1202e7 + const v0, 0x7f1202e8 goto :goto_0 :cond_0 - const v0, 0x7f120314 + const v0, 0x7f120315 :goto_0 invoke-virtual {p0, v0}, Lcom/discord/widgets/channels/WidgetChannelSettingsEditPermissions;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali index 82ece73049..b39655d76e 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview.smali @@ -152,12 +152,12 @@ if-eqz v0, :cond_0 - const v0, 0x7f1202e7 + const v0, 0x7f1202e8 goto :goto_0 :cond_0 - const v0, 0x7f120314 + const v0, 0x7f120315 :goto_0 invoke-virtual {p0, v0}, Lcom/discord/widgets/channels/WidgetChannelSettingsPermissionsOverview;->setActionBarTitle(I)Lkotlin/Unit; @@ -361,7 +361,7 @@ return-void :cond_0 - const p1, 0x7f120ac5 + const p1, 0x7f120ac6 invoke-static {p0, p1}, Lcom/discord/app/f;->b(Landroidx/fragment/app/Fragment;I)V diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$2$2.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$2$2.smali index 30a6397dd0..b2b7b736a0 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$2$2.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$2$2.smali @@ -57,7 +57,7 @@ # virtual methods .method public final call(Ljava/util/Map;Ljava/util/HashMap;Ljava/util/Map;Ljava/lang/Boolean;)Lcom/discord/widgets/channels/WidgetChannelTopic$Model; - .locals 14 + .locals 15 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -85,7 +85,7 @@ check-cast v1, Ljava/util/Collection; - new-instance v13, Lcom/discord/utilities/textprocessing/MessageRenderContext; + new-instance v14, Lcom/discord/utilities/textprocessing/MessageRenderContext; iget-object v2, v0, Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$2$2;->this$0:Lcom/discord/widgets/channels/WidgetChannelTopic$Model$Companion$get$2; @@ -109,19 +109,21 @@ const/4 v10, 0x0 - const/16 v11, 0x40 + const/4 v11, 0x0 - const/4 v12, 0x0 + const/16 v12, 0xc0 - move-object v2, v13 + const/4 v13, 0x0 - move-object v8, p1 + move-object v2, v14 + + move-object/from16 v8, p1 move-object/from16 v9, p3 - invoke-direct/range {v2 .. v12}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->(Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;IILkotlin/jvm/internal/DefaultConstructorMarker;)V + invoke-direct/range {v2 .. v13}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->(Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;ILkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - invoke-static {v1, v13}, Lcom/discord/utilities/textprocessing/AstRenderer;->render(Ljava/util/Collection;Ljava/lang/Object;)Lcom/facebook/drawee/span/DraweeSpanStringBuilder; + invoke-static {v1, v14}, Lcom/discord/utilities/textprocessing/AstRenderer;->render(Ljava/util/Collection;Ljava/lang/Object;)Lcom/facebook/drawee/span/DraweeSpanStringBuilder; move-result-object v1 diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion.smali b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion.smali index 14e0d4d766..0ce64d254b 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetChannelTopic$Model$Companion.smali @@ -147,7 +147,7 @@ :goto_2 new-instance p2, Lcom/discord/widgets/channels/WidgetChannelTopic$Model; - const v0, 0x7f12031a + const v0, 0x7f12031b invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali index b6b34e1380..cb1ec8b871 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetCreateChannel.smali @@ -128,12 +128,12 @@ if-ne v0, v1, :cond_1 - const v0, 0x7f1203c0 + const v0, 0x7f1203c1 goto :goto_0 :cond_1 - const v0, 0x7f1203c1 + const v0, 0x7f1203c2 :goto_0 invoke-virtual {p0, v0}, Lcom/discord/widgets/channels/WidgetCreateChannel;->setActionBarTitle(I)Lkotlin/Unit; @@ -879,12 +879,12 @@ if-ne v1, v2, :cond_4 - const v1, 0x7f120ba8 + const v1, 0x7f120ba9 goto :goto_2 :cond_4 - const v1, 0x7f120baa + const v1, 0x7f120bab :goto_2 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -895,12 +895,12 @@ if-ne v1, v2, :cond_5 - const v1, 0x7f120ba9 + const v1, 0x7f120baa goto :goto_3 :cond_5 - const v1, 0x7f120bab + const v1, 0x7f120bac :goto_3 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -911,12 +911,12 @@ if-ne v1, v2, :cond_6 - const v1, 0x7f12050f + const v1, 0x7f120510 goto :goto_4 :cond_6 - const v1, 0x7f120512 + const v1, 0x7f120513 :goto_4 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -927,12 +927,12 @@ if-ne v1, v2, :cond_7 - const v1, 0x7f1202e6 + const v1, 0x7f1202e7 goto :goto_5 :cond_7 - const v1, 0x7f120510 + const v1, 0x7f120511 :goto_5 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.smali b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali index 7bf3f3e2bd..aab8ae8a25 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetGroupInviteFriends.smali @@ -376,7 +376,7 @@ if-nez p1, :cond_0 - const p1, 0x7f1206be + const p1, 0x7f1206bf invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->getString(I)Ljava/lang/String; @@ -421,7 +421,7 @@ if-lt p1, p3, :cond_0 - const p1, 0x7f1206c4 + const p1, 0x7f1206c5 invoke-static {p0, p1}, Lcom/discord/app/f;->b(Landroidx/fragment/app/Fragment;I)V @@ -504,7 +504,7 @@ move-result-object p1 - const v0, 0x7f1206c4 + const v0, 0x7f1206c5 invoke-static {p1, v0}, Lcom/discord/app/f;->d(Landroid/content/Context;I)V @@ -754,7 +754,7 @@ aput-object v2, v1, v3 - const v2, 0x7f1206cd + const v2, 0x7f1206ce invoke-virtual {p0, v2, v1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -786,7 +786,7 @@ if-lt v1, v2, :cond_0 - const p1, 0x7f1206c3 + const p1, 0x7f1206c4 invoke-virtual {p0, p1}, Lcom/discord/widgets/channels/WidgetGroupInviteFriends;->getString(I)Ljava/lang/String; @@ -833,7 +833,7 @@ :cond_1 if-nez v2, :cond_2 - const p1, 0x7f1206cc + const p1, 0x7f1206cd 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$configureUI$6.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$6.smali index 66ce7697d6..24d5437d06 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$6.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$configureUI$6.smali @@ -54,7 +54,7 @@ move-result-object p1 - const v0, 0x7f120b2c + const v0, 0x7f120b2d invoke-static {p1, v0}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$saveChannel$1.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$saveChannel$1.smali index 5f1d9c7301..0944cd9e0e 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$saveChannel$1.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings$saveChannel$1.smali @@ -76,12 +76,12 @@ if-eqz p1, :cond_0 - const p1, 0x7f1202e8 + const p1, 0x7f1202e9 goto :goto_0 :cond_0 - const p1, 0x7f120315 + const p1, 0x7f120316 :goto_0 invoke-static {v0, p1}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V diff --git a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali index c84e33d449..1edc1a2121 100644 --- a/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali +++ b/com.discord/smali/com/discord/widgets/channels/WidgetTextChannelSettings.smali @@ -832,12 +832,12 @@ if-eqz v0, :cond_2 - const v0, 0x7f120314 + const v0, 0x7f120315 goto :goto_0 :cond_2 - const v0, 0x7f1202e7 + const v0, 0x7f1202e8 :goto_0 invoke-virtual {p0, v0}, Lcom/discord/widgets/channels/WidgetTextChannelSettings;->setActionBarTitle(I)Lkotlin/Unit; @@ -906,18 +906,18 @@ move-result v1 - const v3, 0x7f1202e6 + const v3, 0x7f1202e7 - const v4, 0x7f120510 + const v4, 0x7f120511 if-eqz v1, :cond_4 - const v1, 0x7f120510 + const v1, 0x7f120511 goto :goto_2 :cond_4 - const v1, 0x7f1202e6 + const v1, 0x7f1202e7 :goto_2 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -966,7 +966,7 @@ if-eqz v1, :cond_5 - const v3, 0x7f120510 + const v3, 0x7f120511 :cond_5 invoke-virtual {v0, v3}, Landroid/widget/EditText;->setHint(I)V @@ -1430,12 +1430,12 @@ if-eqz v5, :cond_0 - const v5, 0x7f12040d + const v5, 0x7f12040e goto :goto_0 :cond_0 - const v5, 0x7f12040c + const v5, 0x7f12040d :goto_0 invoke-virtual {v2, v5}, Landroid/widget/TextView;->setText(I)V @@ -1460,7 +1460,7 @@ invoke-static {v3, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v0, 0x7f12040e + const v0, 0x7f12040f const/4 v2, 0x1 @@ -1977,7 +1977,7 @@ move-result-object p1 - const v0, 0x7f12056d + const v0, 0x7f12056e 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 98c496cb54..fb9d1db8a3 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 @@ -287,7 +287,7 @@ const-wide/16 v8, 0x0 - const v10, 0x7f120431 + const v10, 0x7f120432 const/4 v11, 0x0 diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads.smali index e206f45806..1350c0fe64 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelListUnreads.smali @@ -225,9 +225,9 @@ if-eqz p7, :cond_0 - const p3, 0x7f1209cb + const p3, 0x7f1209cc - const v3, 0x7f1209cb + const v3, 0x7f1209cc goto :goto_0 @@ -239,9 +239,9 @@ if-eqz p3, :cond_1 - const p4, 0x7f1209d7 + const p4, 0x7f1209d8 - const v4, 0x7f1209d7 + const v4, 0x7f1209d8 goto :goto_1 diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5$1.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5$1.smali index 9a0e74dec2..4b153682fd 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5$1.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsList$onViewBound$5$1.smali @@ -94,7 +94,7 @@ check-cast p1, Ljava/lang/CharSequence; - const v1, 0x7f12089b + const v1, 0x7f12089c invoke-static {v0, p1, v1}, Lcom/discord/app/f;->b(Landroid/content/Context;Ljava/lang/CharSequence;I)V diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate.smali index c6a206bf37..d66a38b6de 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemChannelPrivate.smali @@ -386,7 +386,7 @@ add-int/lit8 p1, p1, 0x1 - const v0, 0x7f120967 + const v0, 0x7f120968 invoke-virtual {p2, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader.smali index ea47630128..814118b5b4 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListAdapter$ItemHeader.smali @@ -183,17 +183,17 @@ if-eqz v0, :cond_2 - const v0, 0x7f120a92 + const v0, 0x7f120a93 if-eq p1, v0, :cond_2 - const p2, 0x7f120de4 + const p2, 0x7f120de5 const/4 v0, 0x0 if-eq p1, p2, :cond_1 - const p2, 0x7f120f7d + const p2, 0x7f120f7e 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 13516d7441..49874a8cac 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 @@ -116,7 +116,7 @@ .method private final getLearnMoreFormattedString(Landroid/content/Context;Ljava/lang/String;)Ljava/lang/CharSequence; .locals 3 - const v0, 0x7f120e4c + const v0, 0x7f120e4d 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 94fe90e725..537e70d9e6 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 @@ -330,7 +330,7 @@ if-eqz v0, :cond_0 - const v0, 0x7f120e79 + const v0, 0x7f120e7a invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -342,7 +342,7 @@ return-object p1 :cond_0 - const v0, 0x7f1209ae + const v0, 0x7f1209af const/4 v1, 0x1 diff --git a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali index 7b2acf54fc..ef42baf2cb 100644 --- a/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali +++ b/com.discord/smali/com/discord/widgets/channels/list/WidgetChannelsListItemChannelActions.smali @@ -925,7 +925,7 @@ if-eqz p2, :cond_0 - const p1, 0x7f12047b + const p1, 0x7f12047c goto :goto_0 @@ -938,7 +938,7 @@ if-nez p2, :cond_1 - const p1, 0x7f120314 + const p1, 0x7f120315 goto :goto_0 @@ -949,12 +949,12 @@ if-eqz p1, :cond_2 - const p1, 0x7f12047a + const p1, 0x7f12047b goto :goto_0 :cond_2 - const p1, 0x7f120c37 + const p1, 0x7f120c38 :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/PrivateChannelMembersListModelProvider.smali b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMembersListModelProvider.smali index cb7291747e..441c0cc63e 100644 --- a/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMembersListModelProvider.smali +++ b/com.discord/smali/com/discord/widgets/channels/memberlist/PrivateChannelMembersListModelProvider.smali @@ -423,7 +423,7 @@ invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - const v1, 0x7f120967 + const v1, 0x7f120968 invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordCameraFragment.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$DiscordCameraFragment.smali index 9489158ce2..2c0602fb1b 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 @@ -139,7 +139,7 @@ new-array v1, v1, [Ljava/lang/Object; - const v2, 0x7f120dd5 + const v2, 0x7f120dd6 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 8e079b7312..ccba4a5cf3 100644 --- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$PermissionsEmptyListAdapter.smali +++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments$PermissionsEmptyListAdapter.smali @@ -73,7 +73,7 @@ new-array v0, v0, [Ljava/lang/Object; - const v1, 0x7f120dd6 + const v1, 0x7f120dd7 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 db7eaa9f38..f756bd2ddb 100644 --- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments.smali +++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputAttachments.smali @@ -137,7 +137,7 @@ if-eqz v1, :cond_1 - const v2, 0x7f1201f6 + const v2, 0x7f1201f7 invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -236,7 +236,7 @@ const v6, 0x7f080243 - const v7, 0x7f1201f9 + const v7, 0x7f1201fa invoke-direct {v5, v6, v7}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$1;->(II)V @@ -250,7 +250,7 @@ const v7, 0x7f08020f - const v8, 0x7f1201f7 + const v8, 0x7f1201f8 invoke-direct {v6, v7, v8}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$2;->(II)V @@ -264,7 +264,7 @@ const v7, 0x7f08017e - const v8, 0x7f1201f5 + const v8, 0x7f1201f6 invoke-direct {v6, v7, v8}, Lcom/discord/widgets/chat/input/WidgetChatInputAttachments$configureFlexInputFragment$2$3;->(II)V diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali index bf4b76a5d9..123a25de76 100644 --- a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali +++ b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputModel.smali @@ -98,7 +98,7 @@ if-eqz p2, :cond_0 - const p1, 0x7f12045e + const p1, 0x7f12045f invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -109,7 +109,7 @@ :cond_0 if-nez p3, :cond_1 - const p1, 0x7f120a03 + const p1, 0x7f120a04 invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -122,7 +122,7 @@ move-result-object p1 - const p2, 0x7f120de7 + const p2, 0x7f120de8 invoke-virtual {p0, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -785,7 +785,7 @@ return-object p1 :cond_0 - const v0, 0x7f120f62 + const v0, 0x7f120f63 :goto_0 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -795,7 +795,7 @@ return-object p1 :cond_1 - const v0, 0x7f120f58 + const v0, 0x7f120f59 goto :goto_0 .end method @@ -816,7 +816,7 @@ return-object p1 :pswitch_0 - const v0, 0x7f120785 + const v0, 0x7f120786 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -825,7 +825,7 @@ return-object p1 :pswitch_1 - const v0, 0x7f120783 + const v0, 0x7f120784 new-array v2, v2, [Ljava/lang/Object; @@ -840,7 +840,7 @@ return-object p1 :pswitch_2 - const v0, 0x7f120782 + const v0, 0x7f120783 new-array v2, v2, [Ljava/lang/Object; @@ -855,7 +855,7 @@ return-object p1 :pswitch_3 - const v0, 0x7f120784 + const v0, 0x7f120785 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5.smali b/com.discord/smali/com/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5.smali index 2e2f9ff179..c4518b8efb 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 @@ -70,7 +70,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, 0x7f120319 + const p2, 0x7f12031a invoke-virtual {p1, p2}, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2;->invoke(I)Z @@ -105,7 +105,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, 0x7f120484 + const p2, 0x7f120485 invoke-virtual {p1, p2}, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2;->invoke(I)Z @@ -135,7 +135,7 @@ :cond_2 iget-object p1, p0, Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$5;->$sendMessageError$2:Lcom/discord/widgets/chat/input/WidgetChatInputSend$configureSendListeners$2; - const p2, 0x7f120a03 + const p2, 0x7f120a04 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 c0ea61b19a..30511bad52 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 @@ -94,57 +94,57 @@ packed-switch p1, :pswitch_data_0 - const p1, 0x7f120d76 + const p1, 0x7f120d77 return p1 :pswitch_0 - const p1, 0x7f120494 - - return p1 - - :pswitch_1 - const p1, 0x7f12048e - - return p1 - - :pswitch_2 - const p1, 0x7f12048f - - return p1 - - :pswitch_3 const p1, 0x7f120495 return p1 - :pswitch_4 - const p1, 0x7f120492 + :pswitch_1 + const p1, 0x7f12048f return p1 - :pswitch_5 - const p1, 0x7f120496 - - return p1 - - :pswitch_6 - const p1, 0x7f12048d - - return p1 - - :pswitch_7 + :pswitch_2 const p1, 0x7f120490 return p1 - :pswitch_8 + :pswitch_3 + const p1, 0x7f120496 + + return p1 + + :pswitch_4 + const p1, 0x7f120493 + + return p1 + + :pswitch_5 + const p1, 0x7f120497 + + return p1 + + :pswitch_6 + const p1, 0x7f12048e + + return p1 + + :pswitch_7 const p1, 0x7f120491 return p1 + :pswitch_8 + const p1, 0x7f120492 + + return p1 + :pswitch_9 - const p1, 0x7f120493 + const p1, 0x7f120494 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 66e05ad735..36278565df 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 @@ -234,55 +234,55 @@ packed-switch p0, :pswitch_data_0 - const p0, 0x7f040357 - - return p0 - - :pswitch_0 - const p0, 0x7f04035d - - return p0 - - :pswitch_1 - const p0, 0x7f040358 - - return p0 - - :pswitch_2 - const p0, 0x7f04035e - - return p0 - - :pswitch_3 - const p0, 0x7f04035b - - return p0 - - :pswitch_4 - const p0, 0x7f04035f - - return p0 - - :pswitch_5 - const p0, 0x7f040356 - - return p0 - - :pswitch_6 const p0, 0x7f040359 return p0 - :pswitch_7 + :pswitch_0 + const p0, 0x7f04035f + + return p0 + + :pswitch_1 const p0, 0x7f04035a return p0 - :pswitch_8 + :pswitch_2 + const p0, 0x7f040360 + + return p0 + + :pswitch_3 + const p0, 0x7f04035d + + return p0 + + :pswitch_4 + const p0, 0x7f040361 + + return p0 + + :pswitch_5 + const p0, 0x7f040358 + + return p0 + + :pswitch_6 + const p0, 0x7f04035b + + return p0 + + :pswitch_7 const p0, 0x7f04035c return p0 + :pswitch_8 + const p0, 0x7f04035e + + return p0 + nop :pswitch_data_0 diff --git a/com.discord/smali/com/discord/widgets/chat/list/-$$Lambda$WidgetChatListAdapterItemMessage$Tf4_-Yf43AVXgbeSF80gydQazVQ.smali b/com.discord/smali/com/discord/widgets/chat/list/-$$Lambda$WidgetChatListAdapterItemMessage$Tf4_-Yf43AVXgbeSF80gydQazVQ.smali new file mode 100644 index 0000000000..45d0a9d653 --- /dev/null +++ b/com.discord/smali/com/discord/widgets/chat/list/-$$Lambda$WidgetChatListAdapterItemMessage$Tf4_-Yf43AVXgbeSF80gydQazVQ.smali @@ -0,0 +1,38 @@ +.class public final synthetic Lcom/discord/widgets/chat/list/-$$Lambda$WidgetChatListAdapterItemMessage$Tf4_-Yf43AVXgbeSF80gydQazVQ; +.super Ljava/lang/Object; +.source "lambda" + +# interfaces +.implements Lkotlin/jvm/functions/Function1; + + +# instance fields +.field private final synthetic f$0:Lcom/discord/models/domain/ModelMessage; + + +# direct methods +.method public synthetic constructor (Lcom/discord/models/domain/ModelMessage;)V + .locals 0 + + invoke-direct {p0}, Ljava/lang/Object;->()V + + iput-object p1, p0, Lcom/discord/widgets/chat/list/-$$Lambda$WidgetChatListAdapterItemMessage$Tf4_-Yf43AVXgbeSF80gydQazVQ;->f$0:Lcom/discord/models/domain/ModelMessage; + + return-void +.end method + + +# virtual methods +.method public final invoke(Ljava/lang/Object;)Ljava/lang/Object; + .locals 1 + + iget-object v0, p0, Lcom/discord/widgets/chat/list/-$$Lambda$WidgetChatListAdapterItemMessage$Tf4_-Yf43AVXgbeSF80gydQazVQ;->f$0:Lcom/discord/models/domain/ModelMessage; + + check-cast p1, Lcom/discord/utilities/textprocessing/node/SpoilerNode; + + invoke-static {v0, p1}, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;->lambda$processMessageText$5(Lcom/discord/models/domain/ModelMessage;Lcom/discord/utilities/textprocessing/node/SpoilerNode;)Lkotlin/Unit; + + move-result-object p1 + + return-object p1 +.end method 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 68453bc918..6f3a84997c 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListActions.smali @@ -399,12 +399,12 @@ if-eqz v3, :cond_f - const v3, 0x7f120e7c + const v3, 0x7f120e7d goto :goto_8 :cond_f - const v3, 0x7f120b1d + const v3, 0x7f120b1e :goto_8 invoke-virtual {v0, v3}, Landroid/widget/TextView;->setText(I)V @@ -756,7 +756,7 @@ move-result-object p2 - const v0, 0x7f120d31 + const v0, 0x7f120d32 invoke-virtual {p0, v0}, Lcom/discord/widgets/chat/list/WidgetChatListActions;->getString(I)Ljava/lang/String; @@ -1070,12 +1070,12 @@ if-eqz p1, :cond_1 - const p1, 0x7f120981 + const p1, 0x7f120982 goto :goto_1 :cond_1 - const p1, 0x7f120978 + const p1, 0x7f120979 :goto_1 invoke-static {}, Lcom/discord/app/g;->dx()Lrx/Observable$Transformer; diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked.smali index 24d1d5fe5c..a1cc159b1b 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemBlocked.smali @@ -142,7 +142,7 @@ aput-object p2, v2, v4 - const p2, 0x7f12029c + const p2, 0x7f12029d invoke-virtual {p1, p2, v2}, Landroid/content/res/Resources;->getString(I[Ljava/lang/Object;)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali index fbe5567584..351a7c7671 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemCallMessage.smali @@ -245,7 +245,7 @@ move-result-object v0 - const v3, 0x7f120da2 + const v3, 0x7f120da3 new-array v2, v2, [Ljava/lang/Object; @@ -268,7 +268,7 @@ move-result-object v0 - const v3, 0x7f120da1 + const v3, 0x7f120da2 new-array v2, v2, [Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model.smali index 7fa2cf4e0e..f606ade8c9 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemEmbed$Model.smali @@ -472,7 +472,7 @@ .end method .method public final createRenderContext(Landroid/content/Context;)Lcom/discord/utilities/textprocessing/MessageRenderContext; - .locals 12 + .locals 13 const-string v0, "androidContext" @@ -496,15 +496,17 @@ const/4 v9, 0x0 - const/16 v10, 0x40 + const/4 v10, 0x0 - const/4 v11, 0x0 + const/16 v11, 0xc0 + + const/4 v12, 0x0 move-object v1, v0 move-object v2, p1 - invoke-direct/range {v1 .. v11}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->(Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;IILkotlin/jvm/internal/DefaultConstructorMarker;)V + invoke-direct/range {v1 .. v12}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->(Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;ILkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V return-object v0 .end method diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali index 47e7aadd59..274b48769b 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGameInvite.smali @@ -404,7 +404,7 @@ if-eqz v1, :cond_3 - const v3, 0x7f120876 + const v3, 0x7f120877 goto :goto_1 @@ -425,19 +425,19 @@ if-ne v5, v6, :cond_4 - const v3, 0x7f120887 + const v3, 0x7f120888 goto :goto_1 :cond_4 if-eqz v3, :cond_5 - const v3, 0x7f120874 + const v3, 0x7f120875 goto :goto_1 :cond_5 - const v3, 0x7f12087f + const v3, 0x7f120880 :goto_1 invoke-virtual {v4, v3}, Landroid/widget/TextView;->setText(I)V @@ -683,12 +683,12 @@ if-eq v0, v1, :cond_0 - const v0, 0x7f12087b + const v0, 0x7f12087c goto :goto_0 :cond_0 - const v0, 0x7f12087d + const v0, 0x7f12087e :goto_0 invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(I)V 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 8b670431b1..10c98fa3bf 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGift.smali @@ -609,7 +609,7 @@ if-eqz p1, :cond_2 - const p1, 0x7f1206a6 + const p1, 0x7f1206a7 :goto_2 invoke-virtual {v0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -621,7 +621,7 @@ goto :goto_3 :cond_2 - const p1, 0x7f1206a5 + const p1, 0x7f1206a6 goto :goto_2 @@ -632,7 +632,7 @@ move-result-object p1 - const v2, 0x7f1206a2 + const v2, 0x7f1206a3 invoke-virtual {p1, v2}, Landroid/widget/TextView;->setText(I)V @@ -730,7 +730,7 @@ move-result-object v1 - const v2, 0x7f1206a7 + const v2, 0x7f1206a8 invoke-virtual {v1, v2}, Lcom/discord/app/AppTextView;->setText(I)V @@ -1128,7 +1128,7 @@ if-eqz v3, :cond_7 - const v3, 0x7f1206aa + const v3, 0x7f1206ab :goto_7 invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1140,7 +1140,7 @@ goto :goto_8 :cond_7 - const v3, 0x7f1206a9 + const v3, 0x7f1206aa goto :goto_7 @@ -1231,7 +1231,7 @@ move-result-object v3 - const v12, 0x7f12069d + const v12, 0x7f12069e new-array v13, v10, [Ljava/lang/Object; @@ -1392,7 +1392,7 @@ if-nez v3, :cond_c - const v3, 0x7f120657 + const v3, 0x7f120658 invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1432,7 +1432,7 @@ :cond_c if-eqz v6, :cond_d - const v3, 0x7f120685 + const v3, 0x7f120686 :goto_d invoke-virtual {v2, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1444,7 +1444,7 @@ :cond_d if-eqz v8, :cond_e - const v3, 0x7f120662 + const v3, 0x7f120663 goto :goto_d @@ -1455,7 +1455,7 @@ if-eqz v3, :cond_f - const v3, 0x7f120656 + const v3, 0x7f120657 const/4 v4, 0x1 @@ -1480,7 +1480,7 @@ :cond_f if-eqz v7, :cond_10 - const v3, 0x7f120655 + const v3, 0x7f120656 goto :goto_d @@ -1554,7 +1554,7 @@ if-eqz v8, :cond_13 - const v4, 0x7f120698 + const v4, 0x7f120699 goto :goto_f @@ -1565,7 +1565,7 @@ if-eqz v4, :cond_14 - const v4, 0x7f12069a + const v4, 0x7f12069b goto :goto_f @@ -1578,12 +1578,12 @@ if-eqz v4, :cond_15 - const v4, 0x7f12069b + const v4, 0x7f12069c goto :goto_f :cond_15 - const v4, 0x7f120699 + const v4, 0x7f12069a :goto_f 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 89fb482594..0f8781470e 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemGuildWelcome.smali @@ -309,7 +309,7 @@ check-cast v2, Landroid/view/View; - const v5, 0x7f120fa9 + const v5, 0x7f120faa new-array v6, v4, [Ljava/lang/Object; @@ -331,7 +331,7 @@ check-cast v2, Landroid/view/View; - const v5, 0x7f120fae + const v5, 0x7f120faf new-array v6, 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 36114cc725..0df804998b 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemInvite.smali @@ -616,7 +616,7 @@ if-eqz v2, :cond_2 - const v4, 0x7f120871 + const v4, 0x7f120872 :goto_2 invoke-virtual {v0, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -628,7 +628,7 @@ goto :goto_3 :cond_2 - const v4, 0x7f12086e + const v4, 0x7f12086f goto :goto_2 @@ -639,7 +639,7 @@ move-result-object v3 - const v4, 0x7f120868 + const v4, 0x7f120869 invoke-virtual {v3, v4}, Landroid/widget/TextView;->setText(I)V @@ -695,7 +695,7 @@ :goto_4 if-eqz v3, :cond_4 - const v3, 0x7f120836 + const v3, 0x7f120837 const/4 v6, 0x1 @@ -734,14 +734,14 @@ :goto_5 if-nez v3, :cond_6 - const v3, 0x7f120835 + const v3, 0x7f120836 goto :goto_6 :cond_6 if-eqz v2, :cond_7 - const v3, 0x7f120869 + const v3, 0x7f12086a :goto_6 invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -794,7 +794,7 @@ if-eqz v2, :cond_8 - const v3, 0x7f1203c3 + const v3, 0x7f1203c4 :goto_8 invoke-virtual {v0, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -806,7 +806,7 @@ goto :goto_9 :cond_8 - const v3, 0x7f12096b + const v3, 0x7f12096c goto :goto_8 @@ -869,7 +869,7 @@ move-result-object v1 - const v2, 0x7f12084b + const v2, 0x7f12084c invoke-virtual {v1, v2}, Lcom/discord/app/AppTextView;->setText(I)V @@ -1077,7 +1077,7 @@ if-eqz v2, :cond_4 - const v2, 0x7f120870 + const v2, 0x7f120871 :goto_4 invoke-virtual {v7, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1089,7 +1089,7 @@ :cond_4 if-eqz v2, :cond_5 - const v2, 0x7f12086f + const v2, 0x7f120870 goto :goto_4 @@ -1098,7 +1098,7 @@ if-nez v2, :cond_6 - const v2, 0x7f12086d + const v2, 0x7f12086e goto :goto_4 @@ -1111,7 +1111,7 @@ if-eqz v2, :cond_8 - const v2, 0x7f12084f + const v2, 0x7f120850 new-array v3, v8, [Ljava/lang/Object; @@ -1140,7 +1140,7 @@ goto :goto_6 :cond_8 - const v2, 0x7f12086c + const v2, 0x7f12086d goto :goto_4 @@ -1395,7 +1395,7 @@ move-result-object v2 - const v3, 0x7f12083e + const v3, 0x7f12083f new-array v10, v8, [Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali index b18fa766e1..61fc08953f 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemListenTogether.smali @@ -419,7 +419,7 @@ aput-object v6, v5, v7 - const v6, 0x7f12087c + const v6, 0x7f12087d invoke-virtual {v3, v6, v5}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -551,7 +551,7 @@ move-result-object v3 - const v6, 0x7f120ed1 + const v6, 0x7f120ed2 new-array v4, v4, [Ljava/lang/Object; @@ -735,7 +735,7 @@ return-object p1 :cond_0 - const p2, 0x7f12051b + const p2, 0x7f12051c invoke-virtual {p1, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage.smali index 8d82e97681..918d52cac4 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemMessage.smali @@ -3,8 +3,6 @@ # static fields -.field private static final LINKIFY_POLICY:I = 0xf - .field private static final MASKED_LINK_PARSER:Lcom/discord/simpleast/core/parser/Parser; .annotation system Ldalvik/annotation/Signature; value = { @@ -311,6 +309,28 @@ return-void .end method +.method static synthetic lambda$processMessageText$5(Lcom/discord/models/domain/ModelMessage;Lcom/discord/utilities/textprocessing/node/SpoilerNode;)Lkotlin/Unit; + .locals 3 + + invoke-static {}, Lcom/discord/stores/StoreStream;->getMessageState()Lcom/discord/stores/StoreMessageState; + + move-result-object v0 + + invoke-virtual {p0}, Lcom/discord/models/domain/ModelMessage;->getId()J + + move-result-wide v1 + + invoke-virtual {p1}, Lcom/discord/utilities/textprocessing/node/SpoilerNode;->getId()I + + move-result p0 + + invoke-virtual {v0, v1, v2, p0}, Lcom/discord/stores/StoreMessageState;->revealSpoiler(JI)V + + sget-object p0, Lkotlin/Unit;->bPn:Lkotlin/Unit; + + return-object p0 +.end method + .method private shouldLinkify(Ljava/lang/String;)Z .locals 6 @@ -540,7 +560,7 @@ .end method .method protected processMessageText(Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;Lcom/discord/widgets/chat/list/entries/MessageEntry;)V - .locals 16 + .locals 19 .param p1 # Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView; .annotation build Landroidx/annotation/NonNull; .end annotation @@ -556,13 +576,13 @@ invoke-virtual/range {p1 .. p1}, Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;->getContext()Landroid/content/Context; - move-result-object v10 + move-result-object v12 invoke-virtual/range {p2 .. p2}, Lcom/discord/widgets/chat/list/entries/MessageEntry;->getMessage()Lcom/discord/models/domain/ModelMessage; - move-result-object v11 + move-result-object v13 - invoke-virtual {v11}, Lcom/discord/models/domain/ModelMessage;->isWebhook()Z + invoke-virtual {v13}, Lcom/discord/models/domain/ModelMessage;->isWebhook()Z move-result v2 @@ -576,15 +596,15 @@ sget-object v2, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;->SAFE_LINK_PARSER:Lcom/discord/simpleast/core/parser/Parser; :goto_0 - invoke-virtual {v11}, Lcom/discord/models/domain/ModelMessage;->getContent()Ljava/lang/String; + invoke-virtual {v13}, Lcom/discord/models/domain/ModelMessage;->getContent()Ljava/lang/String; move-result-object v3 invoke-virtual {v2, v3}, Lcom/discord/simpleast/core/parser/Parser;->parse(Ljava/lang/CharSequence;)Ljava/util/List; - move-result-object v12 + move-result-object v14 - new-instance v13, Lcom/discord/utilities/textprocessing/MessagePreprocessor; + new-instance v15, Lcom/discord/utilities/textprocessing/MessagePreprocessor; iget-object v2, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;->adapter:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter; @@ -598,11 +618,15 @@ move-result-wide v2 - invoke-direct {v13, v2, v3}, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->(J)V + invoke-virtual/range {p2 .. p2}, Lcom/discord/widgets/chat/list/entries/MessageEntry;->getMessageState()Lcom/discord/stores/StoreMessageState$State; - invoke-virtual {v13, v12}, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->process(Ljava/util/Collection;)V + move-result-object v4 - invoke-virtual {v11}, Lcom/discord/models/domain/ModelMessage;->getEditedTimestamp()J + invoke-direct {v15, v2, v3, v4}, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->(JLcom/discord/stores/StoreMessageState$State;)V + + invoke-virtual {v15, v14}, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->process(Ljava/util/Collection;)V + + invoke-virtual {v13}, Lcom/discord/models/domain/ModelMessage;->getEditedTimestamp()J move-result-wide v2 @@ -628,9 +652,9 @@ new-instance v3, Landroid/text/style/ForegroundColorSpan; - const v4, 0x7f040355 + const v4, 0x7f040357 - invoke-static {v10, v4}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I + invoke-static {v12, v4}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I move-result v4 @@ -644,7 +668,7 @@ invoke-direct {v3, v4}, Lcom/discord/simpleast/core/node/a;->(Ljava/lang/String;)V - invoke-interface {v12, v3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z + invoke-interface {v14, v3}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z const-string v3, "(edited)" @@ -652,18 +676,18 @@ move-result-object v2 - invoke-interface {v12, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z + invoke-interface {v14, v2}, Ljava/util/Collection;->add(Ljava/lang/Object;)Z :cond_1 - invoke-virtual {v13}, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->isFoundCode()Z + invoke-virtual {v15}, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->isLinkifyConflicting()Z move-result v2 - const/4 v14, 0x0 + const/4 v11, 0x0 if-nez v2, :cond_2 - invoke-virtual {v11}, Lcom/discord/models/domain/ModelMessage;->getContent()Ljava/lang/String; + invoke-virtual {v13}, Lcom/discord/models/domain/ModelMessage;->getContent()Ljava/lang/String; move-result-object v2 @@ -683,7 +707,7 @@ :goto_1 invoke-virtual {v1, v2}, Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;->setAutoLinkMask(I)V - new-instance v15, Lcom/discord/utilities/textprocessing/MessageRenderContext; + new-instance v10, Lcom/discord/utilities/textprocessing/MessageRenderContext; iget-object v2, v0, Lcom/discord/widgets/chat/list/WidgetChatListAdapterItemMessage;->adapter:Lcom/discord/utilities/mg_recycler/MGRecyclerAdapter; @@ -721,13 +745,29 @@ move-result-object v9 - move-object v2, v15 + const v16, 0x7f06008f - move-object v3, v10 + new-instance v3, Lcom/discord/widgets/chat/list/-$$Lambda$WidgetChatListAdapterItemMessage$Tf4_-Yf43AVXgbeSF80gydQazVQ; - invoke-direct/range {v2 .. v9}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->(Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;)V + invoke-direct {v3, v13}, Lcom/discord/widgets/chat/list/-$$Lambda$WidgetChatListAdapterItemMessage$Tf4_-Yf43AVXgbeSF80gydQazVQ;->(Lcom/discord/models/domain/ModelMessage;)V - invoke-static {v12, v15}, Lcom/discord/utilities/textprocessing/AstRenderer;->render(Ljava/util/Collection;Ljava/lang/Object;)Lcom/facebook/drawee/span/DraweeSpanStringBuilder; + move-object v2, v10 + + move-object/from16 v17, v3 + + move-object v3, v12 + + move-object/from16 v18, v12 + + move-object v12, v10 + + move/from16 v10, v16 + + move-object/from16 v11, v17 + + invoke-direct/range {v2 .. v11}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->(Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;ILkotlin/jvm/functions/Function1;)V + + invoke-static {v14, v12}, Lcom/discord/utilities/textprocessing/AstRenderer;->render(Ljava/util/Collection;Ljava/lang/Object;)Lcom/facebook/drawee/span/DraweeSpanStringBuilder; move-result-object v2 @@ -735,7 +775,7 @@ move-result v3 - const/4 v4, 0x1 + const/4 v11, 0x1 if-lez v3, :cond_3 @@ -751,13 +791,13 @@ invoke-virtual {v1, v2}, Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;->setDraweeSpanStringBuilder(Lcom/facebook/drawee/span/DraweeSpanStringBuilder;)V - invoke-virtual {v13}, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->isFoundSelfMention()Z + invoke-virtual {v15}, Lcom/discord/utilities/textprocessing/MessagePreprocessor;->isFoundSelfMention()Z move-result v2 if-nez v2, :cond_4 - invoke-virtual {v11}, Lcom/discord/models/domain/ModelMessage;->isMentionEveryone()Z + invoke-virtual {v13}, Lcom/discord/models/domain/ModelMessage;->isMentionEveryone()Z move-result v2 @@ -782,7 +822,7 @@ const/4 v2, 0x0 :goto_3 - invoke-virtual {v11}, Lcom/discord/models/domain/ModelMessage;->getMentionRoles()Ljava/util/List; + invoke-virtual {v13}, Lcom/discord/models/domain/ModelMessage;->getMentionRoles()Ljava/util/List; move-result-object v3 @@ -812,40 +852,40 @@ move-result-object v3 - invoke-virtual {v11}, Lcom/discord/models/domain/ModelMessage;->getMentionRoles()Ljava/util/List; + invoke-virtual {v13}, Lcom/discord/models/domain/ModelMessage;->getMentionRoles()Ljava/util/List; - move-result-object v5 + move-result-object v4 - invoke-interface {v5}, Ljava/util/List;->iterator()Ljava/util/Iterator; + invoke-interface {v4}, Ljava/util/List;->iterator()Ljava/util/Iterator; - move-result-object v5 + move-result-object v4 :cond_6 - invoke-interface {v5}, Ljava/util/Iterator;->hasNext()Z + invoke-interface {v4}, Ljava/util/Iterator;->hasNext()Z - move-result v6 + move-result v5 - if-eqz v6, :cond_7 + if-eqz v5, :cond_7 - invoke-interface {v5}, Ljava/util/Iterator;->next()Ljava/lang/Object; + invoke-interface {v4}, Ljava/util/Iterator;->next()Ljava/lang/Object; - move-result-object v6 + move-result-object v5 - check-cast v6, Ljava/lang/Long; + check-cast v5, Ljava/lang/Long; - invoke-virtual {v6}, Ljava/lang/Long;->longValue()J + invoke-virtual {v5}, Ljava/lang/Long;->longValue()J - move-result-wide v6 + move-result-wide v5 - invoke-static {v6, v7}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {v5, v6}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; - move-result-object v6 + move-result-object v5 - invoke-interface {v3, v6}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z + invoke-interface {v3, v5}, Ljava/util/Set;->contains(Ljava/lang/Object;)Z - move-result v6 + move-result v5 - if-eqz v6, :cond_6 + if-eqz v5, :cond_6 const/4 v2, 0x1 @@ -854,7 +894,9 @@ const v2, 0x7f040350 - invoke-static {v10, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I + move-object/from16 v3, v18 + + invoke-static {v3, v2}, Lcom/discord/utilities/color/ColorCompat;->getThemedColor(Landroid/content/Context;I)I move-result v2 @@ -863,7 +905,9 @@ goto :goto_4 :cond_8 - invoke-virtual {v1, v14}, Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;->setBackgroundResource(I)V + const/4 v2, 0x0 + + invoke-virtual {v1, v2}, Lcom/discord/utilities/view/text/SimpleDraweeSpanTextView;->setBackgroundResource(I)V :goto_4 invoke-virtual/range {p2 .. p2}, Lcom/discord/widgets/chat/list/entries/MessageEntry;->getMessage()Lcom/discord/models/domain/ModelMessage; diff --git a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages.smali b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages.smali index 057003b8f5..906dd3d98d 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemNewMessages.smali @@ -192,7 +192,7 @@ move-result-object v0 - const v1, 0x7f1209cd + const v1, 0x7f1209ce invoke-virtual {v0, v1}, 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 4a78f4e4b5..95031cc918 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemStart.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemStart.smali @@ -84,22 +84,22 @@ if-eqz p2, :cond_0 - const p1, 0x7f120230 - - return p1 - - :cond_0 const p1, 0x7f120231 return p1 + :cond_0 + const p1, 0x7f120232 + + return p1 + :cond_1 - const p1, 0x7f120234 + const p1, 0x7f120235 return p1 :cond_2 - const p1, 0x7f120233 + const p1, 0x7f120234 return p1 .end method @@ -192,7 +192,7 @@ move-result-object p1 - const v3, 0x7f120e7b + const v3, 0x7f120e7c 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 fa873e7e51..165f63fe64 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 @@ -126,7 +126,7 @@ return-object p1 :pswitch_2 - const v0, 0x7f120dce + const v0, 0x7f120dcf new-array v1, v2, [Ljava/lang/Object; @@ -137,7 +137,7 @@ goto :goto_0 :pswitch_3 - const v0, 0x7f120da3 + const v0, 0x7f120da4 new-array v1, v2, [Ljava/lang/Object; @@ -148,7 +148,7 @@ goto :goto_0 :pswitch_4 - const v0, 0x7f120da4 + const v0, 0x7f120da5 new-array v1, v1, [Ljava/lang/Object; @@ -196,7 +196,7 @@ if-nez v0, :cond_1 - const v0, 0x7f120dd3 + const v0, 0x7f120dd4 new-array v1, v2, [Ljava/lang/Object; @@ -208,7 +208,7 @@ :cond_1 :goto_1 - const v0, 0x7f120dd2 + const v0, 0x7f120dd3 new-array v1, v1, [Ljava/lang/Object; @@ -223,7 +223,7 @@ goto :goto_0 :pswitch_6 - const v0, 0x7f120dd1 + const v0, 0x7f120dd2 new-array v1, v1, [Ljava/lang/Object; 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 a92c4ae1bf..78919ec32b 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemSystemMessage.smali @@ -413,11 +413,11 @@ move-result-object p1 - invoke-virtual {p2}, Lcom/discord/widgets/chat/list/entries/MessageEntry;->component2()Lcom/discord/models/domain/ModelGuildMember$Computed; + invoke-virtual {p2}, Lcom/discord/widgets/chat/list/entries/MessageEntry;->component3()Lcom/discord/models/domain/ModelGuildMember$Computed; move-result-object v0 - invoke-virtual {p2}, Lcom/discord/widgets/chat/list/entries/MessageEntry;->component4()Ljava/util/Map; + invoke-virtual {p2}, Lcom/discord/widgets/chat/list/entries/MessageEntry;->component5()Ljava/util/Map; 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 b6997a23ce..5fc9b75a01 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/WidgetChatListAdapterItemUploadProgress.smali @@ -586,7 +586,7 @@ check-cast p2, Landroid/view/View; - const v0, 0x7f120ea3 + const v0, 0x7f120ea4 invoke-static {p2, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/chat/list/entries/MessageEntry.smali b/com.discord/smali/com/discord/widgets/chat/list/entries/MessageEntry.smali index 8032473c4c..0334d34ab1 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/entries/MessageEntry.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/entries/MessageEntry.smali @@ -18,6 +18,8 @@ .field private final message:Lcom/discord/models/domain/ModelMessage; +.field private final messageState:Lcom/discord/stores/StoreMessageState$State; + .field private final nickOrUsernames:Ljava/util/Map; .annotation system Ldalvik/annotation/Signature; value = { @@ -42,12 +44,13 @@ # direct methods -.method public constructor (Lcom/discord/models/domain/ModelMessage;Lcom/discord/models/domain/ModelGuildMember$Computed;Ljava/util/Map;Ljava/util/Map;ZZZ)V +.method public constructor (Lcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;Lcom/discord/models/domain/ModelGuildMember$Computed;Ljava/util/Map;Ljava/util/Map;ZZZ)V .locals 1 .annotation system Ldalvik/annotation/Signature; value = { "(", "Lcom/discord/models/domain/ModelMessage;", + "Lcom/discord/stores/StoreMessageState$State;", "Lcom/discord/models/domain/ModelGuildMember$Computed;", "Ljava/util/Map<", "Ljava/lang/Long;", @@ -67,23 +70,25 @@ const-string v0, "nickOrUsernames" - invoke-static {p4, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {p5, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V invoke-direct {p0}, Ljava/lang/Object;->()V iput-object p1, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->message:Lcom/discord/models/domain/ModelMessage; - iput-object p2, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->author:Lcom/discord/models/domain/ModelGuildMember$Computed; + iput-object p2, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->messageState:Lcom/discord/stores/StoreMessageState$State; - iput-object p3, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->roles:Ljava/util/Map; + iput-object p3, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->author:Lcom/discord/models/domain/ModelGuildMember$Computed; - iput-object p4, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->nickOrUsernames:Ljava/util/Map; + iput-object p4, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->roles:Ljava/util/Map; - iput-boolean p5, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->isMinimal:Z + iput-object p5, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->nickOrUsernames:Ljava/util/Map; - iput-boolean p6, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->isExpandedBlocked:Z + iput-boolean p6, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->isMinimal:Z - iput-boolean p7, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->animateEmojis:Z + iput-boolean p7, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->isExpandedBlocked:Z + + iput-boolean p8, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->animateEmojis:Z new-instance p1, Ljava/lang/StringBuilder; @@ -129,35 +134,37 @@ return-void .end method -.method public synthetic constructor (Lcom/discord/models/domain/ModelMessage;Lcom/discord/models/domain/ModelGuildMember$Computed;Ljava/util/Map;Ljava/util/Map;ZZZILkotlin/jvm/internal/DefaultConstructorMarker;)V - .locals 10 +.method public synthetic constructor (Lcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;Lcom/discord/models/domain/ModelGuildMember$Computed;Ljava/util/Map;Ljava/util/Map;ZZZILkotlin/jvm/internal/DefaultConstructorMarker;)V + .locals 11 - and-int/lit8 v1, p8, 0x10 + move/from16 v0, p9 + + and-int/lit8 v1, v0, 0x20 if-eqz v1, :cond_0 const/4 v1, 0x0 - const/4 v7, 0x0 + const/4 v8, 0x0 goto :goto_0 :cond_0 - move v7, p5 + move/from16 v8, p6 :goto_0 - and-int/lit8 v0, p8, 0x40 + and-int/lit16 v0, v0, 0x80 if-eqz v0, :cond_1 const/4 v0, 0x1 - const/4 v9, 0x1 + const/4 v10, 0x1 goto :goto_1 :cond_1 - move/from16 v9, p7 + move/from16 v10, p8 :goto_1 move-object v2, p0 @@ -170,14 +177,16 @@ move-object v6, p4 - move/from16 v8, p6 + move-object/from16 v7, p5 - invoke-direct/range {v2 .. v9}, Lcom/discord/widgets/chat/list/entries/MessageEntry;->(Lcom/discord/models/domain/ModelMessage;Lcom/discord/models/domain/ModelGuildMember$Computed;Ljava/util/Map;Ljava/util/Map;ZZZ)V + move/from16 v9, p7 + + invoke-direct/range {v2 .. v10}, Lcom/discord/widgets/chat/list/entries/MessageEntry;->(Lcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;Lcom/discord/models/domain/ModelGuildMember$Computed;Ljava/util/Map;Ljava/util/Map;ZZZ)V return-void .end method -.method private final component5()Z +.method private final component6()Z .locals 1 iget-boolean v0, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->isMinimal:Z @@ -185,7 +194,7 @@ return v0 .end method -.method private final component6()Z +.method private final component7()Z .locals 1 iget-boolean v0, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->isExpandedBlocked:Z @@ -193,91 +202,130 @@ return v0 .end method -.method public static synthetic copy$default(Lcom/discord/widgets/chat/list/entries/MessageEntry;Lcom/discord/models/domain/ModelMessage;Lcom/discord/models/domain/ModelGuildMember$Computed;Ljava/util/Map;Ljava/util/Map;ZZZILjava/lang/Object;)Lcom/discord/widgets/chat/list/entries/MessageEntry; - .locals 5 +.method public static synthetic copy$default(Lcom/discord/widgets/chat/list/entries/MessageEntry;Lcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;Lcom/discord/models/domain/ModelGuildMember$Computed;Ljava/util/Map;Ljava/util/Map;ZZZILjava/lang/Object;)Lcom/discord/widgets/chat/list/entries/MessageEntry; + .locals 9 - and-int/lit8 p9, p8, 0x1 + move-object v0, p0 - if-eqz p9, :cond_0 + move/from16 v1, p9 - iget-object p1, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->message:Lcom/discord/models/domain/ModelMessage; + and-int/lit8 v2, v1, 0x1 + + if-eqz v2, :cond_0 + + iget-object v2, v0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->message:Lcom/discord/models/domain/ModelMessage; + + goto :goto_0 :cond_0 - and-int/lit8 p9, p8, 0x2 + move-object v2, p1 - if-eqz p9, :cond_1 + :goto_0 + and-int/lit8 v3, v1, 0x2 - iget-object p2, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->author:Lcom/discord/models/domain/ModelGuildMember$Computed; + if-eqz v3, :cond_1 + + iget-object v3, v0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->messageState:Lcom/discord/stores/StoreMessageState$State; + + goto :goto_1 :cond_1 - move-object p9, p2 + move-object v3, p2 - and-int/lit8 p2, p8, 0x4 + :goto_1 + and-int/lit8 v4, v1, 0x4 - if-eqz p2, :cond_2 + if-eqz v4, :cond_2 - iget-object p3, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->roles:Ljava/util/Map; + iget-object v4, v0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->author:Lcom/discord/models/domain/ModelGuildMember$Computed; + + goto :goto_2 :cond_2 - move-object v0, p3 + move-object v4, p3 - and-int/lit8 p2, p8, 0x8 + :goto_2 + and-int/lit8 v5, v1, 0x8 - if-eqz p2, :cond_3 + if-eqz v5, :cond_3 - iget-object p4, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->nickOrUsernames:Ljava/util/Map; + iget-object v5, v0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->roles:Ljava/util/Map; + + goto :goto_3 :cond_3 - move-object v1, p4 + move-object v5, p4 - and-int/lit8 p2, p8, 0x10 + :goto_3 + and-int/lit8 v6, v1, 0x10 - if-eqz p2, :cond_4 + if-eqz v6, :cond_4 - iget-boolean p5, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->isMinimal:Z + iget-object v6, v0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->nickOrUsernames:Ljava/util/Map; + + goto :goto_4 :cond_4 - move v2, p5 + move-object v6, p5 - and-int/lit8 p2, p8, 0x20 + :goto_4 + and-int/lit8 v7, v1, 0x20 - if-eqz p2, :cond_5 + if-eqz v7, :cond_5 - iget-boolean p6, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->isExpandedBlocked:Z + iget-boolean v7, v0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->isMinimal:Z + + goto :goto_5 :cond_5 - move v3, p6 + move v7, p6 - and-int/lit8 p2, p8, 0x40 + :goto_5 + and-int/lit8 v8, v1, 0x40 - if-eqz p2, :cond_6 + if-eqz v8, :cond_6 - iget-boolean p7, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->animateEmojis:Z + iget-boolean v8, v0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->isExpandedBlocked:Z + + goto :goto_6 :cond_6 - move v4, p7 + move/from16 v8, p7 - move-object p2, p0 + :goto_6 + and-int/lit16 v1, v1, 0x80 - move-object p3, p1 + if-eqz v1, :cond_7 - move-object p4, p9 + iget-boolean v1, v0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->animateEmojis:Z - move-object p5, v0 + goto :goto_7 - move-object p6, v1 + :cond_7 + move/from16 v1, p8 - move p7, v2 + :goto_7 + move-object p1, v2 - move p8, v3 + move-object p2, v3 - move p9, v4 + move-object p3, v4 - invoke-virtual/range {p2 .. p9}, Lcom/discord/widgets/chat/list/entries/MessageEntry;->copy(Lcom/discord/models/domain/ModelMessage;Lcom/discord/models/domain/ModelGuildMember$Computed;Ljava/util/Map;Ljava/util/Map;ZZZ)Lcom/discord/widgets/chat/list/entries/MessageEntry; + move-object p4, v5 - move-result-object p0 + move-object p5, v6 - return-object p0 + move p6, v7 + + move/from16 p7, v8 + + move/from16 p8, v1 + + invoke-virtual/range {p0 .. p8}, Lcom/discord/widgets/chat/list/entries/MessageEntry;->copy(Lcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;Lcom/discord/models/domain/ModelGuildMember$Computed;Ljava/util/Map;Ljava/util/Map;ZZZ)Lcom/discord/widgets/chat/list/entries/MessageEntry; + + move-result-object v0 + + return-object v0 .end method @@ -290,7 +338,15 @@ return-object v0 .end method -.method public final component2()Lcom/discord/models/domain/ModelGuildMember$Computed; +.method public final component2()Lcom/discord/stores/StoreMessageState$State; + .locals 1 + + iget-object v0, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->messageState:Lcom/discord/stores/StoreMessageState$State; + + return-object v0 +.end method + +.method public final component3()Lcom/discord/models/domain/ModelGuildMember$Computed; .locals 1 iget-object v0, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->author:Lcom/discord/models/domain/ModelGuildMember$Computed; @@ -298,7 +354,7 @@ return-object v0 .end method -.method public final component3()Ljava/util/Map; +.method public final component4()Ljava/util/Map; .locals 1 .annotation system Ldalvik/annotation/Signature; value = { @@ -315,7 +371,7 @@ return-object 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 = { @@ -332,7 +388,7 @@ return-object v0 .end method -.method public final component7()Z +.method public final component8()Z .locals 1 iget-boolean v0, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->animateEmojis:Z @@ -340,12 +396,13 @@ return v0 .end method -.method public final copy(Lcom/discord/models/domain/ModelMessage;Lcom/discord/models/domain/ModelGuildMember$Computed;Ljava/util/Map;Ljava/util/Map;ZZZ)Lcom/discord/widgets/chat/list/entries/MessageEntry; - .locals 9 +.method public final copy(Lcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;Lcom/discord/models/domain/ModelGuildMember$Computed;Ljava/util/Map;Ljava/util/Map;ZZZ)Lcom/discord/widgets/chat/list/entries/MessageEntry; + .locals 10 .annotation system Ldalvik/annotation/Signature; value = { "(", "Lcom/discord/models/domain/ModelMessage;", + "Lcom/discord/stores/StoreMessageState$State;", "Lcom/discord/models/domain/ModelGuildMember$Computed;", "Ljava/util/Map<", "Ljava/lang/Long;", @@ -368,9 +425,9 @@ const-string v0, "nickOrUsernames" - move-object v5, p4 + move-object v6, p5 - invoke-static {p4, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V + invoke-static {p5, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V new-instance v0, Lcom/discord/widgets/chat/list/entries/MessageEntry; @@ -380,13 +437,15 @@ move-object v4, p3 - move v6, p5 + move-object v5, p4 - move v7, p6 + move/from16 v7, p6 move/from16 v8, p7 - invoke-direct/range {v1 .. v8}, Lcom/discord/widgets/chat/list/entries/MessageEntry;->(Lcom/discord/models/domain/ModelMessage;Lcom/discord/models/domain/ModelGuildMember$Computed;Ljava/util/Map;Ljava/util/Map;ZZZ)V + move/from16 v9, p8 + + invoke-direct/range {v1 .. v9}, Lcom/discord/widgets/chat/list/entries/MessageEntry;->(Lcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;Lcom/discord/models/domain/ModelGuildMember$Computed;Ljava/util/Map;Ljava/util/Map;ZZZ)V return-object v0 .end method @@ -416,6 +475,16 @@ if-eqz v1, :cond_3 + iget-object v1, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->messageState:Lcom/discord/stores/StoreMessageState$State; + + iget-object v3, p1, Lcom/discord/widgets/chat/list/entries/MessageEntry;->messageState:Lcom/discord/stores/StoreMessageState$State; + + invoke-static {v1, v3}, Lkotlin/jvm/internal/j;->x(Ljava/lang/Object;Ljava/lang/Object;)Z + + move-result v1 + + if-eqz v1, :cond_3 + iget-object v1, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->author:Lcom/discord/models/domain/ModelGuildMember$Computed; iget-object v3, p1, Lcom/discord/widgets/chat/list/entries/MessageEntry;->author:Lcom/discord/models/domain/ModelGuildMember$Computed; @@ -536,6 +605,14 @@ return-object v0 .end method +.method public final getMessageState()Lcom/discord/stores/StoreMessageState$State; + .locals 1 + + iget-object v0, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->messageState:Lcom/discord/stores/StoreMessageState$State; + + return-object v0 +.end method + .method public final getNickOrUsernames()Ljava/util/Map; .locals 1 .annotation system Ldalvik/annotation/Signature; @@ -664,7 +741,7 @@ :goto_0 mul-int/lit8 v0, v0, 0x1f - iget-object v2, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->author:Lcom/discord/models/domain/ModelGuildMember$Computed; + iget-object v2, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->messageState:Lcom/discord/stores/StoreMessageState$State; if-eqz v2, :cond_1 @@ -682,7 +759,7 @@ mul-int/lit8 v0, v0, 0x1f - iget-object v2, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->roles:Ljava/util/Map; + iget-object v2, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->author:Lcom/discord/models/domain/ModelGuildMember$Computed; if-eqz v2, :cond_2 @@ -700,15 +777,33 @@ mul-int/lit8 v0, v0, 0x1f - iget-object v2, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->nickOrUsernames:Ljava/util/Map; + iget-object v2, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->roles:Ljava/util/Map; if-eqz v2, :cond_3 invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I - move-result v1 + move-result v2 + + goto :goto_3 :cond_3 + const/4 v2, 0x0 + + :goto_3 + add-int/2addr v0, v2 + + mul-int/lit8 v0, v0, 0x1f + + iget-object v2, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->nickOrUsernames:Ljava/util/Map; + + if-eqz v2, :cond_4 + + invoke-virtual {v2}, Ljava/lang/Object;->hashCode()I + + move-result v1 + + :cond_4 add-int/2addr v0, v1 mul-int/lit8 v0, v0, 0x1f @@ -717,17 +812,6 @@ const/4 v2, 0x1 - if-eqz v1, :cond_4 - - const/4 v1, 0x1 - - :cond_4 - add-int/2addr v0, v1 - - mul-int/lit8 v0, v0, 0x1f - - iget-boolean v1, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->isExpandedBlocked:Z - if-eqz v1, :cond_5 const/4 v1, 0x1 @@ -737,7 +821,7 @@ mul-int/lit8 v0, v0, 0x1f - iget-boolean v1, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->animateEmojis:Z + iget-boolean v1, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->isExpandedBlocked:Z if-eqz v1, :cond_6 @@ -746,6 +830,17 @@ :cond_6 add-int/2addr v0, v1 + mul-int/lit8 v0, v0, 0x1f + + iget-boolean v1, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->animateEmojis:Z + + if-eqz v1, :cond_7 + + const/4 v1, 0x1 + + :cond_7 + add-int/2addr v0, v1 + return v0 .end method @@ -770,6 +865,14 @@ invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + const-string v1, ", messageState=" + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; + + iget-object v1, p0, Lcom/discord/widgets/chat/list/entries/MessageEntry;->messageState:Lcom/discord/stores/StoreMessageState$State; + + invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/Object;)Ljava/lang/StringBuilder; + const-string v1, ", author=" invoke-virtual {v0, v1}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; diff --git a/com.discord/smali/com/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$xrvoHkG1QmHGVyec00MyIk3MqnQ.smali b/com.discord/smali/com/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$PTHg7HEqh1Jfk60mXTXlCjFiUK4.smali similarity index 56% rename from com.discord/smali/com/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$xrvoHkG1QmHGVyec00MyIk3MqnQ.smali rename to com.discord/smali/com/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$PTHg7HEqh1Jfk60mXTXlCjFiUK4.smali index 8345747889..b705175c68 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$xrvoHkG1QmHGVyec00MyIk3MqnQ.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$PTHg7HEqh1Jfk60mXTXlCjFiUK4.smali @@ -1,9 +1,9 @@ -.class public final synthetic Lcom/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$xrvoHkG1QmHGVyec00MyIk3MqnQ; +.class public final synthetic Lcom/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$PTHg7HEqh1Jfk60mXTXlCjFiUK4; .super Ljava/lang/Object; .source "lambda" # interfaces -.implements Lrx/functions/Func8; +.implements Lrx/functions/Func9; # instance fields @@ -16,19 +16,19 @@ invoke-direct {p0}, Ljava/lang/Object;->()V - iput-object p1, p0, Lcom/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$xrvoHkG1QmHGVyec00MyIk3MqnQ;->f$0:Lcom/discord/models/domain/ModelChannel; + iput-object p1, p0, Lcom/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$PTHg7HEqh1Jfk60mXTXlCjFiUK4;->f$0: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;Ljava/lang/Object;)Ljava/lang/Object; - .locals 10 +.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 11 move-object v0, p0 - iget-object v1, v0, Lcom/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$xrvoHkG1QmHGVyec00MyIk3MqnQ;->f$0:Lcom/discord/models/domain/ModelChannel; + iget-object v1, v0, Lcom/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$PTHg7HEqh1Jfk60mXTXlCjFiUK4;->f$0:Lcom/discord/models/domain/ModelChannel; move-object v2, p1 @@ -46,23 +46,27 @@ check-cast v5, Ljava/util/Map; - move-object v6, p5 + move-object/from16 v6, p5 - check-cast v6, Lcom/discord/models/application/ModelAppMessage$Unread; + check-cast v6, Ljava/util/Map; move-object/from16 v7, p6 - check-cast v7, Ljava/util/Map; + check-cast v7, Lcom/discord/models/application/ModelAppMessage$Unread; move-object/from16 v8, p7 - check-cast v8, Ljava/lang/Boolean; + check-cast v8, Ljava/util/Map; move-object/from16 v9, p8 check-cast v9, Ljava/lang/Boolean; - invoke-static/range {v1 .. v9}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->lambda$get$1(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/List;Ljava/util/List;Ljava/util/Map;Lcom/discord/models/application/ModelAppMessage$Unread;Ljava/util/Map;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages; + move-object/from16 v10, p9 + + check-cast v10, Ljava/lang/Boolean; + + invoke-static/range {v1 .. v10}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->lambda$get$1(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/List;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/application/ModelAppMessage$Unread;Ljava/util/Map;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages; move-result-object v1 diff --git a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModel$Messages.smali b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModel$Messages.smali index de7d340ba2..2c4f3351c0 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModel$Messages.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModel$Messages.smali @@ -49,8 +49,8 @@ # direct methods -.method private constructor (Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/List;Ljava/util/List;Ljava/util/Map;Lcom/discord/models/application/ModelAppMessage$Unread;Ljava/util/Map;ZZ)V - .locals 9 +.method private constructor (Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/List;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/application/ModelAppMessage$Unread;Ljava/util/Map;ZZ)V + .locals 10 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -67,6 +67,10 @@ ">;", "Ljava/util/Map<", "Ljava/lang/Long;", + "Lcom/discord/stores/StoreMessageState$State;", + ">;", + "Ljava/util/Map<", + "Ljava/lang/Long;", "Lcom/discord/models/domain/ModelGuildMember$Computed;", ">;", "Lcom/discord/models/application/ModelAppMessage$Unread;", @@ -77,21 +81,21 @@ } .end annotation - move-object v8, p0 + move-object v9, p0 invoke-direct {p0}, Ljava/lang/Object;->()V const/4 v0, 0x0 - iput v0, v8, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->concatCount:I + iput v0, v9, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->concatCount:I const/4 v1, 0x0 - iput-object v1, v8, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->listItemMostRecentlyAdded:Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload; + iput-object v1, v9, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->listItemMostRecentlyAdded:Lcom/discord/utilities/mg_recycler/MGRecyclerDataPayload; - if-eqz p5, :cond_0 + if-eqz p6, :cond_0 - move-object v1, p5 + move-object/from16 v1, p6 goto :goto_0 @@ -101,7 +105,7 @@ move-result-object v1 :goto_0 - iput-object v1, v8, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->channelMembers:Ljava/util/Map; + iput-object v1, v9, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->channelMembers:Ljava/util/Map; invoke-interface {p4}, Ljava/util/List;->isEmpty()Z @@ -131,9 +135,9 @@ move-wide v0, v2 :goto_1 - iput-wide v0, v8, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->oldestMessageId:J + iput-wide v0, v9, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->oldestMessageId:J - invoke-virtual {p6}, Lcom/discord/models/application/ModelAppMessage$Unread;->getMarker()Lcom/discord/models/application/ModelAppMessage$Unread$Marker; + invoke-virtual/range {p7 .. p7}, Lcom/discord/models/application/ModelAppMessage$Unread;->getMarker()Lcom/discord/models/application/ModelAppMessage$Unread$Marker; move-result-object v0 @@ -143,7 +147,7 @@ if-eqz v0, :cond_2 - invoke-virtual {p6}, Lcom/discord/models/application/ModelAppMessage$Unread;->getMarker()Lcom/discord/models/application/ModelAppMessage$Unread$Marker; + invoke-virtual/range {p7 .. p7}, Lcom/discord/models/application/ModelAppMessage$Unread;->getMarker()Lcom/discord/models/application/ModelAppMessage$Unread$Marker; move-result-object v0 @@ -156,13 +160,13 @@ move-result-wide v2 :cond_2 - iput-wide v2, v8, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->newMessagesMarkerMessageId:J + iput-wide v2, v9, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->newMessagesMarkerMessageId:J new-instance v0, Ljava/util/ArrayList; invoke-direct {v0}, Ljava/util/ArrayList;->()V - iput-object v0, v8, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->items:Ljava/util/List; + iput-object v0, v9, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->items:Ljava/util/List; move-object v0, p0 @@ -174,13 +178,15 @@ move-object v4, p4 - move-object/from16 v5, p7 + move-object v5, p5 - move/from16 v6, p8 + move-object/from16 v6, p8 move/from16 v7, p9 - invoke-direct/range {v0 .. v7}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->computeItems(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/List;Ljava/util/List;Ljava/util/Map;ZZ)V + move/from16 v8, p10 + + invoke-direct/range {v0 .. v8}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->computeItems(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/List;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;ZZ)V return-void .end method @@ -289,8 +295,8 @@ return-void .end method -.method private addMessage(Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelMessage;Lcom/discord/models/domain/ModelMessage;ZZZJ)V - .locals 14 +.method private addMessage(Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;Lcom/discord/models/domain/ModelMessage;ZZZJ)V + .locals 15 .param p1 # Ljava/util/Map; .annotation build Landroidx/annotation/NonNull; .end annotation @@ -303,7 +309,11 @@ .annotation build Landroidx/annotation/NonNull; .end annotation .end param - .param p4 # Lcom/discord/models/domain/ModelMessage; + .param p4 # Lcom/discord/stores/StoreMessageState$State; + .annotation build Landroidx/annotation/Nullable; + .end annotation + .end param + .param p5 # Lcom/discord/models/domain/ModelMessage; .annotation build Landroidx/annotation/Nullable; .end annotation .end param @@ -319,6 +329,7 @@ "Lcom/discord/models/domain/ModelGuildRole;", ">;", "Lcom/discord/models/domain/ModelMessage;", + "Lcom/discord/stores/StoreMessageState$State;", "Lcom/discord/models/domain/ModelMessage;", "ZZZJ)V" } @@ -330,13 +341,13 @@ move-object/from16 v5, p3 - move-object/from16 v2, p4 + move-object/from16 v2, p5 invoke-direct {p0, v1, v5, v2}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->shouldConcatMessage(ILcom/discord/models/domain/ModelMessage;Lcom/discord/models/domain/ModelMessage;)Z - move-result v7 + move-result v8 - if-eqz v7, :cond_0 + if-eqz v8, :cond_0 iget v1, v0, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->concatCount:I @@ -354,23 +365,25 @@ invoke-virtual/range {p3 .. p3}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J - move-result-wide v12 + move-result-wide v13 - move-object v2, p1 + move-object/from16 v2, p1 move-object/from16 v4, p2 move-object/from16 v5, p3 - move/from16 v6, p5 + move-object/from16 v6, p4 - move/from16 v8, p6 + move/from16 v7, p6 move/from16 v9, p7 - move-wide/from16 v10, p8 + move/from16 v10, p8 - invoke-static/range {v2 .. v13}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->getMessageItems(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelMessage;ZZZZJJ)Ljava/util/List; + move-wide/from16 v11, p9 + + invoke-static/range {v2 .. v14}, 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;ZZZZJJ)Ljava/util/List; move-result-object v1 @@ -379,8 +392,8 @@ return-void .end method -.method private computeItems(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/List;Ljava/util/List;Ljava/util/Map;ZZ)V - .locals 23 +.method private computeItems(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/List;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;ZZ)V + .locals 24 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -397,16 +410,20 @@ ">;", "Ljava/util/Map<", "Ljava/lang/Long;", + "Lcom/discord/stores/StoreMessageState$State;", + ">;", + "Ljava/util/Map<", + "Ljava/lang/Long;", "Lcom/discord/models/domain/ModelGuildRole;", ">;ZZ)V" } .end annotation - move-object/from16 v10, p0 + move-object/from16 v11, p0 invoke-interface/range {p4 .. p4}, Ljava/util/List;->iterator()Ljava/util/Iterator; - move-result-object v11 + move-result-object v12 const/4 v0, 0x0 @@ -422,47 +439,47 @@ const/4 v8, 0x0 - const/4 v13, 0x0 - const/4 v14, 0x0 + const/4 v15, 0x0 + :goto_0 - invoke-interface {v11}, Ljava/util/Iterator;->hasNext()Z + invoke-interface {v12}, Ljava/util/Iterator;->hasNext()Z move-result v1 - if-eqz v1, :cond_a + if-eqz v1, :cond_9 - invoke-interface {v11}, Ljava/util/Iterator;->next()Ljava/lang/Object; + invoke-interface {v12}, Ljava/util/Iterator;->next()Ljava/lang/Object; move-result-object v1 - move-object v15, v1 + move-object/from16 v16, v1 - check-cast v15, Lcom/discord/models/domain/ModelMessage; + check-cast v16, Lcom/discord/models/domain/ModelMessage; - invoke-virtual {v15}, Lcom/discord/models/domain/ModelMessage;->getTimestamp()J + invoke-virtual/range {v16 .. v16}, Lcom/discord/models/domain/ModelMessage;->getTimestamp()J move-result-wide v1 - invoke-direct {v10, v1, v2, v5, v6}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->willAddTimestamp(JJ)Z + invoke-direct {v11, v1, v2, v5, v6}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->willAddTimestamp(JJ)Z move-result v1 if-eqz v1, :cond_0 - invoke-direct {v10, v7, v0, v8}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->addBlockedMessage(Lcom/discord/models/domain/ModelMessage;IZ)I + invoke-direct {v11, v7, v0, v8}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->addBlockedMessage(Lcom/discord/models/domain/ModelMessage;IZ)I move-result v0 :cond_0 - move/from16 v16, v0 + move v10, v0 - invoke-virtual {v15}, Lcom/discord/models/domain/ModelMessage;->getId()J + invoke-virtual/range {v16 .. v16}, Lcom/discord/models/domain/ModelMessage;->getId()J move-result-wide v1 - invoke-virtual {v15}, Lcom/discord/models/domain/ModelMessage;->getTimestamp()J + invoke-virtual/range {v16 .. v16}, Lcom/discord/models/domain/ModelMessage;->getTimestamp()J move-result-wide v3 @@ -480,7 +497,7 @@ sub-int/2addr v0, v1 - if-ne v13, v0, :cond_1 + if-ne v14, v0, :cond_1 const/4 v6, 0x1 @@ -490,7 +507,7 @@ const/4 v6, 0x0 :goto_1 - invoke-virtual {v15}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser; + invoke-virtual/range {v16 .. v16}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser; move-result-object v0 @@ -508,17 +525,17 @@ move-result v0 - if-eqz v0, :cond_3 + if-eqz v0, :cond_2 - add-int/lit8 v2, v16, 0x1 + add-int/lit8 v10, v10, 0x1 - if-ne v2, v1, :cond_2 + if-ne v10, v1, :cond_2 - invoke-virtual {v15}, Lcom/discord/models/domain/ModelMessage;->getId()J + invoke-virtual/range {v16 .. v16}, Lcom/discord/models/domain/ModelMessage;->getId()J - move-result-wide v3 + move-result-wide v1 - invoke-static {v3, v4}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static {v1, v2}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; move-result-object v1 @@ -528,147 +545,157 @@ move-result v8 - move v1, v8 + move v1, v10 - move-object v8, v15 + move-object/from16 v10, v16 - goto :goto_3 + goto :goto_2 :cond_2 move-object/from16 v4, p3 - move v1, v8 + move v1, v10 - goto :goto_2 - - :cond_3 - move-object/from16 v4, p3 - - move v1, v8 - - move/from16 v2, v16 + move-object v10, v7 :goto_2 - move-object v8, v7 + if-eqz v0, :cond_4 + if-eqz v6, :cond_3 + + goto :goto_4 + + :cond_3 :goto_3 - if-eqz v0, :cond_5 - - if-eqz v6, :cond_4 + move/from16 v19, v1 goto :goto_5 :cond_4 :goto_4 - move/from16 v16, v2 + invoke-direct {v11, v10, v1, v8}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->addBlockedMessage(Lcom/discord/models/domain/ModelMessage;IZ)I + + move-result v1 + + goto :goto_3 + + :goto_5 + if-nez v0, :cond_5 + + if-eqz v8, :cond_5 + + const/16 v20, 0x0 goto :goto_6 :cond_5 - :goto_5 - invoke-direct {v10, v8, v2, v1}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->addBlockedMessage(Lcom/discord/models/domain/ModelMessage;IZ)I - - move-result v2 - - goto :goto_4 + move/from16 v20, v8 :goto_6 - if-nez v0, :cond_6 + if-eqz v0, :cond_7 - if-eqz v1, :cond_6 - - const/16 v19, 0x0 + if-eqz v20, :cond_6 goto :goto_7 :cond_6 - move/from16 v19, v1 + move v13, v6 - :goto_7 - if-eqz v0, :cond_8 - - if-eqz v19, :cond_7 + move-object/from16 v23, v10 goto :goto_8 :cond_7 - move v12, v6 - - move-object/from16 v22, v8 - - goto :goto_9 - - :cond_8 - :goto_8 + :goto_7 invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelChannel;->getNicks()Ljava/util/Map; move-result-object v1 + invoke-virtual/range {v16 .. v16}, Lcom/discord/models/domain/ModelMessage;->getId()J + + move-result-wide v2 + + invoke-static {v2, v3}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + + move-result-object v0 + + move-object/from16 v8, p5 + + invoke-interface {v8, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + + move-result-object v0 + + move-object v7, v0 + + check-cast v7, Lcom/discord/stores/StoreMessageState$State; + invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J - move-result-wide v20 + move-result-wide v21 move-object/from16 v0, p0 - move-object/from16 v2, p5 + move-object/from16 v2, p6 - move-object v3, v15 + move-object/from16 v3, v16 - move-object v4, v9 + move-object v4, v7 - move/from16 v5, v19 + move-object v5, v9 move v9, v6 - move/from16 v6, p6 + move/from16 v6, v20 move/from16 v7, p7 - move-object/from16 v22, v8 + move/from16 v8, p8 - move v12, v9 + move v13, v9 - move-wide/from16 v8, v20 + move-object/from16 v23, v10 - invoke-direct/range {v0 .. v9}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->addMessage(Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelMessage;Lcom/discord/models/domain/ModelMessage;ZZZJ)V + move-wide/from16 v9, v21 - :goto_9 - if-nez v14, :cond_9 + invoke-direct/range {v0 .. v10}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->addMessage(Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;Lcom/discord/models/domain/ModelMessage;ZZZJ)V - invoke-virtual {v15}, Lcom/discord/models/domain/ModelMessage;->getId()J + :goto_8 + if-nez v15, :cond_8 + + invoke-virtual/range {v16 .. v16}, Lcom/discord/models/domain/ModelMessage;->getId()J move-result-wide v0 move-object/from16 v2, p1 - invoke-direct {v10, v12, v0, v1, v2}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->tryAddNewMessagesSeparator(ZJLcom/discord/models/domain/ModelChannel;)Z + invoke-direct {v11, v13, v0, v1, v2}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->tryAddNewMessagesSeparator(ZJLcom/discord/models/domain/ModelChannel;)Z move-result v0 - move v14, v0 + move v15, v0 - goto :goto_a + goto :goto_9 - :cond_9 + :cond_8 move-object/from16 v2, p1 - :goto_a - add-int/lit8 v13, v13, 0x1 + :goto_9 + add-int/lit8 v14, v14, 0x1 - move-object v9, v15 - - move/from16 v0, v16 + move-object/from16 v9, v16 move-wide/from16 v5, v17 - move/from16 v8, v19 + move/from16 v0, v19 - move-object/from16 v7, v22 + move/from16 v8, v20 + + move-object/from16 v7, v23 goto/16 :goto_0 - :cond_a - iget-object v0, v10, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->items:Ljava/util/List; + :cond_9 + iget-object v0, v11, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->items:Ljava/util/List; invoke-static {v0}, Ljava/util/Collections;->reverse(Ljava/util/List;)V @@ -800,7 +827,7 @@ .end method .method public static get(Lcom/discord/models/domain/ModelChannel;)Lrx/Observable; - .locals 11 + .locals 12 .param p0 # Lcom/discord/models/domain/ModelChannel; .annotation build Landroidx/annotation/NonNull; .end annotation @@ -846,6 +873,14 @@ move-result-object v4 + invoke-static {}, Lcom/discord/stores/StoreStream;->getMessageState()Lcom/discord/stores/StoreMessageState; + + move-result-object v0 + + invoke-virtual {v0}, Lcom/discord/stores/StoreMessageState;->getMessageState()Lrx/Observable; + + move-result-object v5 + invoke-static {}, Lcom/discord/stores/StoreStream;->getGuilds()Lcom/discord/stores/StoreGuilds; move-result-object v0 @@ -860,7 +895,7 @@ invoke-virtual {v0, v1}, Lrx/Observable;->e(Lrx/functions/b;)Lrx/Observable; - move-result-object v5 + move-result-object v6 invoke-static {}, Lcom/discord/stores/StoreStream;->getReadStates()Lcom/discord/stores/StoreReadStates; @@ -868,11 +903,11 @@ invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getId()J - move-result-wide v6 + move-result-wide v7 - invoke-virtual {v0, v6, v7}, Lcom/discord/stores/StoreReadStates;->getUnreadMarker(J)Lrx/Observable; + invoke-virtual {v0, v7, v8}, Lcom/discord/stores/StoreReadStates;->getUnreadMarker(J)Lrx/Observable; - move-result-object v6 + move-result-object v7 invoke-static {}, Lcom/discord/stores/StoreStream;->getGuilds()Lcom/discord/stores/StoreGuilds; @@ -880,15 +915,15 @@ invoke-virtual {p0}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J - move-result-wide v7 + move-result-wide v8 - invoke-virtual {v0, v7, v8}, Lcom/discord/stores/StoreGuilds;->getRoles(J)Lrx/Observable; + invoke-virtual {v0, v8, v9}, Lcom/discord/stores/StoreGuilds;->getRoles(J)Lrx/Observable; - move-result-object v7 + move-result-object v8 invoke-static {p0}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel;->access$300(Lcom/discord/models/domain/ModelChannel;)Lrx/Observable; - move-result-object v8 + move-result-object v9 invoke-static {}, Lcom/discord/stores/StoreStream;->getUserSettings()Lcom/discord/stores/StoreUserSettings; @@ -896,13 +931,13 @@ invoke-virtual {v0}, Lcom/discord/stores/StoreUserSettings;->getAllowAnimatedEmojisObservable()Lrx/Observable; - move-result-object v9 + move-result-object v10 - new-instance v10, Lcom/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$xrvoHkG1QmHGVyec00MyIk3MqnQ; + new-instance v11, Lcom/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$PTHg7HEqh1Jfk60mXTXlCjFiUK4; - invoke-direct {v10, p0}, Lcom/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$xrvoHkG1QmHGVyec00MyIk3MqnQ;->(Lcom/discord/models/domain/ModelChannel;)V + invoke-direct {v11, p0}, Lcom/discord/widgets/chat/list/model/-$$Lambda$WidgetChatListModel$Messages$PTHg7HEqh1Jfk60mXTXlCjFiUK4;->(Lcom/discord/models/domain/ModelChannel;)V - invoke-static/range {v2 .. v10}, Lrx/Observable;->a(Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/Observable;Lrx/functions/Func8;)Lrx/Observable; + invoke-static/range {v2 .. v11}, 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 @@ -1322,8 +1357,8 @@ return-object p0 .end method -.method public static getMessageItems(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelMessage;ZZZZJJ)Ljava/util/List; - .locals 11 +.method public static getMessageItems(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;ZZZZJJ)Ljava/util/List; + .locals 12 .param p0 # Ljava/util/Map; .annotation build Landroidx/annotation/NonNull; .end annotation @@ -1340,6 +1375,10 @@ .annotation build Landroidx/annotation/NonNull; .end annotation .end param + .param p4 # Lcom/discord/stores/StoreMessageState$State; + .annotation build Landroidx/annotation/Nullable; + .end annotation + .end param .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -1356,6 +1395,7 @@ "Lcom/discord/models/domain/ModelGuildRole;", ">;", "Lcom/discord/models/domain/ModelMessage;", + "Lcom/discord/stores/StoreMessageState$State;", "ZZZZJJ)", "Ljava/util/List<", "Lcom/discord/widgets/chat/list/entries/ChatListEntry;", @@ -1365,7 +1405,7 @@ move-object v0, p1 - move-object v8, p3 + move-object v9, p3 invoke-virtual {p3}, Lcom/discord/models/domain/ModelMessage;->getAuthor()Lcom/discord/models/domain/ModelUser; @@ -1383,9 +1423,9 @@ move-result-object v1 - move-object v2, v1 + move-object v3, v1 - check-cast v2, Lcom/discord/models/domain/ModelGuildMember$Computed; + check-cast v3, Lcom/discord/models/domain/ModelGuildMember$Computed; invoke-virtual {p3}, Lcom/discord/models/domain/ModelMessage;->getContent()Ljava/lang/String; @@ -1395,7 +1435,7 @@ move-result v1 - const/4 v3, 0x0 + const/4 v2, 0x0 if-eqz v1, :cond_0 @@ -1408,48 +1448,46 @@ :cond_0 move-object v1, p0 - move-object v4, v3 + move-object v4, v2 :goto_0 - invoke-static {p3, v3, p1, p0}, Lcom/discord/utilities/textprocessing/MessageUtils;->getNickOrUsernames(Lcom/discord/models/domain/ModelMessage;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map; + invoke-static {p3, v2, p1, p0}, Lcom/discord/utilities/textprocessing/MessageUtils;->getNickOrUsernames(Lcom/discord/models/domain/ModelMessage;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;)Ljava/util/Map; move-result-object v5 - new-instance v9, Ljava/util/ArrayList; + new-instance v10, Ljava/util/ArrayList; - invoke-direct {v9}, Ljava/util/ArrayList;->()V + invoke-direct {v10}, Ljava/util/ArrayList;->()V - new-instance v10, Lcom/discord/widgets/chat/list/entries/MessageEntry; + new-instance v11, Lcom/discord/widgets/chat/list/entries/MessageEntry; - move-object v0, v10 + move-object v0, v11 move-object v1, p3 - move-object v3, v4 + move-object/from16 v2, p4 - move-object v4, v5 + move/from16 v6, p6 - move/from16 v5, p5 + move/from16 v7, p5 - move v6, p4 + move/from16 v8, p8 - move/from16 v7, p7 + invoke-direct/range {v0 .. v8}, Lcom/discord/widgets/chat/list/entries/MessageEntry;->(Lcom/discord/models/domain/ModelMessage;Lcom/discord/stores/StoreMessageState$State;Lcom/discord/models/domain/ModelGuildMember$Computed;Ljava/util/Map;Ljava/util/Map;ZZZ)V - invoke-direct/range {v0 .. v7}, Lcom/discord/widgets/chat/list/entries/MessageEntry;->(Lcom/discord/models/domain/ModelMessage;Lcom/discord/models/domain/ModelGuildMember$Computed;Ljava/util/Map;Ljava/util/Map;ZZZ)V + invoke-interface {v10, v11}, Ljava/util/List;->add(Ljava/lang/Object;)Z - invoke-interface {v9, v10}, Ljava/util/List;->add(Ljava/lang/Object;)Z + move/from16 v0, p5 - move v0, p4 + move/from16 v1, p8 - move/from16 v1, p7 + move-wide/from16 v2, p9 - move-wide/from16 v2, p8 - - invoke-static {p3, p4, v1, v2, v3}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->createEmbedItems(Lcom/discord/models/domain/ModelMessage;ZZJ)Ljava/util/List; + invoke-static {p3, v0, v1, v2, v3}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->createEmbedItems(Lcom/discord/models/domain/ModelMessage;ZZJ)Ljava/util/List; move-result-object v0 - invoke-interface {v9, v0}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z + invoke-interface {v10, v0}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z invoke-static {p3}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->getGameInviteItem(Lcom/discord/models/domain/ModelMessage;)Lcom/discord/widgets/chat/list/entries/ChatListEntry; @@ -1457,7 +1495,7 @@ if-eqz v0, :cond_1 - invoke-interface {v9, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z + invoke-interface {v10, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z :cond_1 invoke-static {p3}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->getListenTogetherItem(Lcom/discord/models/domain/ModelMessage;)Lcom/discord/widgets/chat/list/entries/ChatListEntry; @@ -1466,7 +1504,7 @@ if-eqz v0, :cond_2 - invoke-interface {v9, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z + invoke-interface {v10, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z :cond_2 invoke-static {p3}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->getInviteItems(Lcom/discord/models/domain/ModelMessage;)Ljava/util/Collection; @@ -1481,7 +1519,7 @@ if-nez v1, :cond_3 - invoke-interface {v9, v0}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z + invoke-interface {v10, v0}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z :cond_3 invoke-static {p3}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->getGiftItems(Lcom/discord/models/domain/ModelMessage;)Ljava/util/Collection; @@ -1496,7 +1534,7 @@ if-nez v1, :cond_4 - invoke-interface {v9, v0}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z + invoke-interface {v10, v0}, Ljava/util/List;->addAll(Ljava/util/Collection;)Z :cond_4 invoke-virtual {p3}, Lcom/discord/models/domain/ModelMessage;->getReactions()Ljava/util/Map; @@ -1511,11 +1549,11 @@ new-instance v0, Lcom/discord/widgets/chat/list/entries/ReactionsEntry; - move/from16 v1, p6 + move/from16 v1, p7 invoke-direct {v0, p3, v1}, Lcom/discord/widgets/chat/list/entries/ReactionsEntry;->(Lcom/discord/models/domain/ModelMessage;Z)V - invoke-interface {v9, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z + invoke-interface {v10, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z :cond_5 invoke-virtual {p3}, Lcom/discord/models/domain/ModelMessage;->isHasLocalUploads()Z @@ -1530,14 +1568,14 @@ move-result-object v1 - move-wide/from16 v2, p10 + move-wide/from16 v2, p11 invoke-direct {v0, v1, v2, v3}, Lcom/discord/widgets/chat/list/entries/UploadProgressEntry;->(Ljava/lang/String;J)V - invoke-interface {v9, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z + invoke-interface {v10, v0}, Ljava/util/List;->add(Ljava/lang/Object;)Z :cond_6 - return-object v9 + return-object v10 .end method .method static synthetic lambda$get$0(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;)Ljava/util/Map; @@ -1560,20 +1598,20 @@ return-object p0 .end method -.method static synthetic lambda$get$1(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/List;Ljava/util/List;Ljava/util/Map;Lcom/discord/models/application/ModelAppMessage$Unread;Ljava/util/Map;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages; - .locals 11 +.method static synthetic lambda$get$1(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/List;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/application/ModelAppMessage$Unread;Ljava/util/Map;Ljava/lang/Boolean;Ljava/lang/Boolean;)Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages; + .locals 12 - new-instance v10, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages; - - invoke-virtual/range {p7 .. p7}, Ljava/lang/Boolean;->booleanValue()Z - - move-result v8 + new-instance v11, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages; invoke-virtual/range {p8 .. p8}, Ljava/lang/Boolean;->booleanValue()Z move-result v9 - move-object v0, v10 + invoke-virtual/range {p9 .. p9}, Ljava/lang/Boolean;->booleanValue()Z + + move-result v10 + + move-object v0, v11 move-object v1, p0 @@ -1583,15 +1621,17 @@ move-object v4, p3 - move-object v5, p4 + move-object/from16 v5, p4 move-object/from16 v6, p5 move-object/from16 v7, p6 - invoke-direct/range {v0 .. v9}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/List;Ljava/util/List;Ljava/util/Map;Lcom/discord/models/application/ModelAppMessage$Unread;Ljava/util/Map;ZZ)V + move-object/from16 v8, p7 - return-object v10 + invoke-direct/range {v0 .. v10}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->(Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/List;Ljava/util/List;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/application/ModelAppMessage$Unread;Ljava/util/Map;ZZ)V + + return-object v11 .end method .method private shouldConcatMessage(ILcom/discord/models/domain/ModelMessage;Lcom/discord/models/domain/ModelMessage;)Z diff --git a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$2.smali b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$2.smali index ce49bff1c6..7bde757ed5 100644 --- a/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$2.smali +++ b/com.discord/smali/com/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$2.smali @@ -149,46 +149,50 @@ move-result v3 - if-eqz v3, :cond_5 + if-eqz v3, :cond_6 - if-eqz v1, :cond_5 + if-eqz v1, :cond_6 - if-eqz v4, :cond_5 + if-eqz v4, :cond_6 - if-eqz v17, :cond_5 + if-eqz v17, :cond_6 if-nez v12, :cond_4 - if-nez v11, :cond_5 + if-nez v11, :cond_6 :cond_4 - new-instance v3, Lcom/discord/widgets/chat/list/entries/GuildWelcomeEntry; + const-string v3, "me" - const-string v4, "me" - - invoke-static {v2, 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 invoke-virtual/range {p2 .. p2}, Lcom/discord/models/domain/ModelUser;->getUsername()Ljava/lang/String; - move-result-object v9 + move-result-object v2 - const-string v2, "me.username" + if-nez v2, :cond_5 - invoke-static {v9, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + const-string v2, "" + + :cond_5 + move-object v9, v2 invoke-virtual/range {p1 .. p1}, Lcom/discord/models/domain/ModelGuild;->getId()J move-result-wide v13 - move-object v8, v3 + new-instance v1, Lcom/discord/widgets/chat/list/entries/GuildWelcomeEntry; + + move-object v8, v1 invoke-direct/range {v8 .. v14}, Lcom/discord/widgets/chat/list/entries/GuildWelcomeEntry;->(Ljava/lang/String;ZZZJ)V - check-cast v3, Lcom/discord/widgets/chat/list/entries/ChatListEntry; + :goto_4 + check-cast v1, Lcom/discord/widgets/chat/list/entries/ChatListEntry; - return-object v3 + return-object v1 - :cond_5 + :cond_6 new-instance v1, Lcom/discord/widgets/chat/list/entries/StartOfChatEntry; iget-object v2, v0, Lcom/discord/widgets/chat/list/model/WidgetChatListModelTop$Companion$getWelcomeEntry$2;->$channel:Lcom/discord/models/domain/ModelChannel; @@ -217,9 +221,7 @@ invoke-direct/range {v12 .. v17}, Lcom/discord/widgets/chat/list/entries/StartOfChatEntry;->(JLjava/lang/String;IZ)V - check-cast v1, Lcom/discord/widgets/chat/list/entries/ChatListEntry; - - return-object v1 + goto :goto_4 .end method .method public final bridge synthetic call(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/widgets/chat/manage_reactions/WidgetManageReactions.smali b/com.discord/smali/com/discord/widgets/chat/manage_reactions/WidgetManageReactions.smali index 60a3d3fdfe..ff1f3d48d1 100644 --- a/com.discord/smali/com/discord/widgets/chat/manage_reactions/WidgetManageReactions.smali +++ b/com.discord/smali/com/discord/widgets/chat/manage_reactions/WidgetManageReactions.smali @@ -207,7 +207,7 @@ invoke-virtual {p0}, Lcom/discord/widgets/chat/manage_reactions/WidgetManageReactions;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f120bd8 + const p1, 0x7f120bd9 invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/manage_reactions/WidgetManageReactions;->setActionBarTitle(I)Lkotlin/Unit; 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 996ff00221..95e49b0e4d 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 @@ -98,7 +98,7 @@ .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; - .locals 17 + .locals 18 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -128,11 +128,11 @@ move-object/from16 v1, p1 - move-object/from16 v14, p2 + move-object/from16 v15, p2 if-eqz v0, :cond_7 - if-eqz v14, :cond_7 + if-eqz v15, :cond_7 if-eqz p3, :cond_7 @@ -172,12 +172,12 @@ if-eqz v1, :cond_3 - const v1, 0x7f1209ff + const v1, 0x7f120a00 goto :goto_1 :cond_3 - const v1, 0x7f1209fe + const v1, 0x7f1209ff :goto_1 invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -201,16 +201,16 @@ const/4 v2, 0x0 - const/4 v12, 0x0 + const/4 v13, 0x0 :goto_2 invoke-interface/range {p1 .. p1}, Ljava/util/List;->size()I move-result v2 - if-ge v12, v2, :cond_1 + if-ge v13, v2, :cond_1 - invoke-interface {v1, v12}, Ljava/util/List;->get(I)Ljava/lang/Object; + invoke-interface {v1, v13}, Ljava/util/List;->get(I)Ljava/lang/Object; move-result-object v2 @@ -228,25 +228,27 @@ const/4 v8, 0x0 + const/4 v9, 0x0 + invoke-virtual/range {p4 .. p4}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J - move-result-wide v10 + move-result-wide v11 invoke-virtual/range {p4 .. p4}, Lcom/discord/models/domain/ModelChannel;->getId()J - move-result-wide v15 + move-result-wide v16 move-object/from16 v3, p2 move-object/from16 v4, p3 - move/from16 v9, p8 + move/from16 v10, p8 - move v1, v12 + move v1, v13 - move-wide v12, v15 + move-wide/from16 v13, v16 - invoke-static/range {v2 .. v13}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->getMessageItems(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelMessage;ZZZZJJ)Ljava/util/List; + invoke-static/range {v2 .. v14}, 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;ZZZZJJ)Ljava/util/List; move-result-object v2 @@ -267,7 +269,7 @@ invoke-interface {v0, v2}, Ljava/util/List;->add(Ljava/lang/Object;)Z :cond_5 - add-int/lit8 v12, v1, 0x1 + add-int/lit8 v13, v1, 0x1 move-object/from16 v1, p1 @@ -278,7 +280,7 @@ move-result-object v0 - invoke-interface {v14, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v15, v0}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; move-result-object v0 @@ -290,7 +292,7 @@ move-result-object v1 - invoke-interface {v14, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; + invoke-interface {v15, v1}, Ljava/util/Map;->get(Ljava/lang/Object;)Ljava/lang/Object; move-result-object v1 diff --git a/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.smali b/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.smali index 35f1b29e60..96ec46e74c 100644 --- a/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.smali +++ b/com.discord/smali/com/discord/widgets/chat/pins/WidgetChannelPinnedMessages.smali @@ -180,7 +180,7 @@ invoke-virtual {p0}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f120b27 + const p1, 0x7f120b28 invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/pins/WidgetChannelPinnedMessages;->setActionBarTitle(I)Lkotlin/Unit; 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 e34852077d..766a3cd5e9 100644 --- a/com.discord/smali/com/discord/widgets/chat/typing/WidgetChatTypingUsers.smali +++ b/com.discord/smali/com/discord/widgets/chat/typing/WidgetChatTypingUsers.smali @@ -372,7 +372,7 @@ if-nez p3, :cond_1 - const p1, 0x7f120319 + const p1, 0x7f12031a invoke-virtual {p0, p1}, Lcom/discord/widgets/chat/typing/WidgetChatTypingUsers;->getString(I)Ljava/lang/String; @@ -439,7 +439,7 @@ packed-switch v0, :pswitch_data_0 - const p2, 0x7f120d2b + const p2, 0x7f120d2c invoke-virtual {p1, p2}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; @@ -450,7 +450,7 @@ :pswitch_0 sget-object v0, Lkotlin/jvm/internal/v;->bQh:Lkotlin/jvm/internal/v; - const v0, 0x7f120df1 + const v0, 0x7f120df2 invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; @@ -499,7 +499,7 @@ :pswitch_1 sget-object v0, Lkotlin/jvm/internal/v;->bQh:Lkotlin/jvm/internal/v; - const v0, 0x7f120e5f + const v0, 0x7f120e60 invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; @@ -540,7 +540,7 @@ :pswitch_2 sget-object v0, Lkotlin/jvm/internal/v;->bQh:Lkotlin/jvm/internal/v; - const v0, 0x7f120a87 + const v0, 0x7f120a88 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 62fe2168ee..e7380c2015 100644 --- a/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging.smali +++ b/com.discord/smali/com/discord/widgets/debugging/WidgetDebugging.smali @@ -331,7 +331,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, 0x7f120401 + const p1, 0x7f120402 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 56b7871ca1..6cb308bbb9 100644 --- a/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali +++ b/com.discord/smali/com/discord/widgets/debugging/WidgetFatalCrash.smali @@ -500,7 +500,7 @@ aput-object v2, v1, v3 - const v2, 0x7f1203bb + const v2, 0x7f1203bc invoke-virtual {p0, v2, v1}, Lcom/discord/widgets/debugging/WidgetFatalCrash;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -526,7 +526,7 @@ const-string v4, "INTENT_EXTRA_CRASH_SOURCE" - const v5, 0x7f120d76 + const v5, 0x7f120d77 invoke-virtual {p0, v5}, Lcom/discord/widgets/debugging/WidgetFatalCrash;->getString(I)Ljava/lang/String; @@ -538,7 +538,7 @@ aput-object v4, v2, v3 - const v4, 0x7f1203ba + const v4, 0x7f1203bb invoke-virtual {p0, v4, v2}, Lcom/discord/widgets/debugging/WidgetFatalCrash;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -562,7 +562,7 @@ aput-object p1, v2, v3 - const p1, 0x7f1203bc + const p1, 0x7f1203bd invoke-virtual {p0, p1, v2}, Lcom/discord/widgets/debugging/WidgetFatalCrash;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -578,11 +578,11 @@ new-array v1, v0, [Ljava/lang/Object; - const-string v2, "8.2.3" + const-string v2, "8.2.4" aput-object v2, v1, v3 - const v2, 0x7f1203b4 + const v2, 0x7f1203b5 invoke-virtual {p0, v2, v1}, Lcom/discord/widgets/debugging/WidgetFatalCrash;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -606,7 +606,7 @@ aput-object v2, v1, v3 - const v2, 0x7f1203b8 + const v2, 0x7f1203b9 invoke-virtual {p0, v2, v1}, Lcom/discord/widgets/debugging/WidgetFatalCrash;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -644,7 +644,7 @@ aput-object v1, v0, v3 - const v1, 0x7f1203b7 + const v1, 0x7f1203b8 invoke-virtual {p0, v1, v0}, Lcom/discord/widgets/debugging/WidgetFatalCrash;->getString(I[Ljava/lang/Object;)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali index e0df12c015..886531a5c3 100644 --- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali +++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAdd.smali @@ -544,7 +544,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, 0x7f1205ab + const p1, 0x7f1205ac invoke-virtual {p0, p1}, Lcom/discord/widgets/friends/WidgetFriendsAdd;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder.smali index 6b9ce184d4..bafa29491a 100644 --- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder.smali +++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsAddUserAdapter$UserViewHolder.smali @@ -460,7 +460,7 @@ move-result-object p1 - const p2, 0x7f120895 + const p2, 0x7f120896 goto :goto_4 @@ -475,7 +475,7 @@ move-result-object p1 - const p2, 0x7f120961 + const p2, 0x7f120962 goto :goto_4 diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion.smali index d99500d028..0512a99f3d 100644 --- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion.smali +++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList$Model$Companion.smali @@ -234,7 +234,7 @@ } .end annotation - invoke-static {p1}, Lkotlin/a/ab;->r(Ljava/util/Map;)Lkotlin/sequences/Sequence; + invoke-static {p1}, Lkotlin/a/ab;->t(Ljava/util/Map;)Lkotlin/sequences/Sequence; move-result-object p1 diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali index 5c0bf1967f..8148448654 100644 --- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali +++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsList.smali @@ -97,11 +97,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, 0x7f1205ae + const v2, 0x7f1205af if-eq p2, v2, :cond_1 - const v2, 0x7f120d85 + const v2, 0x7f120d86 if-eq p2, v2, :cond_0 @@ -159,10 +159,6 @@ :goto_0 invoke-static {v0, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->setVisibilityBy(Landroid/view/View;Z)V - const v0, 0x7f1205ac - - invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V - const v0, 0x7f1205ad invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V @@ -175,7 +171,11 @@ invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V - const v0, 0x7f12029b + const v0, 0x7f1205b0 + + invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V + + const v0, 0x7f12029c invoke-direct {p0, p1, v0}, Lcom/discord/widgets/friends/WidgetFriendsList;->addTab(Lcom/google/android/material/tabs/TabLayout;I)V diff --git a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser.smali b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser.smali index b2f41909c7..f0be69fb0f 100644 --- a/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser.smali +++ b/com.discord/smali/com/discord/widgets/friends/WidgetFriendsListAdapter$ItemUser.smali @@ -731,7 +731,7 @@ move-result-object v1 - const v5, 0x7f120a96 + const v5, 0x7f120a97 goto :goto_2 @@ -748,7 +748,7 @@ move-result-object v1 - const v5, 0x7f120824 + const v5, 0x7f120825 :goto_2 invoke-virtual {v1, v5}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet.smali b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet.smali index 59b27b6509..8f2d25fc20 100644 --- a/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet.smali +++ b/com.discord/smali/com/discord/widgets/guilds/actions/WidgetGuildActionsSheet.smali @@ -927,7 +927,7 @@ invoke-virtual {p0, v1, v4}, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet;->setOnClickAndDismissListener(Landroid/view/View;Lkotlin/jvm/functions/Function1;)V - const v1, 0x7f120cf4 + const v1, 0x7f120cf5 new-array v2, v2, [Ljava/lang/Object; @@ -985,12 +985,12 @@ if-eqz p1, :cond_2 - const p1, 0x7f120d39 + const p1, 0x7f120d3a goto :goto_2 :cond_2 - const p1, 0x7f120795 + const p1, 0x7f120796 :goto_2 invoke-virtual {p0, p1}, Lcom/discord/widgets/guilds/actions/WidgetGuildActionsSheet;->getString(I)Ljava/lang/String; 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 b5baf107d2..faa2ab3b63 100644 --- a/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate.smali +++ b/com.discord/smali/com/discord/widgets/guilds/create/WidgetGuildCreate.smali @@ -310,7 +310,7 @@ .method private getCommunityGuidelines()Ljava/lang/CharSequence; .locals 4 - const v0, 0x7f1203cb + const v0, 0x7f1203cc invoke-virtual {p0, v0}, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->getString(I)Ljava/lang/String; @@ -424,7 +424,7 @@ if-eqz v1, :cond_0 - const p1, 0x7f120ced + const p1, 0x7f120cee invoke-static {p0, p1}, Lcom/discord/app/f;->b(Landroidx/fragment/app/Fragment;I)V @@ -437,7 +437,7 @@ if-eqz v1, :cond_1 - const p1, 0x7f120e77 + const p1, 0x7f120e78 invoke-static {p0, p1}, Lcom/discord/app/f;->b(Landroidx/fragment/app/Fragment;I)V @@ -542,9 +542,9 @@ .method public static synthetic lambda$null$3(Lcom/discord/widgets/guilds/create/WidgetGuildCreate;)V .locals 2 - const v0, 0x7f120329 + const v0, 0x7f12032a - const v1, 0x7f120e68 + const v1, 0x7f120e69 invoke-static {p0, v0, v1}, Lcom/miguelgaeta/media_picker/MediaPicker;->openMediaChooser(Lcom/miguelgaeta/media_picker/MediaPicker$Provider;II)V @@ -674,7 +674,7 @@ invoke-virtual {p0}, Lcom/discord/widgets/guilds/create/WidgetGuildCreate;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f1203c7 + const p1, 0x7f1203c8 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/ViewInviteSettingsSheet.smali b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.smali index 7b8842a148..06c69d981d 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/ViewInviteSettingsSheet.smali @@ -978,7 +978,7 @@ return-object p1 :cond_5 - const p1, 0x7f120a07 + const p1, 0x7f120a08 invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite.smali index 9d2d67e59b..40da9c1412 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInvite.smali @@ -388,7 +388,7 @@ aput-object p1, v0, v1 - const p1, 0x7f1208a6 + const p1, 0x7f1208a7 invoke-virtual {p0, p1, v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInvite;->getString(I[Ljava/lang/Object;)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.smali b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.smali index 548da743aa..d9b274ca79 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetGuildInviteShare.smali @@ -1088,7 +1088,7 @@ check-cast p2, Ljava/lang/CharSequence; - const v0, 0x7f12089b + const v0, 0x7f12089c invoke-static {p1, p2, v0}, Lcom/discord/app/f;->b(Landroid/content/Context;Ljava/lang/CharSequence;I)V @@ -1576,7 +1576,7 @@ invoke-static {p1, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v1, 0x7f120e05 + const v1, 0x7f120e06 invoke-virtual {p0, v1}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->getString(I)Ljava/lang/String; @@ -1791,7 +1791,7 @@ :cond_1 invoke-static {p0, v0, v3, v2, v3}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar; - const v0, 0x7f1208ad + const v0, 0x7f1208ae invoke-virtual {p0, v0}, Lcom/discord/widgets/guilds/invite/WidgetGuildInviteShare;->setActionBarTitle(I)Lkotlin/Unit; @@ -1832,7 +1832,7 @@ invoke-static {v0, v4}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v4, 0x7f040377 + const v4, 0x7f040379 invoke-static {v0, v4, v1, v2, v3}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/content/Context;IIILjava/lang/Object;)I 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 55042f8297..ae7c6b657b 100644 --- a/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo.smali +++ b/com.discord/smali/com/discord/widgets/guilds/invite/WidgetInviteInfo.smali @@ -964,7 +964,7 @@ if-nez p1, :cond_0 - const p1, 0x7f12084e + const p1, 0x7f12084f invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String; @@ -982,7 +982,7 @@ return-object p1 :cond_0 - const v0, 0x7f12020b + const v0, 0x7f12020c const/4 v1, 0x1 @@ -1004,7 +1004,7 @@ if-eqz p2, :cond_0 - const p2, 0x7f12020b + const p2, 0x7f12020c const/4 v0, 0x1 @@ -1030,7 +1030,7 @@ return-object p1 :cond_0 - const p1, 0x7f120850 + const p1, 0x7f120851 invoke-static {p0, p1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I)Ljava/lang/String; @@ -1092,7 +1092,7 @@ aput-object p1, v1, v4 - const p1, 0x7f12083f + const p1, 0x7f120840 invoke-static {p0, p1, v1}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String; @@ -1124,7 +1124,7 @@ aput-object p1, v0, v1 - const p1, 0x7f12083e + const p1, 0x7f12083f invoke-static {p0, p1, v0}, Lcom/discord/utilities/view/extensions/ViewExtensions;->getString(Landroid/view/View;I[Ljava/lang/Object;)Ljava/lang/String; @@ -1428,7 +1428,7 @@ move-result-object v0 - const v1, 0x7f120838 + const v1, 0x7f120839 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -1436,7 +1436,7 @@ move-result-object v0 - const v1, 0x7f120866 + const v1, 0x7f120867 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V diff --git a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton.smali b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton.smali index c1529984fa..74244c449d 100644 --- a/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton.smali +++ b/com.discord/smali/com/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton.smali @@ -113,7 +113,7 @@ invoke-static {p0, v0, p1, v1, p1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar; - const v0, 0x7f1208c3 + const v0, 0x7f1208c4 invoke-virtual {p0, v0}, Lcom/discord/widgets/guilds/join/WidgetGuildJoin$ToolbarButton;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$Item.smali b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$Item.smali index 229acd0003..3c9e55ae7a 100644 --- a/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$Item.smali +++ b/com.discord/smali/com/discord/widgets/guilds/list/WidgetGuildsListAdapter$Item.smali @@ -235,7 +235,7 @@ if-eqz p3, :cond_6 - const p2, 0x7f120799 + const p2, 0x7f12079a invoke-virtual {p3, p2}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -296,7 +296,7 @@ invoke-virtual {p1, v2}, Landroid/widget/TextView;->setBackgroundResource(I)V - const v2, 0x7f120975 + const v2, 0x7f120976 const/4 v3, 0x1 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 2aedf49c04..b59b626e5e 100644 --- a/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement.smali +++ b/com.discord/smali/com/discord/widgets/guilds/management/WidgetGuildManagement.smali @@ -300,7 +300,7 @@ invoke-virtual {p0}, Lcom/discord/widgets/guilds/management/WidgetGuildManagement;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f120cfb + const p1, 0x7f120cfc 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 ce2a47265f..38ad7dc6c0 100644 --- a/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager.smali +++ b/com.discord/smali/com/discord/widgets/main/WidgetMainHeaderManager.smali @@ -127,12 +127,12 @@ goto :goto_1 :pswitch_0 - const p1, 0x7f12031e + const p1, 0x7f12031f goto :goto_0 :pswitch_1 - const p1, 0x7f1205a0 + const p1, 0x7f1205a1 :goto_0 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 f5eccd58bc..b5084d800b 100644 --- a/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNoChannels.smali +++ b/com.discord/smali/com/discord/widgets/main/WidgetMainPanelNoChannels.smali @@ -107,7 +107,7 @@ move-result-object v0 - const v1, 0x7f12031e + const v1, 0x7f12031f invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -126,7 +126,7 @@ move-result-object v0 - const v1, 0x7f12031d + const v1, 0x7f12031e invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog.smali b/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog.smali index 4b32299b47..b3bed04315 100644 --- a/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog.smali +++ b/com.discord/smali/com/discord/widgets/main/WidgetMainSurveyDialog.smali @@ -393,7 +393,7 @@ move-result-object p1 - const v0, 0x7f120a39 + const v0, 0x7f120a3a invoke-virtual {p0, v0}, Lcom/discord/widgets/main/WidgetMainSurveyDialog;->getString(I)Ljava/lang/String; @@ -407,7 +407,7 @@ move-result-object p1 - const v0, 0x7f120a3a + const v0, 0x7f120a3b invoke-virtual {p0, v0}, Lcom/discord/widgets/main/WidgetMainSurveyDialog;->getString(I)Ljava/lang/String; @@ -421,7 +421,7 @@ move-result-object p1 - const v0, 0x7f120a06 + const v0, 0x7f120a07 invoke-virtual {p0, v0}, Lcom/discord/widgets/main/WidgetMainSurveyDialog;->getString(I)Ljava/lang/String; @@ -447,7 +447,7 @@ move-result-object p1 - const v0, 0x7f120a85 + const v0, 0x7f120a86 invoke-virtual {p0, v0}, Lcom/discord/widgets/main/WidgetMainSurveyDialog;->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 a0908e8e43..df8c850b02 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 @@ -90,7 +90,7 @@ iget-object v1, v1, Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/media/WidgetMedia; - const v2, 0x7f120468 + const v2, 0x7f120469 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 2ac7a7cbce..4771c67e4c 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 @@ -90,7 +90,7 @@ iget-object v0, v0, Lcom/discord/widgets/media/WidgetMedia$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/media/WidgetMedia; - const v1, 0x7f120467 + const v1, 0x7f120468 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 f54fa828fe..2083ef16e8 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, 0x7f120f72 + const v4, 0x7f120f73 invoke-virtual {p0, v4}, Lcom/discord/widgets/media/WidgetMedia;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Companion$getMessageRenderContext$1.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Companion$getMessageRenderContext$1.smali index 7ee98f2737..7b115e49d1 100644 --- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Companion$getMessageRenderContext$1.smali +++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel$Companion$getMessageRenderContext$1.smali @@ -59,7 +59,7 @@ # virtual methods .method public final call(Lcom/discord/models/domain/ModelUser;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;)Lcom/discord/utilities/textprocessing/MessageRenderContext; - .locals 13 + .locals 14 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -83,7 +83,7 @@ move-object v0, p0 - new-instance v12, Lcom/discord/utilities/textprocessing/MessageRenderContext; + new-instance v13, Lcom/discord/utilities/textprocessing/MessageRenderContext; iget-object v2, v0, Lcom/discord/widgets/notice/WidgetNoticePopupChannel$Companion$getMessageRenderContext$1;->$context:Landroid/content/Context; @@ -111,7 +111,7 @@ const/4 v10, 0x0 - move-object v6, p2 + move-object/from16 v6, p2 invoke-static/range {v5 .. v10}, Lcom/discord/utilities/textprocessing/MessageUtils;->getNickOrUsernames$default(Lcom/discord/models/domain/ModelMessage;Lcom/discord/models/domain/ModelChannel;Ljava/util/Map;Ljava/util/Map;ILjava/lang/Object;)Ljava/util/Map; @@ -121,19 +121,19 @@ const/4 v9, 0x0 - const/16 v10, 0x40 + const/16 v11, 0xc0 - const/4 v11, 0x0 + const/4 v12, 0x0 - move-object v1, v12 + move-object v1, v13 move-object/from16 v7, p4 move-object/from16 v8, p5 - invoke-direct/range {v1 .. v11}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->(Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;IILkotlin/jvm/internal/DefaultConstructorMarker;)V + invoke-direct/range {v1 .. v12}, Lcom/discord/utilities/textprocessing/MessageRenderContext;->(Landroid/content/Context;JZLjava/util/Map;Ljava/util/Map;Ljava/util/Map;ILkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V - return-object v12 + return-object v13 .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; diff --git a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel.smali b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel.smali index 2d75905722..b755c55c23 100644 --- a/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel.smali +++ b/com.discord/smali/com/discord/widgets/notice/WidgetNoticePopupChannel.smali @@ -330,7 +330,7 @@ check-cast v1, Landroid/view/View; - const v5, 0x7f040383 + const v5, 0x7f040385 invoke-static {v1, v5, v4, v3, v2}, Lcom/discord/utilities/drawable/DrawableCompat;->getThemedDrawableRes$default(Landroid/view/View;IIILjava/lang/Object;)I diff --git a/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.smali b/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.smali index 532c80069d..bc0fa5c85b 100644 --- a/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.smali +++ b/com.discord/smali/com/discord/widgets/nux/WidgetNuxPostRegistrationJoin$onViewBound$2.smali @@ -68,12 +68,12 @@ :goto_1 if-eqz p1, :cond_2 - const p1, 0x7f120a7b + const p1, 0x7f120a7c goto :goto_2 :cond_2 - const p1, 0x7f1208be + const p1, 0x7f1208bf :goto_2 invoke-virtual {v0, p1}, Landroidx/appcompat/widget/AppCompatButton;->setText(I)V diff --git a/com.discord/smali/com/discord/widgets/search/WidgetSearch$Model.smali b/com.discord/smali/com/discord/widgets/search/WidgetSearch$Model.smali index 457ea9529b..e29b75372e 100644 --- a/com.discord/smali/com/discord/widgets/search/WidgetSearch$Model.smali +++ b/com.discord/smali/com/discord/widgets/search/WidgetSearch$Model.smali @@ -241,7 +241,7 @@ aput-object p1, v0, v1 - const p1, 0x7f120cbb + const p1, 0x7f120cbc invoke-virtual {p0, p1, v0}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -276,7 +276,7 @@ goto :goto_1 :cond_0 - const p1, 0x7f120cbb + const p1, 0x7f120cbc new-array v2, v2, [Ljava/lang/Object; @@ -290,7 +290,7 @@ return-object p0 :cond_1 - const p1, 0x7f120c9e + const p1, 0x7f120c9f 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 844cc796f1..110c723c19 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 @@ -88,7 +88,7 @@ .end method .method private static create(Lcom/discord/utilities/search/network/state/SearchState;Ljava/lang/Long;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Landroid/content/Context;Z)Lcom/discord/widgets/search/results/WidgetSearchResults$Model; - .locals 26 + .locals 27 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -312,9 +312,9 @@ invoke-virtual {v7}, Lcom/discord/models/domain/ModelMessage;->getChannelId()J - move-result-wide v24 + move-result-wide v25 - invoke-static/range {v24 .. v25}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static/range {v25 .. v26}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; move-result-object v11 @@ -328,9 +328,9 @@ invoke-virtual {v11}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J - move-result-wide v22 + move-result-wide v23 - invoke-static/range {v22 .. v23}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static/range {v23 .. v24}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; move-result-object v12 @@ -361,7 +361,7 @@ invoke-interface {v13, v12}, Ljava/util/Set;->addAll(Ljava/util/Collection;)Z :cond_8 - invoke-static/range {v22 .. v23}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static/range {v23 .. v24}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; move-result-object v12 @@ -377,7 +377,7 @@ invoke-interface {v8, v12}, Ljava/util/List;->add(Ljava/lang/Object;)Z - invoke-static/range {v24 .. v25}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static/range {v25 .. v26}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; move-result-object v12 @@ -387,7 +387,7 @@ if-eqz v12, :cond_9 - invoke-static/range {v24 .. v25}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static/range {v25 .. v26}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; move-result-object v12 @@ -410,7 +410,7 @@ goto :goto_4 :goto_5 - invoke-static/range {v22 .. v23}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static/range {v23 .. v24}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; move-result-object v12 @@ -420,7 +420,7 @@ if-eqz v12, :cond_a - invoke-static/range {v22 .. v23}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; + invoke-static/range {v23 .. v24}, Ljava/lang/Long;->valueOf(J)Ljava/lang/Long; move-result-object v12 @@ -453,11 +453,13 @@ const/16 v20, 0x0 + const/16 v21, 0x0 + move-object/from16 v17, v7 - move/from16 v21, p8 + move/from16 v22, p8 - invoke-static/range {v14 .. v25}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->getMessageItems(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelMessage;ZZZZJJ)Ljava/util/List; + invoke-static/range {v14 .. v26}, 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;ZZZZJJ)Ljava/util/List; move-result-object v7 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 a6af2631b1..6866f2f1e6 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 @@ -70,27 +70,27 @@ packed-switch p1, :pswitch_data_0 - const p1, 0x7f120c37 + const p1, 0x7f120c38 return p1 :pswitch_0 - const p1, 0x7f120c95 + const p1, 0x7f120c96 return p1 :pswitch_1 - const p1, 0x7f120c8e + const p1, 0x7f120c8f return p1 :pswitch_2 - const p1, 0x7f120c97 + const p1, 0x7f120c98 return p1 :pswitch_3 - const p1, 0x7f120c8d + const p1, 0x7f120c8e return p1 @@ -120,27 +120,27 @@ packed-switch p1, :pswitch_data_0 - const p1, 0x7f120c37 + const p1, 0x7f120c38 return p1 :pswitch_0 - const p1, 0x7f120ca7 + const p1, 0x7f120ca8 return p1 :pswitch_1 - const p1, 0x7f120ca6 + const p1, 0x7f120ca7 return p1 :pswitch_2 - const p1, 0x7f120ca9 + const p1, 0x7f120caa return p1 :pswitch_3 - const p1, 0x7f120ca5 + const p1, 0x7f120ca6 return p1 @@ -175,22 +175,22 @@ return p1 :pswitch_0 - const p1, 0x7f04037a + const p1, 0x7f04037c return p1 :pswitch_1 - const p1, 0x7f040379 + const p1, 0x7f04037b return p1 :pswitch_2 - const p1, 0x7f040380 + const p1, 0x7f040382 return p1 :pswitch_3 - const p1, 0x7f040381 + const p1, 0x7f040383 return p1 diff --git a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasViewHolder.smali b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasViewHolder.smali index b87d79c826..048ae756fc 100644 --- a/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasViewHolder.smali +++ b/com.discord/smali/com/discord/widgets/search/suggestions/WidgetSearchSuggestionsAdapter$HasViewHolder.smali @@ -79,32 +79,32 @@ packed-switch p0, :pswitch_data_0 - const p0, 0x7f04037f + const p0, 0x7f040381 return p0 :pswitch_0 - const p0, 0x7f04037c - - return p0 - - :pswitch_1 - const p0, 0x7f040382 - - return p0 - - :pswitch_2 const p0, 0x7f04037e return p0 + :pswitch_1 + const p0, 0x7f040384 + + return p0 + + :pswitch_2 + const p0, 0x7f040380 + + return p0 + :pswitch_3 - const p0, 0x7f040383 + const p0, 0x7f040385 return p0 :pswitch_4 - const p0, 0x7f040379 + const p0, 0x7f04037b return p0 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 72a410ff67..fa9e7a729e 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 @@ -70,32 +70,32 @@ throw v0 :pswitch_0 - const p1, 0x7f120caf - - return p1 - - :pswitch_1 const p1, 0x7f120cb0 return p1 + :pswitch_1 + const p1, 0x7f120cb1 + + return p1 + :pswitch_2 - const p1, 0x7f120cb4 + const p1, 0x7f120cb5 return p1 :pswitch_3 - const p1, 0x7f120cb3 + const p1, 0x7f120cb4 return p1 :pswitch_4 - const p1, 0x7f120cb7 + const p1, 0x7f120cb8 return p1 :pswitch_5 - const p1, 0x7f120cb8 + const p1, 0x7f120cb9 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 00602d3623..6ac35403dd 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 @@ -114,7 +114,7 @@ if-eqz v0, :cond_0 - const p1, 0x7f120546 + const p1, 0x7f120547 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 c5e947561f..1a3dbe21ec 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 @@ -158,7 +158,7 @@ if-eqz v0, :cond_1 - const p1, 0x7f120546 + const p1, 0x7f120547 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 d56a1702a0..e07e14000c 100644 --- a/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder.smali +++ b/com.discord/smali/com/discord/widgets/servers/NotificationsOverridesAdapter$ViewHolder.smali @@ -95,7 +95,7 @@ if-ne p1, v0, :cond_0 - const p1, 0x7f1204fe + const p1, 0x7f1204ff return p1 @@ -104,7 +104,7 @@ if-ne p1, v0, :cond_1 - const p1, 0x7f12054f + const p1, 0x7f120550 return p1 @@ -113,7 +113,7 @@ if-ne p1, v0, :cond_2 - const p1, 0x7f120549 + const p1, 0x7f12054a 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 6eb98600b2..b23e26bbbd 100644 --- a/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem.smali +++ b/com.discord/smali/com/discord/widgets/servers/SettingsChannelListAdapter$CategoryListItem.smali @@ -174,7 +174,7 @@ move-result-object p1 - const v0, 0x7f120e6f + const v0, 0x7f120e70 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 acf95bef87..2b851ff19b 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotifications.smali @@ -487,7 +487,7 @@ invoke-static {p0, v2, v1, v0, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar; - const v0, 0x7f120a52 + const v0, 0x7f120a53 invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerNotifications;->setActionBarTitle(I)Lkotlin/Unit; @@ -539,7 +539,7 @@ move-result-object v0 - const v1, 0x7f120544 + const v1, 0x7f120545 new-array v4, v3, [Ljava/lang/Object; @@ -613,7 +613,7 @@ move-result-object v0 - const v1, 0x7f120572 + const v1, 0x7f120573 invoke-virtual {p0, v1}, Lcom/discord/widgets/servers/WidgetServerNotifications;->getString(I)Ljava/lang/String; @@ -681,7 +681,7 @@ move-result-object v0 - const v1, 0x7f12054f + const v1, 0x7f120550 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$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBoundOrOnResume$1.smali index 1874b85117..73e7071659 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBoundOrOnResume$1.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector$onViewBoundOrOnResume$1.smali @@ -84,7 +84,7 @@ check-cast p1, Ljava/util/Collection; - invoke-static {p1}, Lkotlin/a/l;->j(Ljava/util/Collection;)Ljava/util/List; + invoke-static {p1}, Lkotlin/a/l;->k(Ljava/util/Collection;)Ljava/util/List; move-result-object p1 diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali index 296159d5f9..cbd2be20f7 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerNotificationsOverrideSelector.smali @@ -315,11 +315,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 v1, 0x7f120a4d + const v1, 0x7f120a4e invoke-virtual {p0, v1}, Lcom/discord/widgets/servers/WidgetServerNotificationsOverrideSelector;->setActionBarTitle(I)Lkotlin/Unit; - const v1, 0x7f120cd2 + const v1, 0x7f120cd3 const/4 v2, 0x2 @@ -329,7 +329,7 @@ move-result-object p1 - const v1, 0x7f120c88 + const v1, 0x7f120c89 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 32c91884b2..c0e8d37f60 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettings.smali @@ -1772,7 +1772,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, 0x7f120cf2 + const p1, 0x7f120cf3 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 c0329e3f5a..d203e8671b 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsBans.smali @@ -230,7 +230,7 @@ .method private final configureToolbar(Ljava/lang/String;)V .locals 3 - const v0, 0x7f120229 + const v0, 0x7f12022a invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsBans;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali index 4b8773f370..b26c6e4ebe 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsChannels.smali @@ -73,12 +73,12 @@ if-nez p2, :cond_0 - const v0, 0x7f12031c + const v0, 0x7f12031d goto :goto_0 :cond_0 - const v0, 0x7f120d3d + const v0, 0x7f120d3e :goto_0 invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsChannels;->setActionBarTitle(I)Lkotlin/Unit; @@ -396,7 +396,7 @@ .method public static synthetic lambda$reorderChannels$5(Lcom/discord/widgets/servers/WidgetServerSettingsChannels;Ljava/lang/Void;)V .locals 0 - const p1, 0x7f120311 + const p1, 0x7f120312 invoke-static {p0, p1}, Lcom/discord/app/f;->b(Landroidx/fragment/app/Fragment;I)V diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.smali index 3ec7abb80e..a6865f6839 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditIntegration.smali @@ -185,7 +185,7 @@ goto/16 :goto_4 :cond_0 - const v0, 0x7f120852 + const v0, 0x7f120853 invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsEditIntegration;->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 30691db65b..ec3b11b8c9 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMember.smali @@ -271,7 +271,7 @@ iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->kickButton:Landroid/widget/TextView; - const v6, 0x7f120915 + const v6, 0x7f120916 new-array v7, v2, [Ljava/lang/Object; @@ -318,7 +318,7 @@ iget-object v1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->banButton:Landroid/widget/TextView; - const v6, 0x7f120228 + const v6, 0x7f120229 new-array v2, v2, [Ljava/lang/Object; @@ -710,7 +710,7 @@ if-nez v0, :cond_0 - const v0, 0x7f1209da + const v0, 0x7f1209db const/4 v1, 0x1 @@ -727,7 +727,7 @@ goto :goto_0 :cond_0 - const p1, 0x7f1209db + const p1, 0x7f1209dc invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditMember;->getString(I)Ljava/lang/String; @@ -766,7 +766,7 @@ aput-object p1, v1, v2 - const p1, 0x7f1206d4 + const p1, 0x7f1206d5 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/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem.smali index 77739061fc..e6c30eca46 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem.smali @@ -139,7 +139,7 @@ iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsEditMemberRolesAdapter$RoleListItem;->roleCheckedSetting:Lcom/discord/views/CheckedSetting; - const p2, 0x7f120952 + const p2, 0x7f120953 invoke-virtual {p1, p2}, Lcom/discord/views/CheckedSetting;->A(I)V diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali index 057226b672..41fe101e25 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsEditRole.smali @@ -325,7 +325,7 @@ if-eqz p2, :cond_0 - const p1, 0x7f12051c + const p1, 0x7f12051d :goto_0 invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->getString(I)Ljava/lang/String; @@ -354,22 +354,22 @@ return-object p1 :pswitch_0 - const p1, 0x7f120e4d + const p1, 0x7f120e4e goto :goto_0 :pswitch_1 - const p1, 0x7f12078f + const p1, 0x7f120790 goto :goto_0 :pswitch_2 - const p1, 0x7f12078e + const p1, 0x7f12078f goto :goto_0 :pswitch_3 - const p1, 0x7f12078c + const p1, 0x7f12078d goto :goto_0 @@ -624,7 +624,7 @@ return-void :cond_0 - const p1, 0x7f12055f + const p1, 0x7f120560 invoke-static {p0, p1}, Lcom/discord/app/f;->b(Landroidx/fragment/app/Fragment;I)V @@ -1149,7 +1149,7 @@ invoke-virtual {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar; - const v2, 0x7f120561 + const v2, 0x7f120562 invoke-virtual {p0, v2}, Lcom/discord/widgets/servers/WidgetServerSettingsEditRole;->getString(I)Ljava/lang/String; @@ -1534,7 +1534,7 @@ aget v5, v5, v6 - const v6, 0x7f120790 + const v6, 0x7f120791 packed-switch v5, :pswitch_data_0 @@ -1589,7 +1589,7 @@ :cond_1 if-nez v4, :cond_2 - const v2, 0x7f12078d + const v2, 0x7f12078e invoke-virtual {v1, v2}, Lcom/discord/views/CheckedSetting;->A(I)V diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites.smali index 320081df9e..f9449468b8 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvites.smali @@ -47,7 +47,7 @@ .method private configureToolbar(Ljava/lang/String;)V .locals 1 - const v0, 0x7f120851 + const v0, 0x7f120852 invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvites;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesActions$onResume$3.smali index ca5e8f6542..9899d89feb 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 @@ -66,7 +66,7 @@ aput-object v3, v2, v4 - const v3, 0x7f120d2f + const v3, 0x7f120d30 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/WidgetServerSettingsInstantInvitesListItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem.smali index 429440adad..730ae1c10f 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem.smali @@ -263,7 +263,7 @@ iget-object p1, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->inviteExpirationTime:Landroid/widget/TextView; - const v0, 0x7f12095c + const v0, 0x7f12095d invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(I)V @@ -439,7 +439,7 @@ :cond_3 iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsInstantInvitesListItem;->inviteUserName:Landroid/widget/TextView; - const v1, 0x7f12083c + const v1, 0x7f12083d invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations.smali index 0f34c61fa1..03c4a156cc 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrations.smali @@ -138,7 +138,7 @@ .method private final configureToolbar(Ljava/lang/String;)V .locals 3 - const v0, 0x7f120853 + const v0, 0x7f120854 invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsIntegrations;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali index f713e73fb7..086803135e 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsIntegrationsListItem.smali @@ -599,12 +599,12 @@ if-eqz p5, :cond_2 - const v0, 0x7f12043a + const v0, 0x7f12043b goto :goto_0 :cond_2 - const v0, 0x7f12043b + const v0, 0x7f12043c :goto_0 invoke-virtual {v8, v0}, Landroid/widget/TextView;->setText(I)V diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers.smali index fc6ab579c1..6455cefe53 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsMembers.smali @@ -142,7 +142,7 @@ .method private configureToolbar(Ljava/lang/String;)V .locals 1 - const v0, 0x7f120965 + const v0, 0x7f120966 invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsMembers;->setActionBarTitle(I)Lkotlin/Unit; @@ -365,7 +365,7 @@ if-nez v0, :cond_1 - const p1, 0x7f1202d9 + const p1, 0x7f1202da invoke-static {p0, p1}, Lcom/discord/app/f;->b(Landroidx/fragment/app/Fragment;I)V @@ -405,14 +405,14 @@ if-eqz p1, :cond_3 - const p1, 0x7f1202da + const p1, 0x7f1202db invoke-static {p0, p1}, Lcom/discord/app/f;->b(Landroidx/fragment/app/Fragment;I)V return-void :cond_3 - const p1, 0x7f1202d8 + const p1, 0x7f1202d9 invoke-static {p0, p1}, Lcom/discord/app/f;->b(Landroidx/fragment/app/Fragment;I)V diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali index 9a381face7..3eabb7ef37 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsModeration.smali @@ -294,7 +294,7 @@ .method public static synthetic lambda$updateGuild$2(Lcom/discord/widgets/servers/WidgetServerSettingsModeration;Lcom/discord/models/domain/ModelGuild;)V .locals 0 - const p1, 0x7f120cf3 + const p1, 0x7f120cf4 invoke-static {p0, p1}, Lcom/discord/app/f;->b(Landroidx/fragment/app/Fragment;I)V @@ -390,7 +390,7 @@ invoke-virtual {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsModeration;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f1209a4 + const p1, 0x7f1209a5 invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/WidgetServerSettingsModeration;->setActionBarTitle(I)Lkotlin/Unit; @@ -442,7 +442,7 @@ aput-object v2, v1, v3 - const v2, 0x7f120f4d + const v2, 0x7f120f4e invoke-virtual {p0, v2, v1}, Lcom/discord/widgets/servers/WidgetServerSettingsModeration;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -466,7 +466,7 @@ aput-object v1, v0, v3 - const v1, 0x7f120f49 + const v1, 0x7f120f4a 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$configureIcon$1$1.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1$1.smali index ca47e2dd7d..0491661885 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1$1.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview$configureIcon$1$1.smali @@ -42,9 +42,9 @@ check-cast v0, Lcom/miguelgaeta/media_picker/MediaPicker$Provider; - const v1, 0x7f120329 + const v1, 0x7f12032a - const v2, 0x7f120e68 + const v2, 0x7f120e69 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 ed2cd4077e..81dade0c86 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsOverview.smali @@ -926,7 +926,7 @@ move-result-object v0 - const v1, 0x7f1209de + const v1, 0x7f1209df const v2, 0x7f0801cc @@ -1287,7 +1287,7 @@ move-result-object v0 - const v1, 0x7f120a04 + const v1, 0x7f120a05 const v2, 0x7f0801c4 @@ -1442,7 +1442,7 @@ goto :goto_1 :cond_1 - const v1, 0x7f120cf1 + const v1, 0x7f120cf2 invoke-virtual {p0, v1}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->getString(I)Ljava/lang/String; @@ -1770,7 +1770,7 @@ check-cast p1, Landroidx/fragment/app/Fragment; - const v0, 0x7f120cf3 + const v0, 0x7f120cf4 invoke-static {p1, v0}, Lcom/discord/app/f;->a(Landroidx/fragment/app/Fragment;I)V @@ -2578,7 +2578,7 @@ invoke-direct {p0}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->initChannelSelectedHandler()V - const v0, 0x7f120ac2 + const v0, 0x7f120ac3 invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsOverview;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali index f7848553f6..37fe63af1a 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesList.smali @@ -96,7 +96,7 @@ .method private configureToolbar(Ljava/lang/String;)V .locals 1 - const v0, 0x7f120c1e + const v0, 0x7f120c1f invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsRolesList;->setActionBarTitle(I)Lkotlin/Unit; @@ -428,7 +428,7 @@ .method public static synthetic lambda$processRoleDrop$3(Lcom/discord/widgets/servers/WidgetServerSettingsRolesList;Ljava/lang/Void;)V .locals 0 - const p1, 0x7f120c1d + const p1, 0x7f120c1e invoke-static {p0, p1}, Lcom/discord/app/f;->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 ff26b43a46..03315198ca 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsRolesListAdapter$RoleListItem.smali @@ -88,7 +88,7 @@ move-result-object p0 - const v0, 0x7f12051c + const v0, 0x7f12051d invoke-static {p0, v0}, Lcom/discord/app/f;->d(Landroid/content/Context;I)V @@ -104,7 +104,7 @@ move-result-object p0 - const v0, 0x7f12078c + const v0, 0x7f12078d invoke-static {p0, v0}, Lcom/discord/app/f;->d(Landroid/content/Context;I)V @@ -120,7 +120,7 @@ move-result-object p0 - const v0, 0x7f120e4d + const v0, 0x7f120e4e invoke-static {p0, v0}, Lcom/discord/app/f;->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 f735844156..8e208b7042 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity$ToggleMfaDialog.smali @@ -69,12 +69,12 @@ if-eqz p3, :cond_1 - const v1, 0x7f120432 + const v1, 0x7f120433 goto :goto_0 :cond_1 - const v1, 0x7f12049e + const v1, 0x7f12049f :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 ba7ad3eb37..d2d1a2b69c 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsSecurity.smali @@ -46,7 +46,7 @@ .method private configureToolbar(Ljava/lang/String;)V .locals 1 - const v0, 0x7f120cd0 + const v0, 0x7f120cd1 invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity;->setActionBarTitle(I)Lkotlin/Unit; @@ -77,7 +77,7 @@ iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity;->toggleMfaButton:Landroid/widget/Button; - const v1, 0x7f1206de + const v1, 0x7f1206df invoke-virtual {v0, v1}, Landroid/widget/Button;->setText(I)V @@ -93,7 +93,7 @@ :cond_1 iget-object v0, p0, Lcom/discord/widgets/servers/WidgetServerSettingsSecurity;->toggleMfaButton:Landroid/widget/Button; - const v1, 0x7f1206df + const v1, 0x7f1206e0 invoke-virtual {v0, v1}, Landroid/widget/Button;->setText(I)V diff --git a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali index e489c909de..daa2c3298f 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsTransferOwnership.smali @@ -133,7 +133,7 @@ move-result-object v0 - const v2, 0x7f120e29 + const v2, 0x7f120e2a 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 fd9ee2108a..e4f7a5a525 100644 --- a/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali +++ b/com.discord/smali/com/discord/widgets/servers/WidgetServerSettingsVanityUrl.smali @@ -99,7 +99,7 @@ iget-object v3, p0, Lcom/discord/widgets/servers/WidgetServerSettingsVanityUrl;->currentUrl:Lcom/discord/app/AppTextView; - const v4, 0x7f120f3b + const v4, 0x7f120f3c const/4 v5, 0x1 @@ -149,7 +149,7 @@ .method private configureToolbar(Ljava/lang/String;)V .locals 1 - const v0, 0x7f120d2a + const v0, 0x7f120d2b 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$Model$Companion$get$1.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1.smali index e019e5260e..5a348e1ecb 100644 --- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1.smali +++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1.smali @@ -937,7 +937,7 @@ :cond_1a iget-object v1, v0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog$Model$Companion$get$1;->$context:Landroid/content/Context; - const v2, 0x7f12076f + const v2, 0x7f120770 invoke-virtual {v1, v2}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.smali index d41f97f29b..6d2bcbafa6 100644 --- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.smali +++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog.smali @@ -649,7 +649,7 @@ move-result-object v0 - const v1, 0x7f1203bd + const v1, 0x7f1203be invoke-static {v0, v1}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V @@ -662,7 +662,7 @@ invoke-virtual {v0}, Lcom/discord/app/AppActivity;->finish()V :cond_0 - const v0, 0x7f120774 + const v0, 0x7f120775 invoke-virtual {p0, v0}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLog;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2.smali index 9a83225622..acc76da115 100644 --- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2.smali +++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2.smali @@ -101,7 +101,7 @@ iget-object v0, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet$Model$Companion$get$2;->$context:Landroid/content/Context; - const v4, 0x7f12076f + const v4, 0x7f120770 invoke-virtual {v0, v4}, Landroid/content/Context;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.smali b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.smali index 0d7350cdd9..afedd260e4 100644 --- a/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.smali +++ b/com.discord/smali/com/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet.smali @@ -552,7 +552,7 @@ iput-object p1, p0, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet;->adapter:Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterAdapter; - const p1, 0x7f120774 + const p1, 0x7f120775 invoke-virtual {p0, p1}, Lcom/discord/widgets/servers/auditlog/WidgetServerSettingsAuditLogFilterSheet;->setActionBarTitle(I)Lkotlin/Unit; @@ -569,13 +569,13 @@ if-nez p1, :cond_1 - const p1, 0x7f120770 + const p1, 0x7f120771 goto :goto_1 :cond_1 :goto_0 - const p1, 0x7f12076c + const p1, 0x7f12076d :goto_1 const/4 p2, 0x0 @@ -603,13 +603,13 @@ if-nez p2, :cond_3 - const p2, 0x7f120cbc + const p2, 0x7f120cbd goto :goto_3 :cond_3 :goto_2 - const p2, 0x7f120c89 + const p2, 0x7f120c8a :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 802f9d976f..1113ecd6e3 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetChangeLog.smali @@ -479,7 +479,7 @@ .method private final getDateString(Landroid/content/Context;)Ljava/lang/CharSequence; .locals 3 - const v0, 0x7f1202f9 + const v0, 0x7f1202fa invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/WidgetChangeLog;->getString(I)Ljava/lang/String; @@ -800,7 +800,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, 0x7f120fb0 + const v1, 0x7f120fb1 invoke-virtual {p0, v1}, Lcom/discord/widgets/settings/WidgetChangeLog;->setActionBarTitle(I)Lkotlin/Unit; @@ -834,7 +834,7 @@ invoke-static {v1, v2}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v2, 0x7f1202f8 + const v2, 0x7f1202f9 invoke-virtual {p0, v2}, Lcom/discord/widgets/settings/WidgetChangeLog;->getString(I)Ljava/lang/String; @@ -862,7 +862,7 @@ invoke-virtual {p1, v0}, Lcom/discord/app/AppTextView;->setMovementMethod(Landroid/text/method/MovementMethod;)V - const p1, 0x7f1202fc + const p1, 0x7f1202fd invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetChangeLog;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali index cbb479a4e5..a9fd487991 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettings.smali @@ -1157,13 +1157,13 @@ invoke-direct {v1, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V - const p1, 0x7f12093d + const p1, 0x7f12093e invoke-virtual {v1, p1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; move-result-object v1 - const v2, 0x7f120f00 + const v2, 0x7f120f01 invoke-virtual {v1, v2}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; @@ -1183,7 +1183,7 @@ move-result-object p1 - const v1, 0x7f1202d4 + const v1, 0x7f1202d5 const/4 v2, 0x2 @@ -1297,7 +1297,7 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onViewBound(Landroid/view/View;)V - const p1, 0x7f120ef2 + const p1, 0x7f120ef3 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettings;->setActionBarTitle(I)Lkotlin/Unit; @@ -1345,7 +1345,7 @@ invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; - const-string v0, " - 8.2.3 (823)" + const-string v0, " - 8.2.4 (824)" invoke-virtual {v1, v0}, Ljava/lang/StringBuilder;->append(Ljava/lang/String;)Ljava/lang/StringBuilder; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$6$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$6$1.smali index 5c159481d6..d457f425bf 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$6$1.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$6$1.smali @@ -42,9 +42,9 @@ check-cast v0, Lcom/miguelgaeta/media_picker/MediaPicker$Provider; - const v1, 0x7f120329 + const v1, 0x7f12032a - const v2, 0x7f120e68 + const v2, 0x7f120e69 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/WidgetSettingsAccount$configureUI$7.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$7.smali index b10aeb5d42..9d7f29d7c9 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$7.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount$configureUI$7.smali @@ -96,7 +96,7 @@ iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsAccount$configureUI$7;->this$0:Lcom/discord/widgets/settings/WidgetSettingsAccount; - const v1, 0x7f120ad5 + const v1, 0x7f120ad6 invoke-virtual {v0, v1}, Lcom/discord/widgets/settings/WidgetSettingsAccount;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount.smali index 380e620b6b..e329dd4d1c 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAccount.smali @@ -1763,13 +1763,13 @@ const/4 v0, 0x0 - const v1, 0x7f120ef2 + const v1, 0x7f120ef3 const/4 v2, 0x2 invoke-static {p0, v1, p1, v2, v0}, Lcom/discord/app/AppFragment;->setActionBarSubtitle$default(Lcom/discord/app/AppFragment;IIILjava/lang/Object;)Lkotlin/Unit; - const v1, 0x7f120f16 + const v1, 0x7f120f17 invoke-virtual {p0, v1}, Lcom/discord/widgets/settings/WidgetSettingsAccount;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali index 9d83d02fbf..53e28285f6 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsAppearance.smali @@ -428,7 +428,7 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V - const p1, 0x7f120ef2 + const p1, 0x7f120ef3 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 7c8a238a2d..7a641659cf 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsBehavior.smali @@ -366,13 +366,13 @@ const/4 v0, 0x0 - const v1, 0x7f120ef2 + const v1, 0x7f120ef3 const/4 v2, 0x2 invoke-static {p0, v1, p1, v2, v0}, Lcom/discord/app/AppFragment;->setActionBarSubtitle$default(Lcom/discord/app/AppFragment;IIILjava/lang/Object;)Lkotlin/Unit; - const v1, 0x7f120533 + const v1, 0x7f120534 invoke-virtual {p0, v1}, Lcom/discord/widgets/settings/WidgetSettingsBehavior;->setActionBarTitle(I)Lkotlin/Unit; @@ -474,7 +474,7 @@ aput-object v3, v2, v4 - const v3, 0x7f12042c + const v3, 0x7f12042d 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 b95ada9512..521552eca7 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsDeveloper.smali @@ -122,7 +122,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, 0x7f12042d + const p1, 0x7f12042e 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 eab0979bc4..06b41a78a1 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 @@ -72,7 +72,7 @@ iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsGames; - const v3, 0x7f120ea6 + const v3, 0x7f120ea7 invoke-virtual {v0, v3}, Lcom/discord/widgets/settings/WidgetSettingsGames;->getString(I)Ljava/lang/String; @@ -84,7 +84,7 @@ iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsGames; - const v4, 0x7f1205d3 + const v4, 0x7f1205d4 invoke-virtual {v0, v4}, Lcom/discord/widgets/settings/WidgetSettingsGames;->getString(I)Ljava/lang/String; @@ -96,7 +96,7 @@ iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsGames$configureUI$$inlined$apply$lambda$2;->this$0:Lcom/discord/widgets/settings/WidgetSettingsGames; - const v5, 0x7f1205d4 + const v5, 0x7f1205d5 invoke-virtual {v0, v5}, 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 f783409061..449094d190 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsGames.smali @@ -316,7 +316,7 @@ move-result-object v0 - const v1, 0x7f120d13 + const v1, 0x7f120d14 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -349,7 +349,7 @@ move-result-object v0 - const v1, 0x7f120d0e + const v1, 0x7f120d0f invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -357,7 +357,7 @@ move-result-object v0 - const v1, 0x7f120d10 + const v1, 0x7f120d11 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -648,7 +648,7 @@ move-result-object v0 - const v1, 0x7f120b16 + const v1, 0x7f120b17 const/4 v2, 0x1 @@ -747,13 +747,13 @@ const/4 v0, 0x0 - const v1, 0x7f120ef2 + const v1, 0x7f120ef3 const/4 v2, 0x2 invoke-static {p0, v1, p1, v2, v0}, Lcom/discord/app/AppFragment;->setActionBarSubtitle$default(Lcom/discord/app/AppFragment;IIILjava/lang/Object;)Lkotlin/Unit; - const v1, 0x7f12063e + const v1, 0x7f12063f invoke-virtual {p0, v1}, 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 65667c4c6b..a74514cb22 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsLanguage.smali @@ -1576,129 +1576,129 @@ const/4 p0, -0x1 :goto_1 - const v0, 0x7f12049d + const v0, 0x7f12049e packed-switch p0, :pswitch_data_0 return v0 :pswitch_0 - const p0, 0x7f120fc2 - - return p0 - - :pswitch_1 - const p0, 0x7f120c1c - - return p0 - - :pswitch_2 - const p0, 0x7f12079c - - return p0 - - :pswitch_3 - const p0, 0x7f12093e - - return p0 - - :pswitch_4 - const p0, 0x7f120485 - - return p0 - - :pswitch_5 - const p0, 0x7f1209dd - - return p0 - - :pswitch_6 - const p0, 0x7f1204cb - - return p0 - - :pswitch_7 - const p0, 0x7f12079b - - return p0 - - :pswitch_8 - const p0, 0x7f120916 - - return p0 - - :pswitch_9 const p0, 0x7f120fc3 return p0 + :pswitch_1 + const p0, 0x7f120c1d + + return p0 + + :pswitch_2 + const p0, 0x7f12079d + + return p0 + + :pswitch_3 + const p0, 0x7f12093f + + return p0 + + :pswitch_4 + const p0, 0x7f120486 + + return p0 + + :pswitch_5 + const p0, 0x7f1209de + + return p0 + + :pswitch_6 + const p0, 0x7f1204cc + + return p0 + + :pswitch_7 + const p0, 0x7f12079c + + return p0 + + :pswitch_8 + const p0, 0x7f120917 + + return p0 + + :pswitch_9 + const p0, 0x7f120fc4 + + return p0 + :pswitch_a - const p0, 0x7f1208bd + const p0, 0x7f1208be return p0 :pswitch_b - const p0, 0x7f120e65 + const p0, 0x7f120e66 return p0 :pswitch_c - const p0, 0x7f120c30 + const p0, 0x7f120c31 return p0 :pswitch_d - const p0, 0x7f120237 + const p0, 0x7f120238 return p0 :pswitch_e - const p0, 0x7f1203db + const p0, 0x7f1203dc return p0 :pswitch_f - const p0, 0x7f120e26 + const p0, 0x7f120e27 return p0 :pswitch_10 - const p0, 0x7f120d8b + const p0, 0x7f120d8c return p0 :pswitch_11 - const p0, 0x7f120bb0 + const p0, 0x7f120bb1 return p0 :pswitch_12 - const p0, 0x7f120b2d + const p0, 0x7f120b2e return p0 :pswitch_13 - const p0, 0x7f1209dc + const p0, 0x7f1209dd return p0 :pswitch_14 - const p0, 0x7f1208bc + const p0, 0x7f1208bd return p0 :pswitch_15 - const p0, 0x7f12058b + const p0, 0x7f12058c return p0 :pswitch_16 - const p0, 0x7f1204ae + const p0, 0x7f1204af return p0 :pswitch_17 - const p0, 0x7f12049c + const p0, 0x7f12049d return p0 @@ -1706,12 +1706,12 @@ return v0 :pswitch_19 - const p0, 0x7f1203fb + const p0, 0x7f1203fc return p0 :pswitch_1a - const p0, 0x7f1203e1 + const p0, 0x7f1203e2 return p0 @@ -1827,11 +1827,11 @@ invoke-super {p0, p1}, Lcom/discord/app/AppFragment;->onActivityCreated(Landroid/os/Bundle;)V - const p1, 0x7f120ef2 + const p1, 0x7f120ef3 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsLanguage;->setActionBarSubtitle(I)Lkotlin/Unit; - const p1, 0x7f120917 + const p1, 0x7f120918 invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsLanguage;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali index f72ef0aab5..838880470e 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsMedia.smali @@ -453,13 +453,13 @@ const/4 v0, 0x0 - const v1, 0x7f120ef2 + const v1, 0x7f120ef3 const/4 v2, 0x2 invoke-static {p0, v1, p1, v2, v0}, Lcom/discord/app/AppFragment;->setActionBarSubtitle$default(Lcom/discord/app/AppFragment;IIILjava/lang/Object;)Lkotlin/Unit; - const v1, 0x7f120de2 + const v1, 0x7f120de3 invoke-virtual {p0, v1}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->setActionBarTitle(I)Lkotlin/Unit; @@ -524,7 +524,7 @@ sget-object v0, Lkotlin/jvm/internal/v;->bQh:Lkotlin/jvm/internal/v; - const v0, 0x7f120829 + const v0, 0x7f12082a invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/WidgetSettingsMedia;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1.smali index 2031f17a01..3ed8d91160 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1.smali @@ -19,7 +19,7 @@ value = { "Lkotlin/jvm/internal/k;", "Lkotlin/jvm/functions/Function1<", - "Lcom/discord/utilities/fcm/NotificationClient$Settings;", + "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;", "Lkotlin/Unit;", ">;" } @@ -48,16 +48,16 @@ .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object; .locals 0 - check-cast p1, Lcom/discord/utilities/fcm/NotificationClient$Settings; + check-cast p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; - invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1;->invoke(Lcom/discord/utilities/fcm/NotificationClient$Settings;)V + invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1;->invoke(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)V sget-object p1, Lkotlin/Unit;->bPn:Lkotlin/Unit; return-object p1 .end method -.method public final invoke(Lcom/discord/utilities/fcm/NotificationClient$Settings;)V +.method public final invoke(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)V .locals 2 iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsNotifications$onViewBoundOrOnResume$1;->this$0:Lcom/discord/widgets/settings/WidgetSettingsNotifications; @@ -68,7 +68,7 @@ check-cast v0, Landroid/view/View; - invoke-virtual {p1}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->isEnabled()Z + invoke-virtual {p1}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isEnabled()Z move-result v1 @@ -80,7 +80,7 @@ move-result-object v0 - invoke-virtual {p1}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->isEnabled()Z + invoke-virtual {p1}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isEnabled()Z move-result v1 @@ -92,7 +92,7 @@ move-result-object v0 - invoke-virtual {p1}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->isEnabledInApp()Z + invoke-virtual {p1}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isEnabledInApp()Z move-result v1 @@ -104,7 +104,7 @@ move-result-object v0 - invoke-virtual {p1}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->isWake()Z + invoke-virtual {p1}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isWake()Z move-result v1 @@ -116,7 +116,7 @@ move-result-object v0 - invoke-virtual {p1}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->isDisableBlink()Z + invoke-virtual {p1}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableBlink()Z move-result v1 @@ -128,7 +128,7 @@ move-result-object v0 - invoke-virtual {p1}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->isDisableVibrate()Z + invoke-virtual {p1}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableVibrate()Z move-result v1 @@ -140,7 +140,7 @@ move-result-object v0 - invoke-virtual {p1}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->isDisableSound()Z + invoke-virtual {p1}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isDisableSound()Z move-result p1 diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali index 81dc52c612..92345c0dcc 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotifications.smali @@ -618,13 +618,13 @@ const/4 v0, 0x0 - const v1, 0x7f120ef2 + const v1, 0x7f120ef3 const/4 v2, 0x2 invoke-static {p0, v1, p1, v2, v0}, Lcom/discord/app/AppFragment;->setActionBarSubtitle$default(Lcom/discord/app/AppFragment;IIILjava/lang/Object;)Lkotlin/Unit; - const v1, 0x7f120a55 + const v1, 0x7f120a56 invoke-virtual {p0, v1}, Lcom/discord/widgets/settings/WidgetSettingsNotifications;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onResume$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onResume$1.smali index a2792d8c1b..e42fcb58fc 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onResume$1.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsNotificationsOs$onResume$1.smali @@ -19,7 +19,7 @@ value = { "Lkotlin/jvm/internal/k;", "Lkotlin/jvm/functions/Function1<", - "Lcom/discord/utilities/fcm/NotificationClient$Settings;", + "Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;", "Lkotlin/Unit;", ">;" } @@ -48,16 +48,16 @@ .method public final bridge synthetic invoke(Ljava/lang/Object;)Ljava/lang/Object; .locals 0 - check-cast p1, Lcom/discord/utilities/fcm/NotificationClient$Settings; + check-cast p1, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2; - invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsNotificationsOs$onResume$1;->invoke(Lcom/discord/utilities/fcm/NotificationClient$Settings;)V + invoke-virtual {p0, p1}, Lcom/discord/widgets/settings/WidgetSettingsNotificationsOs$onResume$1;->invoke(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)V sget-object p1, Lkotlin/Unit;->bPn:Lkotlin/Unit; return-object p1 .end method -.method public final invoke(Lcom/discord/utilities/fcm/NotificationClient$Settings;)V +.method public final invoke(Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;)V .locals 2 iget-object v0, p0, Lcom/discord/widgets/settings/WidgetSettingsNotificationsOs$onResume$1;->this$0:Lcom/discord/widgets/settings/WidgetSettingsNotificationsOs; @@ -66,7 +66,7 @@ move-result-object v0 - invoke-virtual {p1}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->isEnabled()Z + invoke-virtual {p1}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isEnabled()Z move-result v1 @@ -78,7 +78,7 @@ move-result-object v0 - invoke-virtual {p1}, Lcom/discord/utilities/fcm/NotificationClient$Settings;->isEnabledInApp()Z + invoke-virtual {p1}, Lcom/discord/utilities/fcm/NotificationClient$SettingsV2;->isEnabledInApp()Z move-result p1 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 42454f35a8..f162691250 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 @@ -108,15 +108,15 @@ invoke-static {p5, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V - const v0, 0x7f120eaa + const v0, 0x7f120eab invoke-virtual {p2, v0}, Landroid/widget/TextView;->setText(I)V - const p2, 0x7f120ea7 + const p2, 0x7f120ea8 invoke-virtual {p3, p2}, Landroid/widget/TextView;->setText(I)V - const p2, 0x7f120ea8 + const p2, 0x7f120ea9 invoke-virtual {p4, p2}, Landroid/widget/TextView;->setText(I)V @@ -128,7 +128,7 @@ invoke-virtual {p4, p2}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V - const p2, 0x7f120ea9 + const p2, 0x7f120eaa invoke-virtual {p5, p2}, Landroid/widget/TextView;->setText(I)V diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1.smali index 2ea880ebc8..d693739992 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$configurePrivacyControls$2$1.smali @@ -108,15 +108,15 @@ invoke-static {p5, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V - const v0, 0x7f120b1a + const v0, 0x7f120b1b invoke-virtual {p2, v0}, Landroid/widget/TextView;->setText(I)V - const p2, 0x7f120b17 + const p2, 0x7f120b18 invoke-virtual {p3, p2}, Landroid/widget/TextView;->setText(I)V - const p2, 0x7f120b18 + const p2, 0x7f120b19 invoke-virtual {p4, p2}, Landroid/widget/TextView;->setText(I)V @@ -128,7 +128,7 @@ invoke-virtual {p4, p2}, Landroid/widget/TextView;->setOnClickListener(Landroid/view/View$OnClickListener;)V - const p2, 0x7f120b19 + const p2, 0x7f120b1a 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 fb20bd1c20..21c5b86f48 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 @@ -80,7 +80,7 @@ check-cast p1, Landroidx/fragment/app/Fragment; - const v0, 0x7f1203f5 + const v0, 0x7f1203f6 invoke-static {p1, v0}, Lcom/discord/app/f;->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 f9b874ab54..2b584fc94d 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 @@ -74,13 +74,13 @@ invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V - const v1, 0x7f1203f4 + const v1, 0x7f1203f5 invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; move-result-object v0 - const v1, 0x7f1203f3 + const v1, 0x7f1203f4 invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; @@ -88,7 +88,7 @@ const/4 v1, 0x0 - const v2, 0x7f120a85 + const v2, 0x7f120a86 const/4 v3, 0x2 diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2.smali index 2b2f4211c8..b7aeb1f956 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 @@ -85,7 +85,7 @@ invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V - const v1, 0x7f1203eb + const v1, 0x7f1203ec invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; @@ -95,7 +95,7 @@ iget-object p1, p0, Lcom/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$2;->$context:Landroid/content/Context; - const v1, 0x7f1203ea + const v1, 0x7f1203eb invoke-virtual {p1, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -110,7 +110,7 @@ move-result-object p1 - const v0, 0x7f120a85 + const v0, 0x7f120a86 const/4 v1, 0x2 diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy$onRequestDataClick$4.smali index c1d8f923a6..1ef654b3da 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 @@ -71,13 +71,13 @@ invoke-direct {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V - const v1, 0x7f1203e9 + const v1, 0x7f1203ea invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; move-result-object v0 - const v1, 0x7f1203ee + const v1, 0x7f1203ef invoke-virtual {v0, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setMessage(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; @@ -89,7 +89,7 @@ check-cast v1, Lkotlin/jvm/functions/Function1; - const v2, 0x7f120a85 + const v2, 0x7f120a86 invoke-virtual {v0, v2, v1}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setPositiveButton(ILkotlin/jvm/functions/Function1;)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; @@ -97,7 +97,7 @@ const/4 v1, 0x0 - const v2, 0x7f1202d4 + const v2, 0x7f1202d5 const/4 v3, 0x2 diff --git a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali index c6bf6c9143..509cf178f9 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsPrivacy.smali @@ -1722,7 +1722,7 @@ move-result-object p1 - const p2, 0x7f1203e2 + const p2, 0x7f1203e3 const/4 v1, 0x1 @@ -1740,7 +1740,7 @@ invoke-direct {p2, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->(Landroid/content/Context;)V - const v0, 0x7f1203f8 + const v0, 0x7f1203f9 invoke-virtual {p2, v0}, Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder;->setTitle(I)Lcom/discord/widgets/notice/WidgetNoticeDialog$Builder; @@ -1754,7 +1754,7 @@ move-result-object p1 - const p2, 0x7f120a85 + const p2, 0x7f120a86 const/4 v0, 0x2 @@ -2138,13 +2138,13 @@ 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 v2, 0x7f120ef2 + const v2, 0x7f120ef3 const/4 v3, 0x2 invoke-static {p0, v2, v1, v3, v0}, Lcom/discord/app/AppFragment;->setActionBarSubtitle$default(Lcom/discord/app/AppFragment;IIILjava/lang/Object;)Lkotlin/Unit; - const v0, 0x7f120ba4 + const v0, 0x7f120ba5 invoke-virtual {p0, v0}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->setActionBarTitle(I)Lkotlin/Unit; @@ -2172,7 +2172,7 @@ aput-object v0, v3, v1 - const v0, 0x7f1203e7 + const v0, 0x7f1203e8 invoke-virtual {p0, v0, v3}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -2210,7 +2210,7 @@ move-result-object v0 - const v3, 0x7f1203e4 + const v3, 0x7f1203e5 invoke-virtual {p0, v3}, Lcom/discord/widgets/settings/WidgetSettingsPrivacy;->getString(I)Ljava/lang/String; @@ -2315,7 +2315,7 @@ invoke-direct {v3, v4}, Ljava/lang/StringBuilder;->(Ljava/lang/String;)V - const v4, 0x7f120a40 + const v4, 0x7f120a41 invoke-virtual {p0, v4}, 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 98069fcf55..522424c8ec 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 @@ -742,7 +742,7 @@ move-result-object v1 - const v2, 0x7f120455 + const v2, 0x7f120456 new-array v5, v3, [Ljava/lang/Object; @@ -935,7 +935,7 @@ move-result-object v0 - const v1, 0x7f120d56 + const v1, 0x7f120d57 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 3b08e7019b..d4097988b3 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnections.smali @@ -451,13 +451,13 @@ invoke-static {p0, v0, v1, p1, v1}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f120ef2 + const p1, 0x7f120ef3 const/4 v2, 0x2 invoke-static {p0, p1, v0, v2, v1}, Lcom/discord/app/AppFragment;->setActionBarSubtitle$default(Lcom/discord/app/AppFragment;IIILjava/lang/Object;)Lkotlin/Unit; - const p1, 0x7f1203a2 + const p1, 0x7f1203a3 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 0fd7b2a4e9..7a66d584b3 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsUserConnectionsAddXbox.smali @@ -254,7 +254,7 @@ move-result-object v0 - const v1, 0x7f120393 + const v1, 0x7f120394 invoke-static {v0, v1}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V @@ -440,13 +440,13 @@ 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, 0x7f120ef2 + const v1, 0x7f120ef3 const/4 v2, 0x2 invoke-static {p0, v1, p1, v2, v0}, Lcom/discord/app/AppFragment;->setActionBarSubtitle$default(Lcom/discord/app/AppFragment;IIILjava/lang/Object;)Lkotlin/Unit; - const p1, 0x7f1203a2 + const p1, 0x7f1203a3 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 94e8289ef1..3ea96a979a 100644 --- a/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali +++ b/com.discord/smali/com/discord/widgets/settings/WidgetSettingsVoice.smali @@ -2161,13 +2161,13 @@ const/4 v0, 0x0 - const v1, 0x7f120ef2 + const v1, 0x7f120ef3 const/4 v2, 0x2 invoke-static {p0, v1, p1, v2, v0}, Lcom/discord/app/AppFragment;->setActionBarSubtitle$default(Lcom/discord/app/AppFragment;IIILjava/lang/Object;)Lkotlin/Unit; - const v1, 0x7f120f75 + const v1, 0x7f120f76 invoke-virtual {p0, v1}, Lcom/discord/widgets/settings/WidgetSettingsVoice;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali index ea64a75dcd..ba9e75341f 100644 --- a/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali +++ b/com.discord/smali/com/discord/widgets/share/WidgetIncomingShare.smali @@ -681,7 +681,7 @@ goto :goto_0 :cond_3 - const v0, 0x7f120e95 + const v0, 0x7f120e96 :goto_0 invoke-virtual {p1, v0}, Landroid/widget/TextView;->setHint(I)V @@ -1308,7 +1308,7 @@ if-eqz p4, :cond_0 - const p2, 0x7f120319 + const p2, 0x7f12031a invoke-static {p1, p2}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V @@ -1711,7 +1711,7 @@ return-void :cond_0 - const v0, 0x7f120d2c + const v0, 0x7f120d2d invoke-virtual {p0, v0}, Lcom/discord/widgets/share/WidgetIncomingShare;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali b/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali index c344880631..d913b2d745 100644 --- a/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali +++ b/com.discord/smali/com/discord/widgets/status/WidgetStatus.smali @@ -389,7 +389,7 @@ invoke-direct {p1}, Ljava/lang/StringBuilder;->()V - const v0, 0x7f120390 + const v0, 0x7f120391 invoke-virtual {p0, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -412,7 +412,7 @@ if-eqz p1, :cond_1 - const p1, 0x7f1209c6 + const p1, 0x7f1209c7 invoke-virtual {p0, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -465,7 +465,7 @@ move-result-object p1 - const v2, 0x7f1209ce + const v2, 0x7f1209cf new-array p4, p4, [Ljava/lang/Object; @@ -506,7 +506,7 @@ move-result-object p2 - const v2, 0x7f1209cc + const v2, 0x7f1209cd new-array p4, p4, [Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali b/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali index f03f0ea948..7253a5640c 100644 --- a/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali +++ b/com.discord/smali/com/discord/widgets/tos/WidgetTosAccept.smali @@ -225,7 +225,7 @@ if-eqz v0, :cond_1 - const v2, 0x7f120ddc + const v2, 0x7f120ddd invoke-direct {p0, v0, v2}, Lcom/discord/widgets/tos/WidgetTosAccept;->getFormattedUrl(Landroid/content/Context;I)Ljava/lang/CharSequence; @@ -249,7 +249,7 @@ if-eqz v0, :cond_2 - const v1, 0x7f120ba6 + const v1, 0x7f120ba7 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 f3bdab1b1a..c51f6c950c 100644 --- a/com.discord/smali/com/discord/widgets/user/ViewHolderGameRichPresence.smali +++ b/com.discord/smali/com/discord/widgets/user/ViewHolderGameRichPresence.smali @@ -64,7 +64,7 @@ if-eqz v5, :cond_0 - const v6, 0x7f120ed7 + const v6, 0x7f120ed8 new-array v7, v1, [Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence.smali b/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence.smali index f60a6ed4e3..f4a8bb9b51 100644 --- a/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence.smali +++ b/com.discord/smali/com/discord/widgets/user/ViewHolderMusicRichPresence.smali @@ -225,7 +225,7 @@ invoke-static {v5, v6}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v6, 0x7f120ed1 + const v6, 0x7f120ed2 const/4 v7, 0x1 @@ -251,7 +251,7 @@ invoke-static {v3, v5}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v5, 0x7f120ed0 + const v5, 0x7f120ed1 new-array v8, v7, [Ljava/lang/Object; @@ -323,7 +323,7 @@ invoke-static {p2, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v1, 0x7f120eb9 + const v1, 0x7f120eba invoke-virtual {v0, v1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -350,7 +350,7 @@ invoke-static {p2, v1}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V - const v1, 0x7f120ed4 + const v1, 0x7f120ed5 new-array v3, v7, [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 5b24d54bee..3c7559aebc 100644 --- a/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence.smali +++ b/com.discord/smali/com/discord/widgets/user/ViewHolderPlatformRichPresence.smali @@ -99,7 +99,7 @@ move-result-object v2 - const v3, 0x7f120ec7 + const v3, 0x7f120ec8 const/4 v4, 0x1 @@ -187,7 +187,7 @@ move-result-object v1 - const v2, 0x7f120ebd + const v2, 0x7f120ebe new-array v3, 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 6f22a48383..cc2d216655 100644 --- a/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence.smali +++ b/com.discord/smali/com/discord/widgets/user/ViewHolderUserRichPresence.smali @@ -451,7 +451,7 @@ if-eqz v5, :cond_0 - const v6, 0x7f120ed7 + const v6, 0x7f120ed8 new-array v7, v1, [Ljava/lang/Object; @@ -854,7 +854,7 @@ move-result-wide v8 - const p1, 0x7f120ed9 + const p1, 0x7f120eda :goto_0 invoke-virtual {p0, p1}, Lcom/discord/widgets/user/ViewHolderUserRichPresence;->getString(I)Ljava/lang/String; @@ -886,7 +886,7 @@ move-result-wide v8 - const p1, 0x7f120edb + const p1, 0x7f120edc goto :goto_0 diff --git a/com.discord/smali/com/discord/widgets/user/WidgetBanUser$onViewBound$3$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetBanUser$onViewBound$3$1.smali index 5daeea474d..10e1c80246 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetBanUser$onViewBound$3$1.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetBanUser$onViewBound$3$1.smali @@ -80,7 +80,7 @@ aput-object v2, v1, v3 - const v2, 0x7f120226 + const v2, 0x7f120227 invoke-virtual {v0, v2, v1}, Lcom/discord/widgets/user/WidgetBanUser;->getString(I[Ljava/lang/Object;)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2$1.smali b/com.discord/smali/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2$1.smali index 38cf3eb92c..89633a5e4a 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2$1.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetKickUser$onViewBoundOrOnResume$2$1.smali @@ -80,7 +80,7 @@ aput-object v2, v1, v3 - const v2, 0x7f120913 + const v2, 0x7f120914 invoke-virtual {v0, v2, v1}, Lcom/discord/widgets/user/WidgetKickUser;->getString(I[Ljava/lang/Object;)Ljava/lang/String; diff --git a/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers.smali b/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers.smali index 48e7c06617..3293fb6ce0 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetPruneUsers.smali @@ -144,7 +144,7 @@ invoke-direct {v0}, Ljava/lang/StringBuilder;->()V - const v1, 0x7f120baf + const v1, 0x7f120bb0 invoke-virtual {p0, v1}, Lcom/discord/widgets/user/WidgetPruneUsers;->getString(I)Ljava/lang/String; @@ -288,7 +288,7 @@ iget-object v3, p0, Lcom/discord/widgets/user/WidgetPruneUsers;->estimateText:Lcom/discord/app/AppTextView; - const v5, 0x7f1204f1 + const v5, 0x7f1204f2 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 216c98799d..7a2436ccd6 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 @@ -73,7 +73,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 34 + .locals 35 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -300,23 +300,27 @@ const/16 v28, 0x0 + const/16 v29, 0x0 + const-string v8, "allowAnimatedEmojis" invoke-static {v3, v8}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V invoke-virtual/range {p9 .. p9}, Ljava/lang/Boolean;->booleanValue()Z - move-result v29 + move-result v30 invoke-virtual {v6}, Lcom/discord/models/domain/ModelChannel;->getGuildId()J - move-result-wide v30 + move-result-wide v31 - const-wide/16 v32, -0x1 + invoke-virtual {v6}, Lcom/discord/models/domain/ModelChannel;->getId()J + + move-result-wide v33 move-object/from16 v25, v5 - invoke-static/range {v22 .. v33}, Lcom/discord/widgets/chat/list/model/WidgetChatListModel$Messages;->getMessageItems(Ljava/util/Map;Ljava/util/Map;Ljava/util/Map;Lcom/discord/models/domain/ModelMessage;ZZZZJJ)Ljava/util/List; + invoke-static/range {v22 .. 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;ZZZZJJ)Ljava/util/List; move-result-object v5 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 44ecfaca93..f1dfb2946a 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions$WidgetUserMentionFilter.smali @@ -559,7 +559,7 @@ move-result-object v0 - const v3, 0x7f120def + const v3, 0x7f120df0 new-array v2, v2, [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 4d509fadb7..f4522400e5 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserMentions.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMentions.smali @@ -421,7 +421,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, 0x7f120bdf + const p1, 0x7f120be0 invoke-virtual {p0, p1}, Lcom/discord/widgets/user/WidgetUserMentions;->setActionBarTitle(I)Lkotlin/Unit; diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali index 07f1850f36..677b63edd6 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualFriends$MutualFriendsAdapter.smali @@ -86,7 +86,7 @@ const v0, 0x7f0401be - const v1, 0x7f1209f9 + const v1, 0x7f1209fa invoke-direct {p1, p2, p0, v0, v1}, Lcom/discord/widgets/user/WidgetUserProfileEmptyListItem;->(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;II)V diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter.smali index 53413c8521..eac94900fc 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserMutualGuilds$Adapter.smali @@ -100,7 +100,7 @@ const v0, 0x7f0401bf - const v1, 0x7f1209fa + const v1, 0x7f1209fb invoke-direct {p1, p2, p0, v0, v1}, Lcom/discord/widgets/user/WidgetUserProfileEmptyListItem;->(ILcom/discord/utilities/mg_recycler/MGRecyclerAdapter;II)V diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserProfile.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfile.smali index c7231f132f..f5cde1b2c3 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfile.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfile.smali @@ -409,7 +409,7 @@ const/4 p1, 0x0 - const v0, 0x7f12059c + const v0, 0x7f12059d invoke-direct {p0, p1, v0}, Lcom/discord/widgets/user/WidgetUserProfile;->addRelationship(Ljava/lang/Integer;I)V @@ -443,7 +443,7 @@ .method public static synthetic lambda$configureActionButtons$9(Lcom/discord/widgets/user/WidgetUserProfile;Landroid/view/View;)V .locals 0 - const p1, 0x7f120595 + const p1, 0x7f120596 invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->removeRelationship(I)V @@ -466,14 +466,14 @@ goto :goto_0 :pswitch_0 - const p1, 0x7f120eec + const p1, 0x7f120eed invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->removeRelationship(I)V return-void :pswitch_1 - const p1, 0x7f12058c + const p1, 0x7f12058d invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->removeRelationship(I)V @@ -485,14 +485,14 @@ return-void :pswitch_3 - const p1, 0x7f120595 + const p1, 0x7f120596 invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->removeRelationship(I)V return-void :pswitch_4 - const p1, 0x7f120593 + const p1, 0x7f120594 invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->removeRelationship(I)V @@ -505,7 +505,7 @@ move-result-object p1 - const p2, 0x7f120eeb + const p2, 0x7f120eec invoke-direct {p0, p1, p2}, Lcom/discord/widgets/user/WidgetUserProfile;->addRelationship(Ljava/lang/Integer;I)V @@ -564,7 +564,7 @@ const v2, 0xffff - const v3, 0x7f1203ab + const v3, 0x7f1203ac invoke-interface {p1, v0, v1, v2, v3}, Landroid/view/Menu;->add(IIII)Landroid/view/MenuItem; @@ -626,7 +626,7 @@ invoke-virtual {p1}, Landroidx/appcompat/app/AlertDialog;->dismiss()V - const p1, 0x7f120593 + const p1, 0x7f120594 invoke-direct {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->removeRelationship(I)V @@ -770,7 +770,7 @@ aput-object p1, v3, v4 - const p1, 0x7f120a97 + const p1, 0x7f120a98 invoke-virtual {v2, p1, v3}, Landroid/content/Context;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -885,7 +885,7 @@ invoke-virtual {p0}, Lcom/discord/widgets/user/WidgetUserProfile;->setActionBarDisplayHomeAsUpEnabled()Landroidx/appcompat/widget/Toolbar; - const p1, 0x7f120bac + const p1, 0x7f120bad invoke-virtual {p0, p1}, Lcom/discord/widgets/user/WidgetUserProfile;->setActionBarTitle(I)Lkotlin/Unit; @@ -909,7 +909,7 @@ new-instance v3, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item; - const v4, 0x7f120eed + const v4, 0x7f120eee invoke-virtual {p0, v4}, Lcom/discord/widgets/user/WidgetUserProfile;->getString(I)Ljava/lang/String; @@ -925,7 +925,7 @@ new-instance v3, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item; - const v4, 0x7f1209b3 + const v4, 0x7f1209b4 invoke-virtual {p0, v4}, Lcom/discord/widgets/user/WidgetUserProfile;->getString(I)Ljava/lang/String; @@ -941,7 +941,7 @@ new-instance v3, Lcom/discord/utilities/simple_pager/SimplePager$Adapter$Item; - const v4, 0x7f1209b2 + const v4, 0x7f1209b3 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.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader.smali index 6110c704c4..6c6a225c44 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserProfileHeader.smali @@ -782,7 +782,7 @@ const/4 v5, 0x0 - const v2, 0x7f120d65 + const v2, 0x7f120d66 invoke-virtual {p0, v2}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String; @@ -831,7 +831,7 @@ const/4 v5, 0x0 - const v2, 0x7f120acb + const v2, 0x7f120acc invoke-virtual {p0, v2}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String; @@ -880,7 +880,7 @@ const/4 v5, 0x0 - const v2, 0x7f12079e + const v2, 0x7f12079f invoke-virtual {p0, v2}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String; @@ -911,7 +911,7 @@ move-result v1 - const v2, 0x7f1207af + const v2, 0x7f1207b0 const/4 v3, 0x0 @@ -943,7 +943,7 @@ move-result v7 - const v5, 0x7f1207a6 + const v5, 0x7f1207a7 invoke-virtual {p0, v5}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String; @@ -1008,7 +1008,7 @@ move-result v7 - const v5, 0x7f1207a7 + const v5, 0x7f1207a8 invoke-virtual {p0, v5}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String; @@ -1073,7 +1073,7 @@ move-result v7 - const p2, 0x7f1207a8 + const p2, 0x7f1207a9 invoke-virtual {p0, p2}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String; @@ -1128,7 +1128,7 @@ const/4 v8, 0x0 - const v1, 0x7f1202bc + const v1, 0x7f1202bd invoke-virtual {p0, v1}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String; @@ -1177,7 +1177,7 @@ const/4 v8, 0x0 - const v2, 0x7f120477 + const v2, 0x7f120478 invoke-virtual {p0, v2}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String; @@ -1216,13 +1216,13 @@ const/4 v8, 0x0 - const v1, 0x7f120b8b + const v1, 0x7f120b8c invoke-virtual {p0, v1}, Lcom/discord/widgets/user/WidgetUserProfileHeader;->getString(I)Ljava/lang/String; move-result-object v9 - const v1, 0x7f120b3f + const v1, 0x7f120b40 new-array v2, v4, [Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali b/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali index ec322dc1d5..e3b26308c5 100644 --- a/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali +++ b/com.discord/smali/com/discord/widgets/user/WidgetUserStatusSheet.smali @@ -546,7 +546,7 @@ const v3, 0x7f060104 - const v4, 0x7f120d74 + const v4, 0x7f120d75 const/4 v5, 0x0 @@ -576,7 +576,7 @@ const v2, 0x7f060126 - const v3, 0x7f120d70 + const v3, 0x7f120d71 const/4 v4, 0x0 @@ -604,7 +604,7 @@ move-result-object p1 - const p2, 0x7f120d6f + const p2, 0x7f120d70 invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -612,7 +612,7 @@ const v0, 0x7f06011b - const v1, 0x7f120d6e + const v1, 0x7f120d6f invoke-direct {p0, p1, v0, v1, p2}, Lcom/discord/widgets/user/WidgetUserStatusSheet;->setupPresenceLayout(Landroid/view/ViewGroup;IILjava/lang/Integer;)V @@ -632,7 +632,7 @@ move-result-object p1 - const p2, 0x7f120d72 + const p2, 0x7f120d73 invoke-static {p2}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -640,7 +640,7 @@ const v0, 0x7f06010f - const v1, 0x7f120d71 + const v1, 0x7f120d72 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 f4d7aca9ca..07a541b6cb 100644 --- a/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerify.smali +++ b/com.discord/smali/com/discord/widgets/user/account/WidgetUserAccountVerify.smali @@ -41,7 +41,7 @@ .method private getBodyText(Landroid/content/Context;)Ljava/lang/CharSequence; .locals 1 - const v0, 0x7f120f40 + const v0, 0x7f120f41 invoke-virtual {p1, v0}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -73,7 +73,7 @@ aput-object v0, v1, v2 - const v0, 0x7f120f48 + const v0, 0x7f120f49 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 3fdfbce309..910e45a69a 100644 --- a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate.smali +++ b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailUpdate.smali @@ -519,7 +519,7 @@ if-eqz p1, :cond_0 - const p1, 0x7f12032a + const p1, 0x7f12032b 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 19f624f6c0..4aa3e9398b 100644 --- a/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify.smali +++ b/com.discord/smali/com/discord/widgets/user/email/WidgetUserEmailVerify.smali @@ -67,7 +67,7 @@ move-result-object p1 - const v1, 0x7f120b6b + const v1, 0x7f120b6c invoke-static {p1, v1, v0}, Lcom/discord/app/f;->a(Landroid/content/Context;II)V @@ -242,7 +242,7 @@ aput-object p1, v0, v1 - const p1, 0x7f120f42 + const p1, 0x7f120f43 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 b6ae5e5f82..ae3719b814 100644 --- a/com.discord/smali/com/discord/widgets/user/search/ViewGlobalSearchItem.smali +++ b/com.discord/smali/com/discord/widgets/user/search/ViewGlobalSearchItem.smali @@ -1094,7 +1094,7 @@ move-result-object v2 - const v4, 0x7f1205a0 + const v4, 0x7f1205a1 invoke-virtual {v2, v4}, 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 182f044b5b..d5ab1ba630 100644 --- a/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch.smali +++ b/com.discord/smali/com/discord/widgets/user/search/WidgetGlobalSearch.smali @@ -1148,7 +1148,7 @@ new-array v2, v1, [Lkotlin/Pair; - const v3, 0x7f120f34 + const v3, 0x7f120f35 invoke-virtual {p0, v3}, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->getString(I)Ljava/lang/String; @@ -1164,7 +1164,7 @@ aput-object v3, v2, v4 - const v3, 0x7f120de4 + const v3, 0x7f120de5 invoke-virtual {p0, v3}, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->getString(I)Ljava/lang/String; @@ -1182,7 +1182,7 @@ const/4 v3, 0x2 - const v5, 0x7f120cfa + const v5, 0x7f120cfb invoke-virtual {p0, v5}, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->getString(I)Ljava/lang/String; @@ -1198,7 +1198,7 @@ sget-object v3, Lcom/discord/a/a;->wb:Lcom/discord/a/a$a; - const v3, 0x7f1204d5 + const v3, 0x7f1204d6 invoke-virtual {p0, v3}, Lcom/discord/widgets/user/search/WidgetGlobalSearch;->getString(I)Ljava/lang/String; @@ -1530,7 +1530,7 @@ move-result-object p1 - const v0, 0x7f120bc0 + const v0, 0x7f120bc1 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 c7bf14adfb..87ee4c18e7 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 @@ -1261,7 +1261,7 @@ new-instance v2, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader; - const v5, 0x7f120d85 + const v5, 0x7f120d86 const/4 v6, 0x0 @@ -1294,7 +1294,7 @@ new-instance v13, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader; - const v7, 0x7f120bbd + const v7, 0x7f120bbe const/4 v8, 0x0 @@ -1322,7 +1322,7 @@ new-instance v11, Lcom/discord/widgets/user/search/WidgetGlobalSearchModel$ItemHeader; - const v6, 0x7f120d85 + const v6, 0x7f120d86 const/4 v7, 0x0 diff --git a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9$1.smali b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9$1.smali index 1365c09cdd..703f600132 100644 --- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9$1.smali +++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet$configureAdministrativeSection$9$1.smali @@ -66,7 +66,7 @@ move-result-object p1 - const v0, 0x7f1209aa + const v0, 0x7f1209ab invoke-static {p1, v0}, Lcom/discord/app/f;->c(Landroid/content/Context;I)V 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 27af17c6ac..7e202d7276 100644 --- a/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali +++ b/com.discord/smali/com/discord/widgets/user/usersheet/WidgetUserSheet.smali @@ -1115,7 +1115,7 @@ move-result-object v0 - const v1, 0x7f120bf8 + const v1, 0x7f120bf9 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -1167,7 +1167,7 @@ move-result-object v0 - const v1, 0x7f12090e + const v1, 0x7f12090f invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -1312,12 +1312,12 @@ if-eqz v1, :cond_8 - const v1, 0x7f120cf7 + const v1, 0x7f120cf8 goto :goto_8 :cond_8 - const v1, 0x7f120cea + const v1, 0x7f120ceb :goto_8 invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -1412,12 +1412,12 @@ if-eqz v1, :cond_b - const v1, 0x7f120cf6 + const v1, 0x7f120cf7 goto :goto_b :cond_b - const v1, 0x7f120ce7 + const v1, 0x7f120ce8 :goto_b invoke-virtual {v0, v1}, Landroid/widget/TextView;->setText(I)V @@ -2007,7 +2007,7 @@ if-eqz v10, :cond_c - const v0, 0x7f120d01 + const v0, 0x7f120d02 invoke-virtual {v11, v0}, Landroid/widget/TextView;->setText(I)V @@ -2059,7 +2059,7 @@ :cond_c move-object/from16 v18, v5 - const v0, 0x7f120bac + const v0, 0x7f120bad invoke-virtual {v11, 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 7d0947394b..b48e5c0afe 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 @@ -64,7 +64,7 @@ check-cast p1, Landroidx/fragment/app/Fragment; - const v0, 0x7f12059c + const v0, 0x7f12059d invoke-static {p1, v0}, Lcom/discord/app/f;->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 096971aa83..61bf7e4ff7 100644 --- a/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed.smali +++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetCallFailed.smali @@ -212,7 +212,7 @@ move-result-object v0 - const v1, 0x7f1202c3 + const v1, 0x7f1202c4 const/4 v2, 0x1 @@ -499,7 +499,7 @@ move-result-object p1 - const v0, 0x7f120d68 + const v0, 0x7f120d69 invoke-virtual {p0, v0}, Lcom/discord/widgets/voice/call/WidgetCallFailed;->getString(I)Ljava/lang/String; @@ -527,7 +527,7 @@ move-result-object p1 - const v0, 0x7f120a85 + const v0, 0x7f120a86 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 db15aa3b32..29afafc021 100644 --- a/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall.smali +++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetPrivateCall.smali @@ -899,7 +899,7 @@ move-result-object p1 - const v0, 0x7f120f84 + const v0, 0x7f120f85 invoke-virtual {p1, v0}, Landroid/widget/TextView;->setText(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 2a05e5fe4f..706fc05382 100644 --- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali +++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallIncoming.smali @@ -435,12 +435,12 @@ if-eqz v5, :cond_5 - const v5, 0x7f120825 + const v5, 0x7f120826 goto :goto_2 :cond_5 - const v5, 0x7f120822 + const v5, 0x7f120823 :goto_2 invoke-virtual {v0, v5}, Landroid/widget/TextView;->setText(I)V @@ -455,12 +455,12 @@ if-eqz v5, :cond_6 - const v5, 0x7f120f65 + const v5, 0x7f120f66 goto :goto_3 :cond_6 - const v5, 0x7f120f75 + const v5, 0x7f120f76 :goto_3 invoke-virtual {v0, v5}, Landroid/widget/TextView;->setText(I)V @@ -538,12 +538,12 @@ if-eqz v0, :cond_9 - const v0, 0x7f12037d + const v0, 0x7f12037e goto :goto_5 :cond_9 - const v0, 0x7f12037e + const v0, 0x7f12037f :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 df718bf6fe..b9b9cfb978 100644 --- a/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali +++ b/com.discord/smali/com/discord/widgets/voice/call/WidgetVoiceCallInline.smali @@ -92,7 +92,7 @@ iget-object v0, p0, Lcom/discord/widgets/voice/call/WidgetVoiceCallInline;->voiceOngoingUserCountLabel:Landroid/widget/TextView; - const v1, 0x7f120a89 + const v1, 0x7f120a8a const/4 v2, 0x1 @@ -543,37 +543,37 @@ packed-switch p0, :pswitch_data_0 - const p0, 0x7f12039a + const p0, 0x7f12039b return p0 :pswitch_0 - const p0, 0x7f1203a0 + const p0, 0x7f1203a1 return p0 :pswitch_1 - const p0, 0x7f12039d + const p0, 0x7f12039e return p0 :pswitch_2 - const p0, 0x7f120396 - - return p0 - - :pswitch_3 const p0, 0x7f120397 return p0 + :pswitch_3 + const p0, 0x7f120398 + + return p0 + :pswitch_4 - const p0, 0x7f12039c + const p0, 0x7f12039d return p0 :pswitch_5 - const p0, 0x7f120399 + const p0, 0x7f12039a return p0 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 ba3cb93bc6..3f93281f37 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 @@ -52,7 +52,7 @@ move-result-object p1 - const v0, 0x7f120f36 + const v0, 0x7f120f37 invoke-static {p1, v0}, Lcom/discord/app/f;->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 8856fd307a..a40468e109 100644 --- a/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali +++ b/com.discord/smali/com/discord/widgets/voice/fullscreen/VoiceControlsView.smali @@ -894,12 +894,12 @@ if-eqz v3, :cond_1 - const v3, 0x7f120e79 + const v3, 0x7f120e7a goto :goto_1 :cond_1 - const v3, 0x7f1209ac + const v3, 0x7f1209ad :goto_1 invoke-virtual {v1, v3}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -952,12 +952,12 @@ if-eqz p1, :cond_2 - const p1, 0x7f120e72 + const p1, 0x7f120e73 goto :goto_2 :cond_2 - const p1, 0x7f1203fc + const p1, 0x7f1203fd :goto_2 invoke-virtual {v1, p1}, Landroid/content/Context;->getString(I)Ljava/lang/String; @@ -1021,7 +1021,7 @@ move-result-object v0 - const v4, 0x7f12037e + const v4, 0x7f12037f invoke-virtual {v0, v4}, Landroid/widget/Button;->setText(I)V @@ -1044,7 +1044,7 @@ move-result-object v0 - const v4, 0x7f120e66 + const v4, 0x7f120e67 goto :goto_5 @@ -1077,7 +1077,7 @@ move-result-object v0 - const v4, 0x7f12030b + const v4, 0x7f12030c invoke-virtual {v0, v4}, Landroid/widget/Button;->setText(I)V @@ -1085,7 +1085,7 @@ move-result-object v0 - const v4, 0x7f12030a + const v4, 0x7f12030b :goto_5 invoke-direct {p0, v0, v4}, Lcom/discord/widgets/voice/fullscreen/VoiceControlsView;->disableWithToast(Landroid/widget/Button;I)V @@ -1117,7 +1117,7 @@ move-result-object v3 - const v4, 0x7f120a89 + const v4, 0x7f120a8a new-array v1, v1, [Ljava/lang/Object; diff --git a/com.discord/smali/com/discord/widgets/voice/model/CallModel$Companion.smali b/com.discord/smali/com/discord/widgets/voice/model/CallModel$Companion.smali index 3705d6ab9e..96e94ee06c 100644 --- a/com.discord/smali/com/discord/widgets/voice/model/CallModel$Companion.smali +++ b/com.discord/smali/com/discord/widgets/voice/model/CallModel$Companion.smali @@ -191,7 +191,7 @@ new-instance v3, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader; - const v4, 0x7f120821 + const v4, 0x7f120822 invoke-static {v4}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; @@ -270,7 +270,7 @@ new-instance v0, Lcom/discord/widgets/voice/fullscreen/CallParticipantsAdapter$ListItemHeader; - const v3, 0x7f120a0c + const v3, 0x7f120a0d invoke-static {v3}, Ljava/lang/Integer;->valueOf(I)Ljava/lang/Integer; diff --git a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.smali b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.smali index 9ce5c52a6c..aa9a9257e5 100644 --- a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.smali +++ b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings$saveChannel$1.smali @@ -66,7 +66,7 @@ move-result-object p1 - const v0, 0x7f120315 + const v0, 0x7f120316 invoke-static {p1, v0}, Lcom/discord/app/f;->c(Landroid/content/Context;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 b4cf03a91f..3c1b7163eb 100644 --- a/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali +++ b/com.discord/smali/com/discord/widgets/voice/settings/WidgetVoiceChannelSettings.smali @@ -516,7 +516,7 @@ invoke-static {p0, v3, v2, v0, v2}, Lcom/discord/app/AppFragment;->setActionBarDisplayHomeAsUpEnabled$default(Lcom/discord/app/AppFragment;ZLjava/lang/Integer;ILjava/lang/Object;)Landroidx/appcompat/widget/Toolbar; - const v0, 0x7f120314 + const v0, 0x7f120315 invoke-virtual {p0, v0}, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->setActionBarTitle(I)Lkotlin/Unit; @@ -598,7 +598,7 @@ move-result-object v0 - const v2, 0x7f1204f9 + const v2, 0x7f1204fa invoke-virtual {p0, v2}, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->getString(I)Ljava/lang/String; @@ -682,7 +682,7 @@ move-result-object v2 - const v4, 0x7f1204e8 + const v4, 0x7f1204e9 new-array v1, v1, [Ljava/lang/Object; @@ -927,7 +927,7 @@ aput-object p1, v0, v3 - const p1, 0x7f12040e + const p1, 0x7f12040f invoke-virtual {p0, p1, v0}, Lcom/discord/widgets/voice/settings/WidgetVoiceChannelSettings;->getString(I[Ljava/lang/Object;)Ljava/lang/String; @@ -1121,7 +1121,7 @@ move-result-object p1 - const v0, 0x7f120a07 + const v0, 0x7f120a08 invoke-virtual {p1, v0}, Landroid/content/res/Resources;->getString(I)Ljava/lang/String; diff --git a/com.discord/smali/com/facebook/drawee/R$a.smali b/com.discord/smali/com/facebook/drawee/R$a.smali index 85de27f5e7..045fabb7dd 100644 --- a/com.discord/smali/com/facebook/drawee/R$a.smali +++ b/com.discord/smali/com/facebook/drawee/R$a.smali @@ -193,7 +193,7 @@ 0x7f0402be 0x7f0402bf 0x7f0402c0 - 0x7f0403bc + 0x7f0403be .end array-data :array_1 @@ -228,7 +228,7 @@ 0x7f0402be 0x7f0402bf 0x7f0402c0 - 0x7f0403bc + 0x7f0403be .end array-data .end method 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 d881f65b3a..58c42c536c 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 @@ -14,39 +14,39 @@ # static fields -.field public static final common_google_play_services_enable_button:I = 0x7f12035a +.field public static final common_google_play_services_enable_button:I = 0x7f12035b -.field public static final common_google_play_services_enable_text:I = 0x7f12035b +.field public static final common_google_play_services_enable_text:I = 0x7f12035c -.field public static final common_google_play_services_enable_title:I = 0x7f12035c +.field public static final common_google_play_services_enable_title:I = 0x7f12035d -.field public static final common_google_play_services_install_button:I = 0x7f12035d +.field public static final common_google_play_services_install_button:I = 0x7f12035e -.field public static final common_google_play_services_install_text:I = 0x7f12035e +.field public static final common_google_play_services_install_text:I = 0x7f12035f -.field public static final common_google_play_services_install_title:I = 0x7f12035f +.field public static final common_google_play_services_install_title:I = 0x7f120360 -.field public static final common_google_play_services_notification_channel_name:I = 0x7f120360 +.field public static final common_google_play_services_notification_channel_name:I = 0x7f120361 -.field public static final common_google_play_services_notification_ticker:I = 0x7f120361 +.field public static final common_google_play_services_notification_ticker:I = 0x7f120362 -.field public static final common_google_play_services_unsupported_text:I = 0x7f120363 +.field public static final common_google_play_services_unsupported_text:I = 0x7f120364 -.field public static final common_google_play_services_update_button:I = 0x7f120364 +.field public static final common_google_play_services_update_button:I = 0x7f120365 -.field public static final common_google_play_services_update_text:I = 0x7f120365 +.field public static final common_google_play_services_update_text:I = 0x7f120366 -.field public static final common_google_play_services_update_title:I = 0x7f120366 +.field public static final common_google_play_services_update_title:I = 0x7f120367 -.field public static final common_google_play_services_updating_text:I = 0x7f120367 +.field public static final common_google_play_services_updating_text:I = 0x7f120368 -.field public static final common_google_play_services_wear_update_text:I = 0x7f120368 +.field public static final common_google_play_services_wear_update_text:I = 0x7f120369 -.field public static final common_open_on_phone:I = 0x7f120369 +.field public static final common_open_on_phone:I = 0x7f12036a -.field public static final common_signin_button_text:I = 0x7f12036a +.field public static final common_signin_button_text:I = 0x7f12036b -.field public static final common_signin_button_text_long:I = 0x7f12036b +.field public static final common_signin_button_text_long:I = 0x7f12036c # 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 933c092886..6906956a34 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 @@ -14,7 +14,7 @@ # static fields -.field public static final common_google_play_services_unknown_issue:I = 0x7f120362 +.field public static final common_google_play_services_unknown_issue:I = 0x7f120363 # direct methods diff --git a/com.discord/smali/kotlin/a/o.smali b/com.discord/smali/kotlin/a/o.smali index 389f49e4d4..fbc153bb04 100644 --- a/com.discord/smali/kotlin/a/o.smali +++ b/com.discord/smali/kotlin/a/o.smali @@ -36,7 +36,7 @@ .end method .method public static final a(Ljava/lang/Iterable;Ljava/lang/Iterable;)Ljava/util/Collection; - .locals 2 + .locals 1 .annotation system Ldalvik/annotation/Signature; value = { "size()I + invoke-static {p1}, Lkotlin/a/o;->i(Ljava/util/Collection;)Z move-result v0 - if-le v0, v1, :cond_2 - - instance-of v0, p1, Ljava/util/ArrayList; - - if-eqz v0, :cond_2 - - const/4 v0, 0x1 - - goto :goto_0 - - :cond_2 - const/4 v0, 0x0 - - :goto_0 - if-nez v0, :cond_3 + if-nez v0, :cond_2 return-object p1 - :cond_3 + :cond_2 invoke-static {p0}, Lkotlin/a/l;->g(Ljava/lang/Iterable;)Ljava/util/HashSet; move-result-object p0 @@ -126,3 +112,37 @@ return-object p0 .end method + +.method private static final i(Ljava/util/Collection;)Z + .locals 2 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Ljava/util/Collection<", + "+TT;>;)Z" + } + .end annotation + + invoke-interface {p0}, Ljava/util/Collection;->size()I + + move-result v0 + + const/4 v1, 0x2 + + if-le v0, v1, :cond_0 + + instance-of p0, p0, Ljava/util/ArrayList; + + if-eqz p0, :cond_0 + + const/4 p0, 0x1 + + return p0 + + :cond_0 + const/4 p0, 0x0 + + return p0 +.end method diff --git a/com.discord/smali/kotlin/a/v.smali b/com.discord/smali/kotlin/a/v.smali index e013c06664..544b549c0b 100644 --- a/com.discord/smali/kotlin/a/v.smali +++ b/com.discord/smali/kotlin/a/v.smali @@ -1677,7 +1677,7 @@ packed-switch v1, :pswitch_data_0 - invoke-static {v0}, Lkotlin/a/l;->j(Ljava/util/Collection;)Ljava/util/List; + invoke-static {v0}, Lkotlin/a/l;->k(Ljava/util/Collection;)Ljava/util/List; move-result-object p0 @@ -1765,7 +1765,7 @@ check-cast p0, Ljava/util/Collection; - invoke-static {p0}, Lkotlin/a/l;->j(Ljava/util/Collection;)Ljava/util/List; + invoke-static {p0}, Lkotlin/a/l;->k(Ljava/util/Collection;)Ljava/util/List; move-result-object p0 @@ -1787,89 +1787,6 @@ return-object p0 .end method -.method public static final i(Ljava/util/Collection;)[I - .locals 4 - .annotation system Ldalvik/annotation/Signature; - value = { - "(", - "Ljava/util/Collection<", - "Ljava/lang/Integer;", - ">;)[I" - } - .end annotation - - const-string v0, "receiver$0" - - invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V - - invoke-interface {p0}, Ljava/util/Collection;->size()I - - move-result v0 - - new-array v0, v0, [I - - invoke-interface {p0}, Ljava/util/Collection;->iterator()Ljava/util/Iterator; - - move-result-object p0 - - const/4 v1, 0x0 - - :goto_0 - invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z - - move-result v2 - - if-eqz v2, :cond_0 - - invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object; - - move-result-object v2 - - check-cast v2, Ljava/lang/Number; - - invoke-virtual {v2}, Ljava/lang/Number;->intValue()I - - move-result v2 - - add-int/lit8 v3, v1, 0x1 - - aput v2, v0, v1 - - move v1, v3 - - goto :goto_0 - - :cond_0 - return-object v0 -.end method - -.method public static final j(Ljava/util/Collection;)Ljava/util/List; - .locals 1 - .annotation system Ldalvik/annotation/Signature; - value = { - "(", - "Ljava/util/Collection<", - "+TT;>;)", - "Ljava/util/List<", - "TT;>;" - } - .end annotation - - const-string v0, "receiver$0" - - invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V - - new-instance v0, Ljava/util/ArrayList; - - invoke-direct {v0, p0}, Ljava/util/ArrayList;->(Ljava/util/Collection;)V - - check-cast v0, Ljava/util/List; - - return-object v0 -.end method - .method public static final j(Ljava/lang/Iterable;)Ljava/util/Set; .locals 2 .annotation system Ldalvik/annotation/Signature; @@ -1949,6 +1866,62 @@ .end packed-switch .end method +.method public static final j(Ljava/util/Collection;)[I + .locals 4 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Ljava/util/Collection<", + "Ljava/lang/Integer;", + ">;)[I" + } + .end annotation + + const-string v0, "receiver$0" + + invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-interface {p0}, Ljava/util/Collection;->size()I + + move-result v0 + + new-array v0, v0, [I + + invoke-interface {p0}, Ljava/util/Collection;->iterator()Ljava/util/Iterator; + + move-result-object p0 + + const/4 v1, 0x0 + + :goto_0 + invoke-interface {p0}, Ljava/util/Iterator;->hasNext()Z + + move-result v2 + + if-eqz v2, :cond_0 + + invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object; + + move-result-object v2 + + check-cast v2, Ljava/lang/Number; + + invoke-virtual {v2}, Ljava/lang/Number;->intValue()I + + move-result v2 + + add-int/lit8 v3, v1, 0x1 + + aput v2, v0, v1 + + move v1, v3 + + goto :goto_0 + + :cond_0 + return-object v0 +.end method + .method public static final k(Ljava/lang/Iterable;)Ljava/util/List; .locals 1 .annotation system Ldalvik/annotation/Signature; @@ -1980,6 +1953,33 @@ return-object p0 .end method +.method public static final k(Ljava/util/Collection;)Ljava/util/List; + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Ljava/util/Collection<", + "+TT;>;)", + "Ljava/util/List<", + "TT;>;" + } + .end annotation + + const-string v0, "receiver$0" + + invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V + + new-instance v0, Ljava/util/ArrayList; + + invoke-direct {v0, p0}, Ljava/util/ArrayList;->(Ljava/util/Collection;)V + + check-cast v0, Ljava/util/List; + + return-object v0 +.end method + .method public static final l(Ljava/lang/Iterable;)Ljava/util/Set; .locals 1 .annotation system Ldalvik/annotation/Signature; diff --git a/com.discord/smali/okhttp3/internal/c.smali b/com.discord/smali/okhttp3/internal/c.smali index cc2e73d4a6..0986e15f0b 100644 --- a/com.discord/smali/okhttp3/internal/c.smali +++ b/com.discord/smali/okhttp3/internal/c.smali @@ -2179,7 +2179,7 @@ throw v0 .end method -.method public static s(Ljava/util/Map;)Ljava/util/Map; +.method public static u(Ljava/util/Map;)Ljava/util/Map; .locals 1 .annotation system Ldalvik/annotation/Signature; value = { diff --git a/com.discord/smali/okhttp3/w.smali b/com.discord/smali/okhttp3/w.smali index e3a93e4afb..a5b7f8fbb1 100644 --- a/com.discord/smali/okhttp3/w.smali +++ b/com.discord/smali/okhttp3/w.smali @@ -65,7 +65,7 @@ iget-object p1, p1, Lokhttp3/w$a;->cak:Ljava/util/Map; - invoke-static {p1}, Lokhttp3/internal/c;->s(Ljava/util/Map;)Ljava/util/Map; + invoke-static {p1}, Lokhttp3/internal/c;->u(Ljava/util/Map;)Ljava/util/Map; move-result-object p1 diff --git a/com.discord/smali_classes2/com/google/android/material/R$attr.smali b/com.discord/smali_classes2/com/google/android/material/R$attr.smali index 287825541f..deb5926fc1 100644 --- a/com.discord/smali_classes2/com/google/android/material/R$attr.smali +++ b/com.discord/smali_classes2/com/google/android/material/R$attr.smali @@ -882,91 +882,91 @@ .field public static final theme:I = 0x7f04033b -.field public static final thickness:I = 0x7f040387 +.field public static final thickness:I = 0x7f040389 -.field public static final thumbTextPadding:I = 0x7f040388 +.field public static final thumbTextPadding:I = 0x7f04038a -.field public static final thumbTint:I = 0x7f040389 +.field public static final thumbTint:I = 0x7f04038b -.field public static final thumbTintMode:I = 0x7f04038a +.field public static final thumbTintMode:I = 0x7f04038c -.field public static final tickMark:I = 0x7f04038b +.field public static final tickMark:I = 0x7f04038d -.field public static final tickMarkTint:I = 0x7f04038c +.field public static final tickMarkTint:I = 0x7f04038e -.field public static final tickMarkTintMode:I = 0x7f04038d +.field public static final tickMarkTintMode:I = 0x7f04038f -.field public static final tint:I = 0x7f04038e +.field public static final tint:I = 0x7f040390 -.field public static final tintMode:I = 0x7f04038f +.field public static final tintMode:I = 0x7f040391 -.field public static final title:I = 0x7f040390 +.field public static final title:I = 0x7f040392 -.field public static final titleEnabled:I = 0x7f040391 +.field public static final titleEnabled:I = 0x7f040393 -.field public static final titleMargin:I = 0x7f040392 +.field public static final titleMargin:I = 0x7f040394 -.field public static final titleMarginBottom:I = 0x7f040393 +.field public static final titleMarginBottom:I = 0x7f040395 -.field public static final titleMarginEnd:I = 0x7f040394 +.field public static final titleMarginEnd:I = 0x7f040396 -.field public static final titleMarginStart:I = 0x7f040395 +.field public static final titleMarginStart:I = 0x7f040397 -.field public static final titleMarginTop:I = 0x7f040396 +.field public static final titleMarginTop:I = 0x7f040398 -.field public static final titleMargins:I = 0x7f040397 +.field public static final titleMargins:I = 0x7f040399 -.field public static final titleTextAppearance:I = 0x7f040398 +.field public static final titleTextAppearance:I = 0x7f04039a -.field public static final titleTextColor:I = 0x7f040399 +.field public static final titleTextColor:I = 0x7f04039b -.field public static final titleTextStyle:I = 0x7f04039a +.field public static final titleTextStyle:I = 0x7f04039c -.field public static final toolbarId:I = 0x7f04039b +.field public static final toolbarId:I = 0x7f04039d -.field public static final toolbarNavigationButtonStyle:I = 0x7f04039c +.field public static final toolbarNavigationButtonStyle:I = 0x7f04039e -.field public static final toolbarStyle:I = 0x7f04039d +.field public static final toolbarStyle:I = 0x7f04039f -.field public static final tooltipForegroundColor:I = 0x7f04039e +.field public static final tooltipForegroundColor:I = 0x7f0403a0 -.field public static final tooltipFrameBackground:I = 0x7f04039f +.field public static final tooltipFrameBackground:I = 0x7f0403a1 -.field public static final tooltipText:I = 0x7f0403a0 +.field public static final tooltipText:I = 0x7f0403a2 -.field public static final track:I = 0x7f0403a1 +.field public static final track:I = 0x7f0403a3 -.field public static final trackTint:I = 0x7f0403a2 +.field public static final trackTint:I = 0x7f0403a4 -.field public static final trackTintMode:I = 0x7f0403a3 +.field public static final trackTintMode:I = 0x7f0403a5 -.field public static final ttcIndex:I = 0x7f0403a4 +.field public static final ttcIndex:I = 0x7f0403a6 -.field public static final useCompatPadding:I = 0x7f0403b8 +.field public static final useCompatPadding:I = 0x7f0403ba -.field public static final viewInflaterClass:I = 0x7f0403bd +.field public static final viewInflaterClass:I = 0x7f0403bf -.field public static final voiceIcon:I = 0x7f0403be +.field public static final voiceIcon:I = 0x7f0403c0 -.field public static final windowActionBar:I = 0x7f0403c0 +.field public static final windowActionBar:I = 0x7f0403c2 -.field public static final windowActionBarOverlay:I = 0x7f0403c1 +.field public static final windowActionBarOverlay:I = 0x7f0403c3 -.field public static final windowActionModeOverlay:I = 0x7f0403c2 +.field public static final windowActionModeOverlay:I = 0x7f0403c4 -.field public static final windowFixedHeightMajor:I = 0x7f0403c3 +.field public static final windowFixedHeightMajor:I = 0x7f0403c5 -.field public static final windowFixedHeightMinor:I = 0x7f0403c4 +.field public static final windowFixedHeightMinor:I = 0x7f0403c6 -.field public static final windowFixedWidthMajor:I = 0x7f0403c5 +.field public static final windowFixedWidthMajor:I = 0x7f0403c7 -.field public static final windowFixedWidthMinor:I = 0x7f0403c6 +.field public static final windowFixedWidthMinor:I = 0x7f0403c8 -.field public static final windowMinWidthMajor:I = 0x7f0403c7 +.field public static final windowMinWidthMajor:I = 0x7f0403c9 -.field public static final windowMinWidthMinor:I = 0x7f0403c8 +.field public static final windowMinWidthMinor:I = 0x7f0403ca -.field public static final windowNoTitle:I = 0x7f0403c9 +.field public static final windowNoTitle:I = 0x7f0403cb # 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 504d3f6197..cc887877a6 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 @@ -94,33 +94,33 @@ .field public static final appbar_scrolling_view_behavior:I = 0x7f12009a -.field public static final bottom_sheet_behavior:I = 0x7f1202a7 +.field public static final bottom_sheet_behavior:I = 0x7f1202a8 -.field public static final character_counter_content_description:I = 0x7f12031f +.field public static final character_counter_content_description:I = 0x7f120320 -.field public static final character_counter_pattern:I = 0x7f120320 +.field public static final character_counter_pattern:I = 0x7f120321 -.field public static final fab_transformation_scrim_behavior:I = 0x7f1204c7 +.field public static final fab_transformation_scrim_behavior:I = 0x7f1204c8 -.field public static final fab_transformation_sheet_behavior:I = 0x7f1204c8 +.field public static final fab_transformation_sheet_behavior:I = 0x7f1204c9 -.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120791 +.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120792 -.field public static final mtrl_chip_close_icon_content_description:I = 0x7f1209ab +.field public static final mtrl_chip_close_icon_content_description:I = 0x7f1209ac -.field public static final password_toggle_content_description:I = 0x7f120ad6 +.field public static final password_toggle_content_description:I = 0x7f120ad7 -.field public static final path_password_eye:I = 0x7f120ad9 +.field public static final path_password_eye:I = 0x7f120ada -.field public static final path_password_eye_mask_strike_through:I = 0x7f120ada +.field public static final path_password_eye_mask_strike_through:I = 0x7f120adb -.field public static final path_password_eye_mask_visible:I = 0x7f120adb +.field public static final path_password_eye_mask_visible:I = 0x7f120adc -.field public static final path_password_strike_through:I = 0x7f120adc +.field public static final path_password_strike_through:I = 0x7f120add -.field public static final search_menu_title:I = 0x7f120cbe +.field public static final search_menu_title:I = 0x7f120cbf -.field public static final status_bar_notification_info_overflow:I = 0x7f120d6d +.field public static final status_bar_notification_info_overflow:I = 0x7f120d6e # direct methods diff --git a/com.discord/smali_classes2/com/google/android/material/R$styleable.smali b/com.discord/smali_classes2/com/google/android/material/R$styleable.smali index 0fc5cbf311..8bffcb024f 100644 --- a/com.discord/smali_classes2/com/google/android/material/R$styleable.smali +++ b/com.discord/smali_classes2/com/google/android/material/R$styleable.smali @@ -1926,8 +1926,8 @@ 0x7f0402a3 0x7f0402fb 0x7f0402fe - 0x7f040390 - 0x7f04039a + 0x7f040392 + 0x7f04039c .end array-data :array_1 @@ -1937,7 +1937,7 @@ 0x7f04009a 0x7f04013e 0x7f0402fe - 0x7f04039a + 0x7f04039c .end array-data :array_2 @@ -1986,16 +1986,16 @@ .array-data 4 0x1010119 0x7f0402ed - 0x7f04038e - 0x7f04038f + 0x7f040390 + 0x7f040391 .end array-data :array_8 .array-data 4 0x1010142 - 0x7f04038b - 0x7f04038c 0x7f04038d + 0x7f04038e + 0x7f04038f .end array-data :array_9 @@ -2132,13 +2132,11 @@ 0x7f040333 0x7f040336 0x7f040337 - 0x7f04039c - 0x7f04039d 0x7f04039e 0x7f04039f - 0x7f0403bd - 0x7f0403c0 - 0x7f0403c1 + 0x7f0403a0 + 0x7f0403a1 + 0x7f0403bf 0x7f0403c2 0x7f0403c3 0x7f0403c4 @@ -2147,6 +2145,8 @@ 0x7f0403c7 0x7f0403c8 0x7f0403c9 + 0x7f0403ca + 0x7f0403cb .end array-data :array_c @@ -2261,9 +2261,9 @@ 0x7f0402d0 0x7f0402d2 0x7f0402f5 - 0x7f040390 - 0x7f040391 - 0x7f04039b + 0x7f040392 + 0x7f040393 + 0x7f04039d .end array-data :array_13 @@ -2318,7 +2318,7 @@ 0x7f0400f9 0x7f040138 0x7f0402e9 - 0x7f040387 + 0x7f040389 .end array-data :array_1a @@ -2335,7 +2335,7 @@ 0x7f040267 0x7f0402b2 0x7f0402e0 - 0x7f0403b8 + 0x7f0403ba .end array-data :array_1b @@ -2367,7 +2367,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data :array_1e @@ -2500,7 +2500,7 @@ 0x7f0401ad 0x7f04024f 0x7f0402db - 0x7f0403a0 + 0x7f0403a2 .end array-data :array_27 @@ -2578,7 +2578,7 @@ 0x7f0402d4 0x7f0402fa 0x7f0402ff - 0x7f0403be + 0x7f0403c0 .end array-data :array_2d @@ -2613,12 +2613,12 @@ 0x7f040300 0x7f040301 0x7f040303 - 0x7f040388 - 0x7f040389 0x7f04038a - 0x7f0403a1 - 0x7f0403a2 + 0x7f04038b + 0x7f04038c 0x7f0403a3 + 0x7f0403a4 + 0x7f0403a5 .end array-data :array_31 @@ -2735,15 +2735,15 @@ 0x7f0402fb 0x7f0402fc 0x7f0402fd - 0x7f040390 0x7f040392 - 0x7f040393 0x7f040394 0x7f040395 0x7f040396 0x7f040397 0x7f040398 0x7f040399 + 0x7f04039a + 0x7f04039b .end array-data :array_37 diff --git a/com.discord/smali_classes2/com/google/firebase/messaging/R$a.smali b/com.discord/smali_classes2/com/google/firebase/messaging/R$a.smali index 44661e07f5..f3105bbac5 100644 --- a/com.discord/smali_classes2/com/google/firebase/messaging/R$a.smali +++ b/com.discord/smali_classes2/com/google/firebase/messaging/R$a.smali @@ -14,7 +14,7 @@ # static fields -.field public static final fcm_fallback_notification_channel_label:I = 0x7f1204ca +.field public static final fcm_fallback_notification_channel_label:I = 0x7f1204cb # direct methods diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/R$b.smali b/com.discord/smali_classes2/com/lytefast/flexinput/R$b.smali index 072592f4ad..3dd080fb08 100644 --- a/com.discord/smali_classes2/com/lytefast/flexinput/R$b.smali +++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$b.smali @@ -1082,93 +1082,93 @@ .field public static final theme:I = 0x7f04033b -.field public static final thickness:I = 0x7f040387 +.field public static final thickness:I = 0x7f040389 -.field public static final thumbTextPadding:I = 0x7f040388 +.field public static final thumbTextPadding:I = 0x7f04038a -.field public static final thumbTint:I = 0x7f040389 +.field public static final thumbTint:I = 0x7f04038b -.field public static final thumbTintMode:I = 0x7f04038a +.field public static final thumbTintMode:I = 0x7f04038c -.field public static final tickMark:I = 0x7f04038b +.field public static final tickMark:I = 0x7f04038d -.field public static final tickMarkTint:I = 0x7f04038c +.field public static final tickMarkTint:I = 0x7f04038e -.field public static final tickMarkTintMode:I = 0x7f04038d +.field public static final tickMarkTintMode:I = 0x7f04038f -.field public static final tint:I = 0x7f04038e +.field public static final tint:I = 0x7f040390 -.field public static final tintMode:I = 0x7f04038f +.field public static final tintMode:I = 0x7f040391 -.field public static final title:I = 0x7f040390 +.field public static final title:I = 0x7f040392 -.field public static final titleEnabled:I = 0x7f040391 +.field public static final titleEnabled:I = 0x7f040393 -.field public static final titleMargin:I = 0x7f040392 +.field public static final titleMargin:I = 0x7f040394 -.field public static final titleMarginBottom:I = 0x7f040393 +.field public static final titleMarginBottom:I = 0x7f040395 -.field public static final titleMarginEnd:I = 0x7f040394 +.field public static final titleMarginEnd:I = 0x7f040396 -.field public static final titleMarginStart:I = 0x7f040395 +.field public static final titleMarginStart:I = 0x7f040397 -.field public static final titleMarginTop:I = 0x7f040396 +.field public static final titleMarginTop:I = 0x7f040398 -.field public static final titleMargins:I = 0x7f040397 +.field public static final titleMargins:I = 0x7f040399 -.field public static final titleTextAppearance:I = 0x7f040398 +.field public static final titleTextAppearance:I = 0x7f04039a -.field public static final titleTextColor:I = 0x7f040399 +.field public static final titleTextColor:I = 0x7f04039b -.field public static final titleTextStyle:I = 0x7f04039a +.field public static final titleTextStyle:I = 0x7f04039c -.field public static final toolbarId:I = 0x7f04039b +.field public static final toolbarId:I = 0x7f04039d -.field public static final toolbarNavigationButtonStyle:I = 0x7f04039c +.field public static final toolbarNavigationButtonStyle:I = 0x7f04039e -.field public static final toolbarStyle:I = 0x7f04039d +.field public static final toolbarStyle:I = 0x7f04039f -.field public static final tooltipForegroundColor:I = 0x7f04039e +.field public static final tooltipForegroundColor:I = 0x7f0403a0 -.field public static final tooltipFrameBackground:I = 0x7f04039f +.field public static final tooltipFrameBackground:I = 0x7f0403a1 -.field public static final tooltipText:I = 0x7f0403a0 +.field public static final tooltipText:I = 0x7f0403a2 -.field public static final track:I = 0x7f0403a1 +.field public static final track:I = 0x7f0403a3 -.field public static final trackTint:I = 0x7f0403a2 +.field public static final trackTint:I = 0x7f0403a4 -.field public static final trackTintMode:I = 0x7f0403a3 +.field public static final trackTintMode:I = 0x7f0403a5 -.field public static final ttcIndex:I = 0x7f0403a4 +.field public static final ttcIndex:I = 0x7f0403a6 -.field public static final useCompatPadding:I = 0x7f0403b8 +.field public static final useCompatPadding:I = 0x7f0403ba -.field public static final viewAspectRatio:I = 0x7f0403bc +.field public static final viewAspectRatio:I = 0x7f0403be -.field public static final viewInflaterClass:I = 0x7f0403bd +.field public static final viewInflaterClass:I = 0x7f0403bf -.field public static final voiceIcon:I = 0x7f0403be +.field public static final voiceIcon:I = 0x7f0403c0 -.field public static final windowActionBar:I = 0x7f0403c0 +.field public static final windowActionBar:I = 0x7f0403c2 -.field public static final windowActionBarOverlay:I = 0x7f0403c1 +.field public static final windowActionBarOverlay:I = 0x7f0403c3 -.field public static final windowActionModeOverlay:I = 0x7f0403c2 +.field public static final windowActionModeOverlay:I = 0x7f0403c4 -.field public static final windowFixedHeightMajor:I = 0x7f0403c3 +.field public static final windowFixedHeightMajor:I = 0x7f0403c5 -.field public static final windowFixedHeightMinor:I = 0x7f0403c4 +.field public static final windowFixedHeightMinor:I = 0x7f0403c6 -.field public static final windowFixedWidthMajor:I = 0x7f0403c5 +.field public static final windowFixedWidthMajor:I = 0x7f0403c7 -.field public static final windowFixedWidthMinor:I = 0x7f0403c6 +.field public static final windowFixedWidthMinor:I = 0x7f0403c8 -.field public static final windowMinWidthMajor:I = 0x7f0403c7 +.field public static final windowMinWidthMajor:I = 0x7f0403c9 -.field public static final windowMinWidthMinor:I = 0x7f0403c8 +.field public static final windowMinWidthMinor:I = 0x7f0403ca -.field public static final windowNoTitle:I = 0x7f0403c9 +.field public static final windowNoTitle:I = 0x7f0403cb # 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 30b51cbe44..8888ec6e76 100644 --- a/com.discord/smali_classes2/com/lytefast/flexinput/R$g.smali +++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$g.smali @@ -98,71 +98,71 @@ .field public static final appbar_scrolling_view_behavior:I = 0x7f12009a -.field public static final attachment_camera:I = 0x7f1201f5 +.field public static final attachment_camera:I = 0x7f1201f6 -.field public static final attachment_files:I = 0x7f1201f7 +.field public static final attachment_files:I = 0x7f1201f8 -.field public static final attachment_photos:I = 0x7f1201f9 +.field public static final attachment_photos:I = 0x7f1201fa -.field public static final attachments_keyboard:I = 0x7f1201fb +.field public static final attachments_keyboard:I = 0x7f1201fc -.field public static final bottom_sheet_behavior:I = 0x7f1202a7 +.field public static final bottom_sheet_behavior:I = 0x7f1202a8 -.field public static final camera_intent_result_error:I = 0x7f1202c8 +.field public static final camera_intent_result_error:I = 0x7f1202c9 -.field public static final camera_permission_denied_msg:I = 0x7f1202ce +.field public static final camera_permission_denied_msg:I = 0x7f1202cf -.field public static final camera_switched:I = 0x7f1202d1 +.field public static final camera_switched:I = 0x7f1202d2 -.field public static final camera_unknown_error:I = 0x7f1202d3 +.field public static final camera_unknown_error:I = 0x7f1202d4 -.field public static final character_counter_content_description:I = 0x7f12031f +.field public static final character_counter_content_description:I = 0x7f120320 -.field public static final character_counter_pattern:I = 0x7f120320 +.field public static final character_counter_pattern:I = 0x7f120321 -.field public static final choose_an_application:I = 0x7f120329 +.field public static final choose_an_application:I = 0x7f12032a -.field public static final clear_attachments:I = 0x7f120332 +.field public static final clear_attachments:I = 0x7f120333 -.field public static final emoji_keyboard_toggle:I = 0x7f120497 +.field public static final emoji_keyboard_toggle:I = 0x7f120498 -.field public static final fab_transformation_scrim_behavior:I = 0x7f1204c7 +.field public static final fab_transformation_scrim_behavior:I = 0x7f1204c8 -.field public static final fab_transformation_sheet_behavior:I = 0x7f1204c8 +.field public static final fab_transformation_sheet_behavior:I = 0x7f1204c9 -.field public static final files_permission_reason_msg:I = 0x7f1204d2 +.field public static final files_permission_reason_msg:I = 0x7f1204d3 -.field public static final flash_auto:I = 0x7f1204d7 +.field public static final flash_auto:I = 0x7f1204d8 -.field public static final flash_off:I = 0x7f1204d8 +.field public static final flash_off:I = 0x7f1204d9 -.field public static final flash_on:I = 0x7f1204d9 +.field public static final flash_on:I = 0x7f1204da -.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120791 +.field public static final hide_bottom_view_on_scroll_behavior:I = 0x7f120792 -.field public static final mtrl_chip_close_icon_content_description:I = 0x7f1209ab +.field public static final mtrl_chip_close_icon_content_description:I = 0x7f1209ac -.field public static final password_toggle_content_description:I = 0x7f120ad6 +.field public static final password_toggle_content_description:I = 0x7f120ad7 -.field public static final path_password_eye:I = 0x7f120ad9 +.field public static final path_password_eye:I = 0x7f120ada -.field public static final path_password_eye_mask_strike_through:I = 0x7f120ada +.field public static final path_password_eye_mask_strike_through:I = 0x7f120adb -.field public static final path_password_eye_mask_visible:I = 0x7f120adb +.field public static final path_password_eye_mask_visible:I = 0x7f120adc -.field public static final path_password_strike_through:I = 0x7f120adc +.field public static final path_password_strike_through:I = 0x7f120add -.field public static final request_permission_msg:I = 0x7f120c07 +.field public static final request_permission_msg:I = 0x7f120c08 -.field public static final search_menu_title:I = 0x7f120cbe +.field public static final search_menu_title:I = 0x7f120cbf -.field public static final selection_shrink_scale:I = 0x7f120cd4 +.field public static final selection_shrink_scale:I = 0x7f120cd5 -.field public static final send_contents:I = 0x7f120cdf +.field public static final send_contents:I = 0x7f120ce0 -.field public static final status_bar_notification_info_overflow:I = 0x7f120d6d +.field public static final status_bar_notification_info_overflow:I = 0x7f120d6e -.field public static final storage_permission_denied_msg:I = 0x7f120d7a +.field public static final storage_permission_denied_msg:I = 0x7f120d7b # direct methods diff --git a/com.discord/smali_classes2/com/lytefast/flexinput/R$i.smali b/com.discord/smali_classes2/com/lytefast/flexinput/R$i.smali index 0540bff0d5..0078db9449 100644 --- a/com.discord/smali_classes2/com/lytefast/flexinput/R$i.smali +++ b/com.discord/smali_classes2/com/lytefast/flexinput/R$i.smali @@ -2554,8 +2554,8 @@ 0x7f0402a3 0x7f0402fb 0x7f0402fe - 0x7f040390 - 0x7f04039a + 0x7f040392 + 0x7f04039c .end array-data :array_1 @@ -2565,7 +2565,7 @@ 0x7f04009a 0x7f04013e 0x7f0402fe - 0x7f04039a + 0x7f04039c .end array-data :array_2 @@ -2638,16 +2638,16 @@ .array-data 4 0x1010119 0x7f0402ed - 0x7f04038e - 0x7f04038f + 0x7f040390 + 0x7f040391 .end array-data :array_b .array-data 4 0x1010142 - 0x7f04038b - 0x7f04038c 0x7f04038d + 0x7f04038e + 0x7f04038f .end array-data :array_c @@ -2784,13 +2784,11 @@ 0x7f040333 0x7f040336 0x7f040337 - 0x7f04039c - 0x7f04039d 0x7f04039e 0x7f04039f - 0x7f0403bd - 0x7f0403c0 - 0x7f0403c1 + 0x7f0403a0 + 0x7f0403a1 + 0x7f0403bf 0x7f0403c2 0x7f0403c3 0x7f0403c4 @@ -2799,6 +2797,8 @@ 0x7f0403c7 0x7f0403c8 0x7f0403c9 + 0x7f0403ca + 0x7f0403cb .end array-data :array_f @@ -2922,9 +2922,9 @@ 0x7f0402d0 0x7f0402d2 0x7f0402f5 - 0x7f040390 - 0x7f040391 - 0x7f04039b + 0x7f040392 + 0x7f040393 + 0x7f04039d .end array-data :array_17 @@ -3133,7 +3133,7 @@ 0x7f0400f9 0x7f040138 0x7f0402e9 - 0x7f040387 + 0x7f040389 .end array-data :array_21 @@ -3157,7 +3157,7 @@ 0x7f040267 0x7f0402b2 0x7f0402e0 - 0x7f0403b8 + 0x7f0403ba .end array-data :array_23 @@ -3189,7 +3189,7 @@ 0x7f040134 0x7f040135 0x7f040136 - 0x7f0403a4 + 0x7f0403a6 .end array-data :array_26 @@ -3229,7 +3229,7 @@ 0x7f0402be 0x7f0402bf 0x7f0402c0 - 0x7f0403bc + 0x7f0403be .end array-data :array_28 @@ -3377,7 +3377,7 @@ 0x7f0401ad 0x7f04024f 0x7f0402db - 0x7f0403a0 + 0x7f0403a2 .end array-data :array_32 @@ -3455,7 +3455,7 @@ 0x7f0402d4 0x7f0402fa 0x7f0402ff - 0x7f0403be + 0x7f0403c0 .end array-data :array_38 @@ -3490,7 +3490,7 @@ 0x7f0402be 0x7f0402bf 0x7f0402c0 - 0x7f0403bc + 0x7f0403be .end array-data :array_39 @@ -3535,12 +3535,12 @@ 0x7f040300 0x7f040301 0x7f040303 - 0x7f040388 - 0x7f040389 0x7f04038a - 0x7f0403a1 - 0x7f0403a2 + 0x7f04038b + 0x7f04038c 0x7f0403a3 + 0x7f0403a4 + 0x7f0403a5 .end array-data :array_3e @@ -3657,15 +3657,15 @@ 0x7f0402fb 0x7f0402fc 0x7f0402fd - 0x7f040390 0x7f040392 - 0x7f040393 0x7f040394 0x7f040395 0x7f040396 0x7f040397 0x7f040398 0x7f040399 + 0x7f04039a + 0x7f04039b .end array-data :array_44 diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$attr.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$attr.smali index 1b33e2f20e..ee152be48a 100644 --- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$attr.smali +++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$attr.smali @@ -404,103 +404,103 @@ .field public static final theme:I = 0x7f04033b -.field public static final thickness:I = 0x7f040387 +.field public static final thickness:I = 0x7f040389 -.field public static final thumbTextPadding:I = 0x7f040388 +.field public static final thumbTextPadding:I = 0x7f04038a -.field public static final thumbTint:I = 0x7f040389 +.field public static final thumbTint:I = 0x7f04038b -.field public static final thumbTintMode:I = 0x7f04038a +.field public static final thumbTintMode:I = 0x7f04038c -.field public static final tickMark:I = 0x7f04038b +.field public static final tickMark:I = 0x7f04038d -.field public static final tickMarkTint:I = 0x7f04038c +.field public static final tickMarkTint:I = 0x7f04038e -.field public static final tickMarkTintMode:I = 0x7f04038d +.field public static final tickMarkTintMode:I = 0x7f04038f -.field public static final title:I = 0x7f040390 +.field public static final title:I = 0x7f040392 -.field public static final titleMargin:I = 0x7f040392 +.field public static final titleMargin:I = 0x7f040394 -.field public static final titleMarginBottom:I = 0x7f040393 +.field public static final titleMarginBottom:I = 0x7f040395 -.field public static final titleMarginEnd:I = 0x7f040394 +.field public static final titleMarginEnd:I = 0x7f040396 -.field public static final titleMarginStart:I = 0x7f040395 +.field public static final titleMarginStart:I = 0x7f040397 -.field public static final titleMarginTop:I = 0x7f040396 +.field public static final titleMarginTop:I = 0x7f040398 -.field public static final titleMargins:I = 0x7f040397 +.field public static final titleMargins:I = 0x7f040399 -.field public static final titleTextAppearance:I = 0x7f040398 +.field public static final titleTextAppearance:I = 0x7f04039a -.field public static final titleTextColor:I = 0x7f040399 +.field public static final titleTextColor:I = 0x7f04039b -.field public static final titleTextStyle:I = 0x7f04039a +.field public static final titleTextStyle:I = 0x7f04039c -.field public static final toolbarNavigationButtonStyle:I = 0x7f04039c +.field public static final toolbarNavigationButtonStyle:I = 0x7f04039e -.field public static final toolbarStyle:I = 0x7f04039d +.field public static final toolbarStyle:I = 0x7f04039f -.field public static final track:I = 0x7f0403a1 +.field public static final track:I = 0x7f0403a3 -.field public static final trackTint:I = 0x7f0403a2 +.field public static final trackTint:I = 0x7f0403a4 -.field public static final trackTintMode:I = 0x7f0403a3 +.field public static final trackTintMode:I = 0x7f0403a5 -.field public static final ucrop_artv_ratio_title:I = 0x7f0403a8 +.field public static final ucrop_artv_ratio_title:I = 0x7f0403aa -.field public static final ucrop_artv_ratio_x:I = 0x7f0403a9 +.field public static final ucrop_artv_ratio_x:I = 0x7f0403ab -.field public static final ucrop_artv_ratio_y:I = 0x7f0403aa +.field public static final ucrop_artv_ratio_y:I = 0x7f0403ac -.field public static final ucrop_aspect_ratio_x:I = 0x7f0403ab +.field public static final ucrop_aspect_ratio_x:I = 0x7f0403ad -.field public static final ucrop_aspect_ratio_y:I = 0x7f0403ac +.field public static final ucrop_aspect_ratio_y:I = 0x7f0403ae -.field public static final ucrop_circle_dimmed_layer:I = 0x7f0403ad +.field public static final ucrop_circle_dimmed_layer:I = 0x7f0403af -.field public static final ucrop_dimmed_color:I = 0x7f0403ae +.field public static final ucrop_dimmed_color:I = 0x7f0403b0 -.field public static final ucrop_frame_color:I = 0x7f0403af +.field public static final ucrop_frame_color:I = 0x7f0403b1 -.field public static final ucrop_frame_stroke_size:I = 0x7f0403b0 +.field public static final ucrop_frame_stroke_size:I = 0x7f0403b2 -.field public static final ucrop_grid_color:I = 0x7f0403b1 +.field public static final ucrop_grid_color:I = 0x7f0403b3 -.field public static final ucrop_grid_column_count:I = 0x7f0403b2 +.field public static final ucrop_grid_column_count:I = 0x7f0403b4 -.field public static final ucrop_grid_row_count:I = 0x7f0403b3 +.field public static final ucrop_grid_row_count:I = 0x7f0403b5 -.field public static final ucrop_grid_stroke_size:I = 0x7f0403b4 +.field public static final ucrop_grid_stroke_size:I = 0x7f0403b6 -.field public static final ucrop_show_frame:I = 0x7f0403b5 +.field public static final ucrop_show_frame:I = 0x7f0403b7 -.field public static final ucrop_show_grid:I = 0x7f0403b6 +.field public static final ucrop_show_grid:I = 0x7f0403b8 -.field public static final ucrop_show_oval_crop_frame:I = 0x7f0403b7 +.field public static final ucrop_show_oval_crop_frame:I = 0x7f0403b9 -.field public static final voiceIcon:I = 0x7f0403be +.field public static final voiceIcon:I = 0x7f0403c0 -.field public static final windowActionBar:I = 0x7f0403c0 +.field public static final windowActionBar:I = 0x7f0403c2 -.field public static final windowActionBarOverlay:I = 0x7f0403c1 +.field public static final windowActionBarOverlay:I = 0x7f0403c3 -.field public static final windowActionModeOverlay:I = 0x7f0403c2 +.field public static final windowActionModeOverlay:I = 0x7f0403c4 -.field public static final windowFixedHeightMajor:I = 0x7f0403c3 +.field public static final windowFixedHeightMajor:I = 0x7f0403c5 -.field public static final windowFixedHeightMinor:I = 0x7f0403c4 +.field public static final windowFixedHeightMinor:I = 0x7f0403c6 -.field public static final windowFixedWidthMajor:I = 0x7f0403c5 +.field public static final windowFixedWidthMajor:I = 0x7f0403c7 -.field public static final windowFixedWidthMinor:I = 0x7f0403c6 +.field public static final windowFixedWidthMinor:I = 0x7f0403c8 -.field public static final windowMinWidthMajor:I = 0x7f0403c7 +.field public static final windowMinWidthMajor:I = 0x7f0403c9 -.field public static final windowMinWidthMinor:I = 0x7f0403c8 +.field public static final windowMinWidthMinor:I = 0x7f0403ca -.field public static final windowNoTitle:I = 0x7f0403c9 +.field public static final windowNoTitle:I = 0x7f0403cb # 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 b21e02196a..08e23350ab 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 @@ -72,19 +72,19 @@ .field public static final abc_toolbar_collapse_description:I = 0x7f12002a -.field public static final search_menu_title:I = 0x7f120cbe +.field public static final search_menu_title:I = 0x7f120cbf -.field public static final status_bar_notification_info_overflow:I = 0x7f120d6d +.field public static final status_bar_notification_info_overflow:I = 0x7f120d6e -.field public static final ucrop_error_input_data_is_absent:I = 0x7f120e60 +.field public static final ucrop_error_input_data_is_absent:I = 0x7f120e61 -.field public static final ucrop_label_edit_photo:I = 0x7f120e61 +.field public static final ucrop_label_edit_photo:I = 0x7f120e62 -.field public static final ucrop_label_original:I = 0x7f120e62 +.field public static final ucrop_label_original:I = 0x7f120e63 -.field public static final ucrop_menu_crop:I = 0x7f120e63 +.field public static final ucrop_menu_crop:I = 0x7f120e64 -.field public static final ucrop_mutate_exception_hint:I = 0x7f120e64 +.field public static final ucrop_mutate_exception_hint:I = 0x7f120e65 # direct methods diff --git a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$styleable.smali b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$styleable.smali index cc2bd537cf..dba71c19d6 100644 --- a/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$styleable.smali +++ b/com.discord/smali_classes2/com/miguelgaeta/media_picker/R$styleable.smali @@ -1112,8 +1112,8 @@ 0x7f0402a3 0x7f0402fb 0x7f0402fe - 0x7f040390 - 0x7f04039a + 0x7f040392 + 0x7f04039c .end array-data :array_1 @@ -1123,7 +1123,7 @@ 0x7f04009a 0x7f04013e 0x7f0402fe - 0x7f04039a + 0x7f04039c .end array-data :array_2 @@ -1148,16 +1148,16 @@ .array-data 4 0x1010119 0x7f0402ed - 0x7f04038e - 0x7f04038f + 0x7f040390 + 0x7f040391 .end array-data :array_5 .array-data 4 0x1010142 - 0x7f04038b - 0x7f04038c 0x7f04038d + 0x7f04038e + 0x7f04038f .end array-data :array_6 @@ -1294,13 +1294,11 @@ 0x7f040333 0x7f040336 0x7f040337 - 0x7f04039c - 0x7f04039d 0x7f04039e 0x7f04039f - 0x7f0403bd - 0x7f0403c0 - 0x7f0403c1 + 0x7f0403a0 + 0x7f0403a1 + 0x7f0403bf 0x7f0403c2 0x7f0403c3 0x7f0403c4 @@ -1309,6 +1307,8 @@ 0x7f0403c7 0x7f0403c8 0x7f0403c9 + 0x7f0403ca + 0x7f0403cb .end array-data :array_9 @@ -1334,7 +1334,7 @@ 0x7f0400f9 0x7f040138 0x7f0402e9 - 0x7f040387 + 0x7f040389 .end array-data :array_c @@ -1398,7 +1398,7 @@ 0x7f0401ad 0x7f04024f 0x7f0402db - 0x7f0403a0 + 0x7f0403a2 .end array-data :array_11 @@ -1445,7 +1445,7 @@ 0x7f0402d4 0x7f0402fa 0x7f0402ff - 0x7f0403be + 0x7f0403c0 .end array-data :array_15 @@ -1467,12 +1467,12 @@ 0x7f040300 0x7f040301 0x7f040303 - 0x7f040388 - 0x7f040389 0x7f04038a - 0x7f0403a1 - 0x7f0403a2 + 0x7f04038b + 0x7f04038c 0x7f0403a3 + 0x7f0403a4 + 0x7f0403a5 .end array-data :array_17 @@ -1514,15 +1514,15 @@ 0x7f0402fb 0x7f0402fc 0x7f0402fd - 0x7f040390 0x7f040392 - 0x7f040393 0x7f040394 0x7f040395 0x7f040396 0x7f040397 0x7f040398 0x7f040399 + 0x7f04039a + 0x7f04039b .end array-data :array_19 @@ -1550,15 +1550,13 @@ :array_1c .array-data 4 - 0x7f0403a8 - 0x7f0403a9 0x7f0403aa + 0x7f0403ab + 0x7f0403ac .end array-data :array_1d .array-data 4 - 0x7f0403ab - 0x7f0403ac 0x7f0403ad 0x7f0403ae 0x7f0403af @@ -1570,6 +1568,8 @@ 0x7f0403b5 0x7f0403b6 0x7f0403b7 + 0x7f0403b8 + 0x7f0403b9 .end array-data .end method 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 091f17cb9b..0f4714e79d 100644 --- a/com.discord/smali_classes2/com/yalantis/ucrop/R$g.smali +++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$g.smali @@ -72,19 +72,19 @@ .field public static final abc_toolbar_collapse_description:I = 0x7f12002a -.field public static final search_menu_title:I = 0x7f120cbe +.field public static final search_menu_title:I = 0x7f120cbf -.field public static final status_bar_notification_info_overflow:I = 0x7f120d6d +.field public static final status_bar_notification_info_overflow:I = 0x7f120d6e -.field public static final ucrop_error_input_data_is_absent:I = 0x7f120e60 +.field public static final ucrop_error_input_data_is_absent:I = 0x7f120e61 -.field public static final ucrop_label_edit_photo:I = 0x7f120e61 +.field public static final ucrop_label_edit_photo:I = 0x7f120e62 -.field public static final ucrop_label_original:I = 0x7f120e62 +.field public static final ucrop_label_original:I = 0x7f120e63 -.field public static final ucrop_menu_crop:I = 0x7f120e63 +.field public static final ucrop_menu_crop:I = 0x7f120e64 -.field public static final ucrop_mutate_exception_hint:I = 0x7f120e64 +.field public static final ucrop_mutate_exception_hint:I = 0x7f120e65 # direct methods diff --git a/com.discord/smali_classes2/com/yalantis/ucrop/R$h.smali b/com.discord/smali_classes2/com/yalantis/ucrop/R$h.smali index 971c462ef1..c0273ac360 100644 --- a/com.discord/smali_classes2/com/yalantis/ucrop/R$h.smali +++ b/com.discord/smali_classes2/com/yalantis/ucrop/R$h.smali @@ -1118,8 +1118,8 @@ 0x7f0402a3 0x7f0402fb 0x7f0402fe - 0x7f040390 - 0x7f04039a + 0x7f040392 + 0x7f04039c .end array-data :array_1 @@ -1129,7 +1129,7 @@ 0x7f04009a 0x7f04013e 0x7f0402fe - 0x7f04039a + 0x7f04039c .end array-data :array_2 @@ -1154,16 +1154,16 @@ .array-data 4 0x1010119 0x7f0402ed - 0x7f04038e - 0x7f04038f + 0x7f040390 + 0x7f040391 .end array-data :array_5 .array-data 4 0x1010142 - 0x7f04038b - 0x7f04038c 0x7f04038d + 0x7f04038e + 0x7f04038f .end array-data :array_6 @@ -1300,13 +1300,11 @@ 0x7f040333 0x7f040336 0x7f040337 - 0x7f04039c - 0x7f04039d 0x7f04039e 0x7f04039f - 0x7f0403bd - 0x7f0403c0 - 0x7f0403c1 + 0x7f0403a0 + 0x7f0403a1 + 0x7f0403bf 0x7f0403c2 0x7f0403c3 0x7f0403c4 @@ -1315,6 +1313,8 @@ 0x7f0403c7 0x7f0403c8 0x7f0403c9 + 0x7f0403ca + 0x7f0403cb .end array-data :array_9 @@ -1340,7 +1340,7 @@ 0x7f0400f9 0x7f040138 0x7f0402e9 - 0x7f040387 + 0x7f040389 .end array-data :array_c @@ -1404,7 +1404,7 @@ 0x7f0401ad 0x7f04024f 0x7f0402db - 0x7f0403a0 + 0x7f0403a2 .end array-data :array_11 @@ -1451,7 +1451,7 @@ 0x7f0402d4 0x7f0402fa 0x7f0402ff - 0x7f0403be + 0x7f0403c0 .end array-data :array_15 @@ -1473,12 +1473,12 @@ 0x7f040300 0x7f040301 0x7f040303 - 0x7f040388 - 0x7f040389 0x7f04038a - 0x7f0403a1 - 0x7f0403a2 + 0x7f04038b + 0x7f04038c 0x7f0403a3 + 0x7f0403a4 + 0x7f0403a5 .end array-data :array_17 @@ -1520,15 +1520,15 @@ 0x7f0402fb 0x7f0402fc 0x7f0402fd - 0x7f040390 0x7f040392 - 0x7f040393 0x7f040394 0x7f040395 0x7f040396 0x7f040397 0x7f040398 0x7f040399 + 0x7f04039a + 0x7f04039b .end array-data :array_19 @@ -1556,15 +1556,13 @@ :array_1c .array-data 4 - 0x7f0403a8 - 0x7f0403a9 0x7f0403aa + 0x7f0403ab + 0x7f0403ac .end array-data :array_1d .array-data 4 - 0x7f0403ab - 0x7f0403ac 0x7f0403ad 0x7f0403ae 0x7f0403af @@ -1576,6 +1574,8 @@ 0x7f0403b5 0x7f0403b6 0x7f0403b7 + 0x7f0403b8 + 0x7f0403b9 .end array-data .end method diff --git a/com.discord/smali_classes2/kotlin/a/a.smali b/com.discord/smali_classes2/kotlin/a/a.smali index fe162ac421..6c6016bdc7 100644 --- a/com.discord/smali_classes2/kotlin/a/a.smali +++ b/com.discord/smali_classes2/kotlin/a/a.smali @@ -275,7 +275,7 @@ check-cast v0, Ljava/util/Collection; - invoke-static {v0}, Lkotlin/jvm/internal/f;->k(Ljava/util/Collection;)[Ljava/lang/Object; + invoke-static {v0}, Lkotlin/jvm/internal/f;->l(Ljava/util/Collection;)[Ljava/lang/Object; move-result-object v0 diff --git a/com.discord/smali_classes2/kotlin/a/ad.smali b/com.discord/smali_classes2/kotlin/a/ad.smali index 8d9f0598ec..a9ab25e73a 100644 --- a/com.discord/smali_classes2/kotlin/a/ad.smali +++ b/com.discord/smali_classes2/kotlin/a/ad.smali @@ -37,3 +37,60 @@ return-object p0 .end method + +.method public static final r(Ljava/util/Map;)Ljava/util/Map; + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Ljava/util/Map<", + "+TK;+TV;>;)", + "Ljava/util/Map<", + "TK;TV;>;" + } + .end annotation + + const-string v0, "receiver$0" + + invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V + + invoke-interface {p0}, Ljava/util/Map;->entrySet()Ljava/util/Set; + + move-result-object p0 + + invoke-interface {p0}, Ljava/util/Set;->iterator()Ljava/util/Iterator; + + move-result-object p0 + + invoke-interface {p0}, Ljava/util/Iterator;->next()Ljava/lang/Object; + + move-result-object p0 + + check-cast p0, Ljava/util/Map$Entry; + + invoke-interface {p0}, Ljava/util/Map$Entry;->getKey()Ljava/lang/Object; + + move-result-object v0 + + invoke-interface {p0}, Ljava/util/Map$Entry;->getValue()Ljava/lang/Object; + + move-result-object p0 + + invoke-static {v0, p0}, Ljava/util/Collections;->singletonMap(Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map; + + move-result-object p0 + + const-string v0, "java.util.Collections.singletonMap(key, value)" + + invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + const-string v0, "with(entries.iterator().\u2026ingletonMap(key, value) }" + + invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->g(Ljava/lang/Object;Ljava/lang/String;)V + + return-object p0 +.end method diff --git a/com.discord/smali_classes2/kotlin/a/ae.smali b/com.discord/smali_classes2/kotlin/a/ae.smali index 880b870551..81e5451333 100644 --- a/com.discord/smali_classes2/kotlin/a/ae.smali +++ b/com.discord/smali_classes2/kotlin/a/ae.smali @@ -316,3 +316,32 @@ throw v0 .end method + +.method public static final s(Ljava/util/Map;)Ljava/util/Map; + .locals 1 + .annotation system Ldalvik/annotation/Signature; + value = { + "(", + "Ljava/util/Map<", + "+TK;+TV;>;)", + "Ljava/util/Map<", + "TK;TV;>;" + } + .end annotation + + const-string v0, "receiver$0" + + invoke-static {p0, v0}, Lkotlin/jvm/internal/j;->h(Ljava/lang/Object;Ljava/lang/String;)V + + new-instance v0, Ljava/util/LinkedHashMap; + + invoke-direct {v0, p0}, Ljava/util/LinkedHashMap;->(Ljava/util/Map;)V + + check-cast v0, Ljava/util/Map; + + return-object v0 +.end method diff --git a/com.discord/smali_classes2/kotlin/a/af.smali b/com.discord/smali_classes2/kotlin/a/af.smali index 93e5e88d28..fd939d98fa 100644 --- a/com.discord/smali_classes2/kotlin/a/af.smali +++ b/com.discord/smali_classes2/kotlin/a/af.smali @@ -3,7 +3,7 @@ # direct methods -.method public static final r(Ljava/util/Map;)Lkotlin/sequences/Sequence; +.method public static final t(Ljava/util/Map;)Lkotlin/sequences/Sequence; .locals 1 .annotation system Ldalvik/annotation/Signature; value = { diff --git a/com.discord/smali_classes2/kotlin/a/x.smali b/com.discord/smali_classes2/kotlin/a/x.smali index f6793929f7..b5a07e70e4 100644 --- a/com.discord/smali_classes2/kotlin/a/x.smali +++ b/com.discord/smali_classes2/kotlin/a/x.smali @@ -414,7 +414,7 @@ .method public final toArray()[Ljava/lang/Object; .locals 1 - invoke-static {p0}, Lkotlin/jvm/internal/f;->k(Ljava/util/Collection;)[Ljava/lang/Object; + invoke-static {p0}, Lkotlin/jvm/internal/f;->l(Ljava/util/Collection;)[Ljava/lang/Object; move-result-object v0 diff --git a/com.discord/smali_classes2/kotlin/a/z.smali b/com.discord/smali_classes2/kotlin/a/z.smali index fdac7a671e..610373a8cb 100644 --- a/com.discord/smali_classes2/kotlin/a/z.smali +++ b/com.discord/smali_classes2/kotlin/a/z.smali @@ -213,7 +213,7 @@ .method public final toArray()[Ljava/lang/Object; .locals 1 - invoke-static {p0}, Lkotlin/jvm/internal/f;->k(Ljava/util/Collection;)[Ljava/lang/Object; + invoke-static {p0}, Lkotlin/jvm/internal/f;->l(Ljava/util/Collection;)[Ljava/lang/Object; move-result-object v0 diff --git a/com.discord/smali_classes2/kotlin/jvm/internal/f.smali b/com.discord/smali_classes2/kotlin/jvm/internal/f.smali index aa9c0efd79..3e489031fc 100644 --- a/com.discord/smali_classes2/kotlin/jvm/internal/f.smali +++ b/com.discord/smali_classes2/kotlin/jvm/internal/f.smali @@ -211,7 +211,7 @@ throw p0 .end method -.method public static final k(Ljava/util/Collection;)[Ljava/lang/Object; +.method public static final l(Ljava/util/Collection;)[Ljava/lang/Object; .locals 4 .annotation system Ldalvik/annotation/Signature; value = { diff --git a/com.discord/smali_classes2/rx/subscriptions/CompositeSubscription.smali b/com.discord/smali_classes2/rx/subscriptions/CompositeSubscription.smali index 8a78d74357..0d73e0d05b 100644 --- a/com.discord/smali_classes2/rx/subscriptions/CompositeSubscription.smali +++ b/com.discord/smali_classes2/rx/subscriptions/CompositeSubscription.smali @@ -46,7 +46,7 @@ return-void .end method -.method private static l(Ljava/util/Collection;)V +.method private static m(Ljava/util/Collection;)V .locals 2 .annotation system Ldalvik/annotation/Signature; value = { @@ -206,7 +206,7 @@ :try_end_0 .catchall {:try_start_0 .. :try_end_0} :catchall_0 - invoke-static {v0}, Lrx/subscriptions/CompositeSubscription;->l(Ljava/util/Collection;)V + invoke-static {v0}, Lrx/subscriptions/CompositeSubscription;->m(Ljava/util/Collection;)V goto :goto_1 @@ -330,7 +330,7 @@ :try_end_0 .catchall {:try_start_0 .. :try_end_0} :catchall_0 - invoke-static {v0}, Lrx/subscriptions/CompositeSubscription;->l(Ljava/util/Collection;)V + invoke-static {v0}, Lrx/subscriptions/CompositeSubscription;->m(Ljava/util/Collection;)V goto :goto_0